Skip to content

Commit 8566f7a

Browse files
committed
Configured build settings. Finally builds after 8 hours of f*ing work [!!!]
1 parent 1c3a40a commit 8566f7a

8 files changed

+119
-343
lines changed

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
3232
}
3333

3434
android {
35-
compileSdkVersion 33
35+
compileSdkVersion 34
3636
namespace = 'is.mideind.embla'
3737

3838
compileOptions {
@@ -43,7 +43,7 @@ android {
4343
defaultConfig {
4444
applicationId "is.mideind.embla"
4545
minSdkVersion 27
46-
targetSdkVersion 33
46+
targetSdkVersion 34
4747
versionCode flutterVersionCode.toInteger()
4848
versionName flutterVersionName
4949
}

android/build.gradle

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.21'
2+
ext.kotlin_version = '1.9.25'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
//classpath 'com.android.tools.build:gradle:4.2.2'
10-
classpath 'com.android.tools.build:gradle:7.4.2'
9+
// classpath 'com.android.tools.build:gradle:7.4.2'
10+
classpath 'com.android.tools.build:gradle:8.0.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
}
1313
}
@@ -17,6 +17,18 @@ allprojects {
1717
google()
1818
mavenCentral()
1919
}
20+
// This code is where all the magic happens and fixes the error.
21+
subprojects {
22+
afterEvaluate { project ->
23+
if (project.hasProperty('android')) {
24+
project.android {
25+
if (namespace == null) {
26+
namespace project.group
27+
}
28+
}
29+
}
30+
}
31+
}
2032
tasks.withType(JavaCompile) {
2133
// options.deprecation = true
2234
// options.compilerArgs << '-Xlint:-options'

android/gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ org.gradle.daemon=true
55
android.defaults.buildfeatures.buildconfig=true
66
android.nonTransitiveRClass=false
77
android.nonFinalResIds=false
8+
kotlin.jvm.target.validation.mode = IGNORE
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Sep 06 18:39:39 GMT 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

embla_flutter.iml

+96-333
Large diffs are not rendered by default.

lib/session.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class SessionRouteState extends State<SessionRoute> with SingleTickerProviderSta
100100
text = introMsg();
101101

102102
// Start observing app state (foreground, background)
103-
appStateSubscription = FGBGEvents.stream.listen((event) async {
103+
appStateSubscription = FGBGEvents.instance.stream.listen((event) async {
104104
if (event == FGBGType.foreground) {
105105
dlog("App went into foreground");
106106
inBackground = false;

pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
shared_preferences: '^2.2.3'
1818
geolocator: ^12.0.0
1919
package_info_plus: ^8.0.1
20-
device_info_plus: ^10.1.1
20+
device_info_plus: 9.1.2
2121
url_launcher: '^6.1.14'
2222
platform_device_id:
2323
git:
@@ -46,7 +46,7 @@ dependencies:
4646
embla_core: #'>=1.0.8'
4747
path: '../embla_core'
4848
# git:
49-
# url: git://github.com/mideind/EmblaCoreFlutter.git
49+
# url: https://github.com/mideind/EmblaCoreFlutter.git
5050
# ref: master
5151

5252

test/widget_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// These are the tests for the project's widgets.
22

33
import 'package:flutter/material.dart';
4-
import 'package:flutter_test/flutter_test.dart';
4+
import 'package:flutter_test/flutter_test.dart'; // ignore: depend_on_referenced_packages
55

66
// import 'package:embla/main.dart';
77
import 'package:embla/menu.dart';

0 commit comments

Comments
 (0)