Skip to content

Commit

Permalink
Configured build settings. Finally builds after 8 hours of f*ing work…
Browse files Browse the repository at this point in the history
… [!!!]
  • Loading branch information
sveinbjornt committed Aug 8, 2024
1 parent 1c3a40a commit 8566f7a
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 343 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 33
compileSdkVersion 34
namespace = 'is.mideind.embla'

compileOptions {
Expand All @@ -43,7 +43,7 @@ android {
defaultConfig {
applicationId "is.mideind.embla"
minSdkVersion 27
targetSdkVersion 33
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
18 changes: 15 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.9.25'
repositories {
google()
mavenCentral()
}

dependencies {
//classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.4.2'
// classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -17,6 +17,18 @@ allprojects {
google()
mavenCentral()
}
// This code is where all the magic happens and fixes the error.
subprojects {
afterEvaluate { project ->
if (project.hasProperty('android')) {
project.android {
if (namespace == null) {
namespace project.group
}
}
}
}
}
tasks.withType(JavaCompile) {
// options.deprecation = true
// options.compilerArgs << '-Xlint:-options'
Expand Down
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ org.gradle.daemon=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
kotlin.jvm.target.validation.mode = IGNORE
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 06 18:39:39 GMT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
429 changes: 96 additions & 333 deletions embla_flutter.iml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/session.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class SessionRouteState extends State<SessionRoute> with SingleTickerProviderSta
text = introMsg();

// Start observing app state (foreground, background)
appStateSubscription = FGBGEvents.stream.listen((event) async {
appStateSubscription = FGBGEvents.instance.stream.listen((event) async {
if (event == FGBGType.foreground) {
dlog("App went into foreground");
inBackground = false;
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
shared_preferences: '^2.2.3'
geolocator: ^12.0.0
package_info_plus: ^8.0.1
device_info_plus: ^10.1.1
device_info_plus: 9.1.2
url_launcher: '^6.1.14'
platform_device_id:
git:
Expand Down Expand Up @@ -46,7 +46,7 @@ dependencies:
embla_core: #'>=1.0.8'
path: '../embla_core'
# git:
# url: git://github.com/mideind/EmblaCoreFlutter.git
# url: https://github.com/mideind/EmblaCoreFlutter.git
# ref: master


Expand Down
2 changes: 1 addition & 1 deletion test/widget_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// These are the tests for the project's widgets.

import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_test/flutter_test.dart'; // ignore: depend_on_referenced_packages

// import 'package:embla/main.dart';
import 'package:embla/menu.dart';
Expand Down

0 comments on commit 8566f7a

Please sign in to comment.