[various] Update example apps to Kotlin 1.9.0 (#7998)

Follow-up to #7997 to update all example apps to 1.9.0 to protect us from similar OOB failures as other transitive dependencies in the ecosystem update to newer versions of Kotlin.
flutter · Nov 4, 2024 · abadfb5 · abadfb5
1 parent da4c3ee
commit abadfb5
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 20 deletions.
diff --git a/packages/animations/example/android/app/build.gradle b/packages/animations/example/android/app/build.gradle
@@ -29,6 +29,15 @@ android {
     namespace 'dev.flutter.packages.animations.example'
     compileSdk flutter.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

diff --git a/packages/animations/example/android/build.gradle b/packages/animations/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/camera/camera_android_camerax/example/android/build.gradle b/packages/camera/camera_android_camerax/example/android/build.gradle
@@ -1,8 +1,5 @@
 buildscript {
-    // This version should intentionally be a 1.7.* version and lower than the
-    // version of kotlin-bom defined in packages/camera/camera_android_camerax/android/build.gradle.
-    // This tests that the kotlin version resolution continues to work.
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/file_selector/file_selector/example/android/settings.gradle b/packages/file_selector/file_selector/example/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
   id "dev.flutter.flutter-plugin-loader" version "1.0.0"
   id "com.android.application" version "8.5.1" apply false
-  id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+  id "org.jetbrains.kotlin.android" version "1.9.0" apply false
   id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 }
 

diff --git a/packages/file_selector/file_selector_android/example/android/settings.gradle b/packages/file_selector/file_selector_android/example/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
   id "dev.flutter.flutter-plugin-loader" version "1.0.0"
   id "com.android.application" version "8.5.2" apply false
-  id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+  id "org.jetbrains.kotlin.android" version "1.9.0" apply false
   id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 }
 

diff --git a/packages/flutter_adaptive_scaffold/example/android/build.gradle b/packages/flutter_adaptive_scaffold/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/flutter_image/example/android/build.gradle b/packages/flutter_image/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/flutter_markdown/example/android/app/build.gradle b/packages/flutter_markdown/example/android/app/build.gradle
@@ -28,6 +28,15 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 android {
     compileSdk flutter.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

diff --git a/packages/flutter_markdown/example/android/build.gradle b/packages/flutter_markdown/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/pigeon/example/app/android/build.gradle b/packages/pigeon/example/app/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/rfw/example/hello/android/build.gradle b/packages/rfw/example/hello/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/rfw/example/local/android/build.gradle b/packages/rfw/example/local/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/rfw/example/remote/android/build.gradle b/packages/rfw/example/remote/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/shared_preferences/shared_preferences/example/android/build.gradle b/packages/shared_preferences/shared_preferences/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/shared_preferences/shared_preferences_android/example/android/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/two_dimensional_scrollables/example/android/settings.gradle b/packages/two_dimensional_scrollables/example/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.5.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
     id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 }
 

diff --git a/third_party/packages/flutter_svg/example/android/app/build.gradle b/third_party/packages/flutter_svg/example/android/app/build.gradle
@@ -29,6 +29,15 @@ android {
     namespace 'io.flutter.plugins.fluttersvgexample'
     compileSdkVersion flutter.compileSdkVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

diff --git a/third_party/packages/flutter_svg/example/android/build.gradle b/third_party/packages/flutter_svg/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()