fix: update android build versions (#205)

tomarra · web-flow · commit 71e8c5323911 · 2024-10-17T12:59:47.000Z
diff --git a/very_good_core/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle b/very_good_core/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle
@@ -34,12 +34,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = 17
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
diff --git a/very_good_core/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties b/very_good_core/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/very_good_core/__brick__/{{project_name.snakeCase()}}/android/settings.gradle b/very_good_core/__brick__/{{project_name.snakeCase()}}/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.20" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle b/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle
@@ -34,12 +34,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = 17
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
diff --git a/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties b/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/settings.gradle b/very_good_flame_game/__brick__/{{project_name.snakeCase()}}/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.20" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle
@@ -34,12 +34,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ android {`
`34`	`34`	`ndkVersion flutter.ndkVersion`
`35`	`35`
`36`	`36`	`compileOptions {`
`37`		`- sourceCompatibility JavaVersion.VERSION_17`
`38`		`- targetCompatibility JavaVersion.VERSION_17`
	`37`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`38`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`kotlinOptions {`
`42`		`- jvmTarget = 17`
	`42`	`+ jvmTarget = JavaVersion.VERSION_1_8`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ pluginManagement {`
`19`	`19`
`20`	`20`	`plugins {`
`21`	`21`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`22`		`- id "com.android.application" version "7.3.0" apply false`
`23`		`- id "org.jetbrains.kotlin.android" version "1.9.20" apply false`
	`22`	`+ id "com.android.application" version "8.1.0" apply false`
	`23`	`+ id "org.jetbrains.kotlin.android" version "1.8.22" apply false`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`include ":app"`