From f5f84b326a5d55a2223aae9bb466736b6aafe770 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 1 Nov 2024 12:04:24 -0400 Subject: [PATCH 1/2] [various] Update example apps to Kotlin 1.9.0 Follow-up to https://github.com/flutter/packages/pull/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. --- packages/animations/example/android/build.gradle | 2 +- .../camera_android_camerax/example/android/build.gradle | 5 +---- .../file_selector/file_selector/example/android/build.gradle | 2 +- .../file_selector_android/example/android/build.gradle | 2 +- .../flutter_adaptive_scaffold/example/android/build.gradle | 2 +- packages/flutter_image/example/android/build.gradle | 2 +- packages/flutter_markdown/example/android/build.gradle | 2 +- packages/pigeon/example/app/android/build.gradle | 2 +- .../example/android/build.gradle | 2 +- .../platform_tests/test_plugin/example/android/build.gradle | 2 +- packages/rfw/example/hello/android/build.gradle | 2 +- packages/rfw/example/local/android/build.gradle | 2 +- packages/rfw/example/remote/android/build.gradle | 2 +- .../shared_preferences/example/android/build.gradle | 2 +- .../shared_preferences_android/example/android/build.gradle | 2 +- .../two_dimensional_scrollables/example/android/build.gradle | 2 +- .../packages/flutter_svg/example/android/build.gradle | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/animations/example/android/build.gradle b/packages/animations/example/android/build.gradle index 491936f2fbe..4a9ad584b42 100644 --- 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 index 450abce36d2..7ad575841c0 100644 --- 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/build.gradle b/packages/file_selector/file_selector/example/android/build.gradle index 491936f2fbe..4a9ad584b42 100644 --- a/packages/file_selector/file_selector/example/android/build.gradle +++ b/packages/file_selector/file_selector/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/file_selector/file_selector_android/example/android/build.gradle b/packages/file_selector/file_selector_android/example/android/build.gradle index ade31dc936a..d2cfb1ffff6 100644 --- a/packages/file_selector/file_selector_android/example/android/build.gradle +++ b/packages/file_selector/file_selector_android/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_adaptive_scaffold/example/android/build.gradle b/packages/flutter_adaptive_scaffold/example/android/build.gradle index 5cf1eb22142..510b513a815 100644 --- 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 index 491936f2fbe..4a9ad584b42 100644 --- 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/build.gradle b/packages/flutter_markdown/example/android/build.gradle index 0501e9227a3..6f6453aefc3 100644 --- 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 index 491936f2fbe..4a9ad584b42 100644 --- 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 index 0b4ac7621f1..3da67241496 100644 --- 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 index b7ab9808de1..6daa2e734ae 100644 --- 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 index cd70ddd54b1..ab596dbe21c 100644 --- 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 index fa0c3b56c2a..aae66ee04e4 100644 --- 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 index 31b11cccd4e..13648db310e 100644 --- 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 index 5cf1eb22142..510b513a815 100644 --- 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 index bd044999632..1e044b31709 100644 --- 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/build.gradle b/packages/two_dimensional_scrollables/example/android/build.gradle index 5cf1eb22142..510b513a815 100644 --- a/packages/two_dimensional_scrollables/example/android/build.gradle +++ b/packages/two_dimensional_scrollables/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/third_party/packages/flutter_svg/example/android/build.gradle b/third_party/packages/flutter_svg/example/android/build.gradle index bec9397fd52..571f15900e8 100644 --- 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() From aa1decc22bf6371b8d3fad12f06b27a35af0aa13 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 4 Nov 2024 11:56:41 -0500 Subject: [PATCH 2/2] Add Java compat version to example apps that were missing it --- packages/animations/example/android/app/build.gradle | 9 +++++++++ .../flutter_markdown/example/android/app/build.gradle | 9 +++++++++ .../flutter_svg/example/android/app/build.gradle | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/packages/animations/example/android/app/build.gradle b/packages/animations/example/android/app/build.gradle index f807599056d..19d11f91e67 100644 --- 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/flutter_markdown/example/android/app/build.gradle b/packages/flutter_markdown/example/android/app/build.gradle index e542c8f72cb..6b8f51a7991 100644 --- 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/third_party/packages/flutter_svg/example/android/app/build.gradle b/third_party/packages/flutter_svg/example/android/app/build.gradle index 5e2905dee5f..0a6e4fe90bb 100644 --- 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' }