diff --git a/.ci/legacy_project/README.md b/.ci/legacy_project/README.md index dd3ecfcdfea..322e5b6ca00 100644 --- a/.ci/legacy_project/README.md +++ b/.ci/legacy_project/README.md @@ -54,3 +54,4 @@ and then deleting everything but `android/` from it: - Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP) from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version, the warning is clear on how to upgrade the version to one that we support. +- Modifies `gradle.properties` to not set android.enableJetifier=true. diff --git a/.ci/legacy_project/all_packages/android/gradle.properties b/.ci/legacy_project/all_packages/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/.ci/legacy_project/all_packages/android/gradle.properties +++ b/.ci/legacy_project/all_packages/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/animations/example/android/gradle.properties b/packages/animations/example/android/gradle.properties index 25971708216..9b650e9517e 100644 --- a/packages/animations/example/android/gradle.properties +++ b/packages/animations/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/animations/example/android/settings.gradle b/packages/animations/example/android/settings.gradle index f6927ca0934..29aee075f44 100644 --- a/packages/animations/example/android/settings.gradle +++ b/packages/animations/example/android/settings.gradle @@ -21,7 +21,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/camera/camera/example/android/gradle.properties b/packages/camera/camera/example/android/gradle.properties index bfb7805f566..da87b2c8f89 100644 --- a/packages/camera/camera/example/android/gradle.properties +++ b/packages/camera/camera/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=false diff --git a/packages/camera/camera/example/android/settings.gradle b/packages/camera/camera/example/android/settings.gradle index 93732cee4c1..3e2162f97f7 100644 --- a/packages/camera/camera/example/android/settings.gradle +++ b/packages/camera/camera/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index 271503d02f1..572080a2cb7 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.10+5 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.10.10+4 * Fix flutter#166533 - prevent startImageStream OOM error when main thread paused. diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index c081c3d47d6..bc246342146 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -69,6 +69,6 @@ dependencies { implementation 'androidx.annotation:annotation:1.9.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'androidx.test:core:1.7.0' + testImplementation 'org.robolectric:robolectric:4.15.1' } diff --git a/packages/camera/camera_android/example/android/gradle.properties b/packages/camera/camera_android/example/android/gradle.properties index bfb7805f566..da87b2c8f89 100644 --- a/packages/camera/camera_android/example/android/gradle.properties +++ b/packages/camera/camera_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=false diff --git a/packages/camera/camera_android/example/android/settings.gradle b/packages/camera/camera_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/camera/camera_android/example/android/settings.gradle +++ b/packages/camera/camera_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index 09b19cb6a00..dc58455ec7e 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.10+4 +version: 0.10.10+5 environment: sdk: ^3.6.0 diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 1262c022827..b1acc3b9af2 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.20+1 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.6.20 * Fixes pausing and resuming the camera preview. diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 3cf1451a6bb..e342682750c 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -79,8 +79,8 @@ dependencies { implementation "androidx.camera:camera-video:${camerax_version}" implementation 'com.google.guava:guava:33.4.0-android' testImplementation 'junit:junit:4.13.2' - testImplementation "org.mockito:mockito-core:5.17.0" + testImplementation "org.mockito:mockito-core:5.18.0" testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'androidx.test:core:1.7.0' + testImplementation 'org.robolectric:robolectric:4.15.1' } diff --git a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/TestProxyApiRegistrar.java b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/TestProxyApiRegistrar.java index 956d4bcf72c..383dd57aade 100644 --- a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/TestProxyApiRegistrar.java +++ b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/TestProxyApiRegistrar.java @@ -7,9 +7,9 @@ import static org.mockito.Mockito.mock; import android.content.Context; +import androidx.annotation.NonNull; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.view.TextureRegistry; -import org.checkerframework.checker.nullness.qual.NonNull; /** * Test implementation of `ProxyApiRegistrar` that provides mocks, instantly runs callbacks instead diff --git a/packages/camera/camera_android_camerax/example/android/gradle.properties b/packages/camera/camera_android_camerax/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/camera/camera_android_camerax/example/android/gradle.properties +++ b/packages/camera/camera_android_camerax/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/camera/camera_android_camerax/example/android/settings.gradle b/packages/camera/camera_android_camerax/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- a/packages/camera/camera_android_camerax/example/android/settings.gradle +++ b/packages/camera/camera_android_camerax/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index fea407b822d..91493a1a2bb 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android_camerax description: Android implementation of the camera plugin using the CameraX library. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.6.20 +version: 0.6.20+1 environment: sdk: ^3.8.1 diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md index 34e38f055fd..37f3a277038 100644 --- a/packages/camera/camera_avfoundation/CHANGELOG.md +++ b/packages/camera/camera_avfoundation/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.20+7 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.9.20+6 * Migrates `captureToFile` and `getTemporaryFilePath` methods to Swift. diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml index 81472526975..2f4d5bd2a21 100644 --- a/packages/camera/camera_avfoundation/pubspec.yaml +++ b/packages/camera/camera_avfoundation/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_avfoundation description: iOS implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.9.20+6 +version: 0.9.20+7 environment: sdk: ^3.6.0 diff --git a/packages/espresso/example/android/gradle.properties b/packages/espresso/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/espresso/example/android/gradle.properties +++ b/packages/espresso/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/espresso/example/android/settings.gradle b/packages/espresso/example/android/settings.gradle index 93732cee4c1..3e2162f97f7 100644 --- a/packages/espresso/example/android/settings.gradle +++ b/packages/espresso/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle b/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle index ab8eef647ff..65898ffeb3b 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/settings.gradle +++ b/packages/extension_google_sign_in_as_googleapis_auth/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" id "com.google.gms.google-services" version "4.3.15" apply false } diff --git a/packages/file_selector/file_selector/example/android/gradle.properties b/packages/file_selector/file_selector/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/file_selector/file_selector/example/android/gradle.properties +++ b/packages/file_selector/file_selector/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/file_selector/file_selector/example/android/settings.gradle b/packages/file_selector/file_selector/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- 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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md index 5287f02fe8c..cd6be65f831 100644 --- a/packages/file_selector/file_selector_android/CHANGELOG.md +++ b/packages/file_selector/file_selector_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.1+15 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.5.1+14 * Removes obsolete code related to supporting SDK <21. diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index c52e2c4f833..27f1708c2db 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -38,8 +38,8 @@ android { implementation 'androidx.annotation:annotation:1.9.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation "org.robolectric:robolectric:4.14.1" + testImplementation 'androidx.test:core:1.7.0' + testImplementation "org.robolectric:robolectric:4.15.1" } lintOptions { diff --git a/packages/file_selector/file_selector_android/android/src/test/java/dev/flutter/packages/file_selector_android/FileUtilsTest.java b/packages/file_selector/file_selector_android/android/src/test/java/dev/flutter/packages/file_selector_android/FileUtilsTest.java index a6d0f573a53..7a03f4aab24 100644 --- a/packages/file_selector/file_selector_android/android/src/test/java/dev/flutter/packages/file_selector_android/FileUtilsTest.java +++ b/packages/file_selector/file_selector_android/android/src/test/java/dev/flutter/packages/file_selector_android/FileUtilsTest.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; +import android.os.Build; import android.os.Environment; import android.provider.DocumentsContract; import android.provider.MediaStore; @@ -41,7 +42,6 @@ import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowContentResolver; -import org.robolectric.shadows.ShadowMimeTypeMap; @RunWith(RobolectricTestRunner.class) public class FileUtilsTest { @@ -51,15 +51,21 @@ public class FileUtilsTest { ContentResolver contentResolver; @Before + @SuppressWarnings("deprecation") // shadowOf(MimeTypeMap) public void before() { context = ApplicationProvider.getApplicationContext(); contentResolver = spy(context.getContentResolver()); shadowContentResolver = shadowOf(context.getContentResolver()); - ShadowMimeTypeMap mimeTypeMap = shadowOf(MimeTypeMap.getSingleton()); - mimeTypeMap.addExtensionMimeTypeMapping("txt", "document/txt"); - mimeTypeMap.addExtensionMimeTypeMapping("jpg", "image/jpeg"); - mimeTypeMap.addExtensionMimeTypeMapping("png", "image/png"); - mimeTypeMap.addExtensionMimeTypeMapping("webp", "image/webp"); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + // On S and higher robolectric does not need this setup because all the mappings are + // present already. + //noinspection deprecation + var mimeTypeMap = shadowOf(MimeTypeMap.getSingleton()); + mimeTypeMap.addExtensionMimeTypeMapping("txt", "document/txt"); + mimeTypeMap.addExtensionMimeTypeMapping("jpg", "image/jpeg"); + mimeTypeMap.addExtensionMimeTypeMapping("png", "image/png"); + mimeTypeMap.addExtensionMimeTypeMapping("webp", "image/webp"); + } } @Test diff --git a/packages/file_selector/file_selector_android/example/android/gradle.properties b/packages/file_selector/file_selector_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/file_selector/file_selector_android/example/android/gradle.properties +++ b/packages/file_selector/file_selector_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/file_selector/file_selector_android/example/android/settings.gradle b/packages/file_selector/file_selector_android/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- 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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/file_selector/file_selector_android/pubspec.yaml b/packages/file_selector/file_selector_android/pubspec.yaml index 879ff4d0db7..00f94a02ace 100644 --- a/packages/file_selector/file_selector_android/pubspec.yaml +++ b/packages/file_selector/file_selector_android/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_android description: Android implementation of the file_selector package. repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.5.1+14 +version: 0.5.1+15 environment: sdk: ^3.6.0 diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md index c01231c5a8d..a4d5f7993ab 100644 --- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md +++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.29 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 2.0.28 * Removes obsolete code related to supporting SDK <21. diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index e655df72d5c..ba8b7a79787 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -62,5 +62,5 @@ android { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' + testImplementation 'org.mockito:mockito-core:5.18.0' } diff --git a/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties b/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties +++ b/packages/flutter_plugin_android_lifecycle/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle index daf776c1394..f50d09c506f 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle +++ b/packages/flutter_plugin_android_lifecycle/example/android/settings.gradle @@ -31,7 +31,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/flutter_plugin_android_lifecycle/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/pubspec.yaml index a5e542c63af..666074f7d9c 100644 --- a/packages/flutter_plugin_android_lifecycle/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_plugin_android_lifecycle description: Flutter plugin for accessing an Android Lifecycle within other plugins. repository: https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_plugin_android_lifecycle%22 -version: 2.0.28 +version: 2.0.29 environment: sdk: ^3.6.0 diff --git a/packages/go_router/example/android/gradle.properties b/packages/go_router/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/go_router/example/android/gradle.properties +++ b/packages/go_router/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/go_router/example/android/settings.gradle b/packages/go_router/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- a/packages/go_router/example/android/settings.gradle +++ b/packages/go_router/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties index 9d9aa874837..da87b2c8f89 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/gradle.properties @@ -1,4 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true - diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/settings.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index 510a041358d..5c7a093320e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.1 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 2.18.0 * Adds support for warming up the Google Maps SDK diff --git a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle index c926d6ff45e..7b318e424fd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle @@ -39,13 +39,13 @@ android { implementation "androidx.annotation:annotation:1.9.1" implementation 'com.google.android.gms:play-services-maps:19.2.0' implementation 'com.google.maps.android:android-maps-utils:3.6.0' - androidTestImplementation 'androidx.test:runner:1.6.2' - androidTestImplementation 'androidx.test:rules:1.6.1' + androidTestImplementation 'androidx.test:runner:1.7.0' + androidTestImplementation 'androidx.test:rules:1.7.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation "org.robolectric:robolectric:4.14.1" + testImplementation 'org.mockito:mockito-core:5.18.0' + testImplementation 'androidx.test:core:1.7.0' + testImplementation "org.robolectric:robolectric:4.15.1" } compileOptions { diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/android/gradle.properties b/packages/google_maps_flutter/google_maps_flutter_android/example/android/gradle.properties index bfb7805f566..da87b2c8f89 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/android/gradle.properties +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=false diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/android/settings.gradle b/packages/google_maps_flutter/google_maps_flutter_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/android/settings.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 8dc5362c215..642f1973f87 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.0 +version: 2.18.1 environment: sdk: ^3.6.0 diff --git a/packages/google_sign_in/google_sign_in/example/android/settings.gradle b/packages/google_sign_in/google_sign_in/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/google_sign_in/google_sign_in/example/android/settings.gradle +++ b/packages/google_sign_in/google_sign_in/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md index 7a6917bc038..55fa9184592 100644 --- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md @@ -1,5 +1,9 @@ ## 7.0.3 +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + +## 7.0.3 + * Add more details and troubleshooting for `serverClientId` configuration via Firebase. diff --git a/packages/google_sign_in/google_sign_in_android/example/android/settings.gradle b/packages/google_sign_in/google_sign_in_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/google_sign_in/google_sign_in_android/example/android/settings.gradle +++ b/packages/google_sign_in/google_sign_in_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/image_picker/image_picker/example/android/gradle.properties b/packages/image_picker/image_picker/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100755 --- a/packages/image_picker/image_picker/example/android/gradle.properties +++ b/packages/image_picker/image_picker/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/image_picker/image_picker/example/android/settings.gradle b/packages/image_picker/image_picker/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100755 --- a/packages/image_picker/image_picker/example/android/settings.gradle +++ b/packages/image_picker/image_picker/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index d6907a111b8..be0ed08b451 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.12+25 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.8.12+24 * Updates `androidx.activity:activity` to 1.10.1. diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index bfa8fc23466..fe937ef4e26 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -41,9 +41,9 @@ android { implementation 'androidx.activity:activity:1.10.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation "org.robolectric:robolectric:4.14.1" + testImplementation 'org.mockito:mockito-core:5.18.0' + testImplementation 'androidx.test:core:1.7.0' + testImplementation "org.robolectric:robolectric:4.15.1" } compileOptions { diff --git a/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java b/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java index 4c0a82e03fc..9f871415733 100644 --- a/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java +++ b/packages/image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java @@ -22,6 +22,7 @@ import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; +import android.os.Build; import android.provider.MediaStore; import android.webkit.MimeTypeMap; import androidx.annotation.NonNull; @@ -48,14 +49,20 @@ public class FileUtilTest { ShadowContentResolver shadowContentResolver; @Before + @SuppressWarnings("deprecation") // shadowOf(MimeTypeMap) public void before() { context = ApplicationProvider.getApplicationContext(); shadowContentResolver = shadowOf(context.getContentResolver()); fileUtils = new FileUtils(); - ShadowMimeTypeMap mimeTypeMap = shadowOf(MimeTypeMap.getSingleton()); - mimeTypeMap.addExtensionMimeTypeMapping("jpg", "image/jpeg"); - mimeTypeMap.addExtensionMimeTypeMapping("png", "image/png"); - mimeTypeMap.addExtensionMimeTypeMapping("webp", "image/webp"); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + // On S and higher robolectric does not need this setup because all the mappings are + // present already. + //noinspection deprecation + ShadowMimeTypeMap mimeTypeMap = shadowOf(MimeTypeMap.getSingleton()); + mimeTypeMap.addExtensionMimeTypeMapping("jpg", "image/jpeg"); + mimeTypeMap.addExtensionMimeTypeMapping("png", "image/png"); + mimeTypeMap.addExtensionMimeTypeMapping("webp", "image/webp"); + } } @Test diff --git a/packages/image_picker/image_picker_android/example/android/gradle.properties b/packages/image_picker/image_picker_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100755 --- a/packages/image_picker/image_picker_android/example/android/gradle.properties +++ b/packages/image_picker/image_picker_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/image_picker/image_picker_android/example/android/settings.gradle b/packages/image_picker/image_picker_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100755 --- a/packages/image_picker/image_picker_android/example/android/settings.gradle +++ b/packages/image_picker/image_picker_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml index 1008f98e3ea..7af8063fdf2 100755 --- a/packages/image_picker/image_picker_android/pubspec.yaml +++ b/packages/image_picker/image_picker_android/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_android description: Android implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.12+24 +version: 0.8.12+25 environment: sdk: ^3.6.0 diff --git a/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties b/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties +++ b/packages/in_app_purchase/in_app_purchase/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle b/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/settings.gradle +++ b/packages/in_app_purchase/in_app_purchase/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md index 0ef8b91f06f..ea98e542059 100644 --- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+3 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.4.0+2 * Adds support for setting the `offerToken` on `GooglePlayPurchaseParam`. diff --git a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle index 79880b1ef9f..e5514d4a624 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/android/build.gradle @@ -63,9 +63,9 @@ dependencies { implementation 'com.android.billingclient:billing:7.1.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20250107' - testImplementation 'org.mockito:mockito-core:5.17.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation 'org.robolectric:robolectric:4.14.1' - androidTestImplementation 'androidx.test:runner:1.6.2' + testImplementation 'org.mockito:mockito-core:5.18.0' + testImplementation 'androidx.test:core:1.7.0' + testImplementation 'org.robolectric:robolectric:4.15.1' + androidTestImplementation 'androidx.test:runner:1.7.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } diff --git a/packages/in_app_purchase/in_app_purchase_android/example/android/gradle.properties b/packages/in_app_purchase/in_app_purchase_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/in_app_purchase/in_app_purchase_android/example/android/gradle.properties +++ b/packages/in_app_purchase/in_app_purchase_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/in_app_purchase/in_app_purchase_android/example/android/settings.gradle b/packages/in_app_purchase/in_app_purchase_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/in_app_purchase/in_app_purchase_android/example/android/settings.gradle +++ b/packages/in_app_purchase/in_app_purchase_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml index eeb6472169f..1d3801d3b5d 100644 --- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml @@ -3,7 +3,7 @@ description: An implementation for the Android platform of the Flutter `in_app_p repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.4.0+2 +version: 0.4.0+3 environment: sdk: ^3.6.0 diff --git a/packages/interactive_media_ads/CHANGELOG.md b/packages/interactive_media_ads/CHANGELOG.md index 23763eb13c8..7a4e068c4a0 100644 --- a/packages/interactive_media_ads/CHANGELOG.md +++ b/packages/interactive_media_ads/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.6+2 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 0.2.6+1 * Fixes passing ads response to Android native `AdsRequest`. diff --git a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt index 639c791a6af..d5928fe1a48 100644 --- a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt +++ b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt @@ -21,7 +21,7 @@ class AdsRequestProxyApi(override val pigeonRegistrar: ProxyApiRegistrar) : * * This must match the version in pubspec.yaml. */ - const val pluginVersion = "0.2.6+1" + const val pluginVersion = "0.2.6+2" } override fun setAdTagUrl(pigeon_instance: AdsRequest, adTagUrl: String) { diff --git a/packages/interactive_media_ads/example/android/gradle.properties b/packages/interactive_media_ads/example/android/gradle.properties index 3b5b324f6e3..9112aa54cc0 100644 --- a/packages/interactive_media_ads/example/android/gradle.properties +++ b/packages/interactive_media_ads/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/interactive_media_ads/example/android/settings.gradle b/packages/interactive_media_ads/example/android/settings.gradle index b646af4deb7..fac9e762af9 100644 --- a/packages/interactive_media_ads/example/android/settings.gradle +++ b/packages/interactive_media_ads/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.10" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift b/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift index 33c823bb94a..d98862c976d 100644 --- a/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift +++ b/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift @@ -13,7 +13,7 @@ class AdsRequestProxyAPIDelegate: PigeonApiDelegateIMAAdsRequest { /// The current version of the `interactive_media_ads` plugin. /// /// This must match the version in pubspec.yaml. - static let pluginVersion = "0.2.6+1" + static let pluginVersion = "0.2.6+2" func pigeonDefaultConstructor( pigeonApi: PigeonApiIMAAdsRequest, adTagUrl: String, adDisplayContainer: IMAAdDisplayContainer, diff --git a/packages/interactive_media_ads/pubspec.yaml b/packages/interactive_media_ads/pubspec.yaml index aad8d848b07..1b88ae73fed 100644 --- a/packages/interactive_media_ads/pubspec.yaml +++ b/packages/interactive_media_ads/pubspec.yaml @@ -2,7 +2,7 @@ name: interactive_media_ads description: A Flutter plugin for using the Interactive Media Ads SDKs on Android and iOS. repository: https://github.com/flutter/packages/tree/main/packages/interactive_media_ads issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+interactive_media_ads%22 -version: 0.2.6+1 # This must match the version in +version: 0.2.6+2 # This must match the version in # `android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt` and # `ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift` diff --git a/packages/local_auth/local_auth/example/android/gradle.properties b/packages/local_auth/local_auth/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/local_auth/local_auth/example/android/gradle.properties +++ b/packages/local_auth/local_auth/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/local_auth/local_auth/example/android/settings.gradle b/packages/local_auth/local_auth/example/android/settings.gradle index 93732cee4c1..3e2162f97f7 100644 --- a/packages/local_auth/local_auth/example/android/settings.gradle +++ b/packages/local_auth/local_auth/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/local_auth/local_auth_android/CHANGELOG.md b/packages/local_auth/local_auth_android/CHANGELOG.md index 5d6ff579f88..69ec3474ea6 100644 --- a/packages/local_auth/local_auth_android/CHANGELOG.md +++ b/packages/local_auth/local_auth_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.51 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 1.0.50 * Updates `androidx.fragment:fragment` to 1.8.8. diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle index 6fa350a44c9..228d1a8474d 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle +++ b/packages/local_auth/local_auth_android/android/build.gradle @@ -61,8 +61,8 @@ dependencies { api "androidx.fragment:fragment:1.8.8" testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'org.robolectric:robolectric:4.14.1' - androidTestImplementation 'androidx.test:runner:1.6.2' - androidTestImplementation 'androidx.test:rules:1.6.1' + testImplementation 'org.robolectric:robolectric:4.15.1' + androidTestImplementation 'androidx.test:runner:1.7.0' + androidTestImplementation 'androidx.test:rules:1.7.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } diff --git a/packages/local_auth/local_auth_android/example/android/gradle.properties b/packages/local_auth/local_auth_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/local_auth/local_auth_android/example/android/gradle.properties +++ b/packages/local_auth/local_auth_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/local_auth/local_auth_android/example/android/settings.gradle b/packages/local_auth/local_auth_android/example/android/settings.gradle index 93732cee4c1..3e2162f97f7 100644 --- a/packages/local_auth/local_auth_android/example/android/settings.gradle +++ b/packages/local_auth/local_auth_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/local_auth/local_auth_android/pubspec.yaml b/packages/local_auth/local_auth_android/pubspec.yaml index 5d834e2045b..d835fc5d639 100644 --- a/packages/local_auth/local_auth_android/pubspec.yaml +++ b/packages/local_auth/local_auth_android/pubspec.yaml @@ -2,7 +2,7 @@ name: local_auth_android description: Android implementation of the local_auth plugin. repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22 -version: 1.0.50 +version: 1.0.51 environment: sdk: ^3.6.0 diff --git a/packages/path_provider/path_provider/example/android/gradle.properties b/packages/path_provider/path_provider/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/path_provider/path_provider/example/android/gradle.properties +++ b/packages/path_provider/path_provider/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/path_provider/path_provider/example/android/settings.gradle b/packages/path_provider/path_provider/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/path_provider/path_provider/example/android/settings.gradle +++ b/packages/path_provider/path_provider/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/path_provider/path_provider_android/example/android/gradle.properties b/packages/path_provider/path_provider_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/path_provider/path_provider_android/example/android/gradle.properties +++ b/packages/path_provider/path_provider_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/path_provider/path_provider_android/example/android/settings.gradle b/packages/path_provider/path_provider_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/path_provider/path_provider_android/example/android/settings.gradle +++ b/packages/path_provider/path_provider_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/pigeon/example/app/android/gradle.properties b/packages/pigeon/example/app/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/pigeon/example/app/android/gradle.properties +++ b/packages/pigeon/example/app/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/pigeon/example/app/android/settings.gradle b/packages/pigeon/example/app/android/settings.gradle index d4546883708..447fe6449ee 100644 --- a/packages/pigeon/example/app/android/settings.gradle +++ b/packages/pigeon/example/app/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle index 924de2bbc4e..a414817fd11 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/build.gradle @@ -54,6 +54,6 @@ android { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation "org.mockito:mockito-core:5.17.0" + testImplementation "org.mockito:mockito-core:5.18.0" } } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/settings.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 8fa1f2cd710..10f6db63f72 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -66,7 +66,7 @@ android { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation "io.mockk:mockk:1.13.16" + testImplementation "io.mockk:mockk:1.14.5" // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions. // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7 implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21")) diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties b/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties +++ b/packages/pigeon/platform_tests/test_plugin/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/settings.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/settings.gradle +++ b/packages/pigeon/platform_tests/test_plugin/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/quick_actions/quick_actions/example/android/gradle.properties b/packages/quick_actions/quick_actions/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/quick_actions/quick_actions/example/android/gradle.properties +++ b/packages/quick_actions/quick_actions/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/quick_actions/quick_actions/example/android/settings.gradle b/packages/quick_actions/quick_actions/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/quick_actions/quick_actions/example/android/settings.gradle +++ b/packages/quick_actions/quick_actions/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/quick_actions/quick_actions_android/CHANGELOG.md b/packages/quick_actions/quick_actions_android/CHANGELOG.md index 9296a5cafe0..b7682806bdd 100644 --- a/packages/quick_actions/quick_actions_android/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.22 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 1.0.21 * Removes obsolete code related to supporting SDK <21. diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index 3fa16499c6c..2d71f65a6bb 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -38,7 +38,7 @@ android { dependencies { implementation 'androidx.annotation:annotation:1.9.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' + testImplementation 'org.mockito:mockito-core:5.18.0' } compileOptions { diff --git a/packages/quick_actions/quick_actions_android/example/android/gradle.properties b/packages/quick_actions/quick_actions_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/quick_actions/quick_actions_android/example/android/gradle.properties +++ b/packages/quick_actions/quick_actions_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/quick_actions/quick_actions_android/example/android/settings.gradle b/packages/quick_actions/quick_actions_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/quick_actions/quick_actions_android/example/android/settings.gradle +++ b/packages/quick_actions/quick_actions_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/quick_actions/quick_actions_android/pubspec.yaml b/packages/quick_actions/quick_actions_android/pubspec.yaml index 1eddfda0350..9a957c00e65 100644 --- a/packages/quick_actions/quick_actions_android/pubspec.yaml +++ b/packages/quick_actions/quick_actions_android/pubspec.yaml @@ -2,7 +2,7 @@ name: quick_actions_android description: An implementation for the Android platform of the Flutter `quick_actions` plugin. repository: https://github.com/flutter/packages/tree/main/packages/quick_actions/quick_actions_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 1.0.21 +version: 1.0.22 environment: sdk: ^3.6.0 diff --git a/packages/rfw/example/hello/android/gradle.properties b/packages/rfw/example/hello/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/rfw/example/hello/android/gradle.properties +++ b/packages/rfw/example/hello/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/rfw/example/hello/android/settings.gradle b/packages/rfw/example/hello/android/settings.gradle index d4546883708..447fe6449ee 100644 --- a/packages/rfw/example/hello/android/settings.gradle +++ b/packages/rfw/example/hello/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/rfw/example/local/android/gradle.properties b/packages/rfw/example/local/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/rfw/example/local/android/gradle.properties +++ b/packages/rfw/example/local/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/rfw/example/local/android/settings.gradle b/packages/rfw/example/local/android/settings.gradle index d4546883708..447fe6449ee 100644 --- a/packages/rfw/example/local/android/settings.gradle +++ b/packages/rfw/example/local/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/rfw/example/remote/android/gradle.properties b/packages/rfw/example/remote/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/rfw/example/remote/android/gradle.properties +++ b/packages/rfw/example/remote/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/rfw/example/remote/android/settings.gradle b/packages/rfw/example/remote/android/settings.gradle index d4546883708..447fe6449ee 100644 --- a/packages/rfw/example/remote/android/settings.gradle +++ b/packages/rfw/example/remote/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/shared_preferences/shared_preferences/example/android/gradle.properties b/packages/shared_preferences/shared_preferences/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/shared_preferences/shared_preferences/example/android/gradle.properties +++ b/packages/shared_preferences/shared_preferences/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/shared_preferences/shared_preferences/example/android/settings.gradle b/packages/shared_preferences/shared_preferences/example/android/settings.gradle index 6265bb51eb9..0051b4e4dd8 100644 --- a/packages/shared_preferences/shared_preferences/example/android/settings.gradle +++ b/packages/shared_preferences/shared_preferences/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md index 8f4bade3515..5e05bb939fb 100644 --- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.11 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 2.4.10 * Removes obsolete code related to supporting SDK <21. diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index 631bbad7c5d..e9af528d6b6 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -63,11 +63,11 @@ android { implementation 'androidx.datastore:datastore-preferences:1.1.3' implementation 'androidx.preference:preference:1.2.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'androidx.test:core-ktx:1.6.1' + testImplementation 'androidx.test:core-ktx:1.7.0' testImplementation 'androidx.test.ext:junit-ktx:1.2.1' - testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'org.robolectric:robolectric:4.15.1' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'io.mockk:mockk:1.14.2' + testImplementation 'io.mockk:mockk:1.14.5' } diff --git a/packages/shared_preferences/shared_preferences_android/android/gradle.properties b/packages/shared_preferences/shared_preferences_android/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/shared_preferences/shared_preferences_android/android/gradle.properties +++ b/packages/shared_preferences/shared_preferences_android/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.kt b/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.kt index d6456df3ef5..49b15ac895b 100644 --- a/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.kt +++ b/packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.kt @@ -38,7 +38,7 @@ const val LIST_PREFIX = "VGhpcyBpcyB0aGUgcHJlZml4IGZvciBhIGxpc3Qu" const val JSON_LIST_PREFIX = LIST_PREFIX + "!" const val DOUBLE_PREFIX = "VGhpcyBpcyB0aGUgcHJlZml4IGZvciBEb3VibGUu" -private val Context.sharedPreferencesDataStore: DataStore by +/*package private*/ val Context.sharedPreferencesDataStore: DataStore by preferencesDataStore(SHARED_PREFERENCES_NAME) /// SharedPreferencesPlugin diff --git a/packages/shared_preferences/shared_preferences_android/example/android/gradle.properties b/packages/shared_preferences/shared_preferences_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/shared_preferences/shared_preferences_android/example/android/gradle.properties +++ b/packages/shared_preferences/shared_preferences_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/shared_preferences/shared_preferences_android/example/android/settings.gradle b/packages/shared_preferences/shared_preferences_android/example/android/settings.gradle index 72725980152..b65c5a7cce2 100644 --- a/packages/shared_preferences/shared_preferences_android/example/android/settings.gradle +++ b/packages/shared_preferences/shared_preferences_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.9.1' apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/shared_preferences/shared_preferences_android/pubspec.yaml b/packages/shared_preferences/shared_preferences_android/pubspec.yaml index 2ff5e705eb8..e00f5865991 100644 --- a/packages/shared_preferences/shared_preferences_android/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_android/pubspec.yaml @@ -2,7 +2,7 @@ name: shared_preferences_android description: Android implementation of the shared_preferences plugin repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.4.10 +version: 2.4.11 environment: sdk: ^3.6.0 diff --git a/packages/two_dimensional_scrollables/example/android/gradle.properties b/packages/two_dimensional_scrollables/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/two_dimensional_scrollables/example/android/gradle.properties +++ b/packages/two_dimensional_scrollables/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/two_dimensional_scrollables/example/android/settings.gradle b/packages/two_dimensional_scrollables/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- 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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/url_launcher/url_launcher/example/android/gradle.properties b/packages/url_launcher/url_launcher/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/url_launcher/url_launcher/example/android/gradle.properties +++ b/packages/url_launcher/url_launcher/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/url_launcher/url_launcher/example/android/settings.gradle b/packages/url_launcher/url_launcher/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/url_launcher/url_launcher/example/android/settings.gradle +++ b/packages/url_launcher/url_launcher/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md index 4e3c5e9fc0c..a50df37cc02 100644 --- a/packages/url_launcher/url_launcher_android/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.3.17 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 6.3.16 * Removes obsolete code related to supporting SDK <21. diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index c5cb3622210..af15b5bd047 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -65,7 +65,7 @@ dependencies { implementation 'androidx.annotation:annotation:1.9.1' implementation 'androidx.browser:browser:1.8.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' - testImplementation 'androidx.test:core:1.6.1' - testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'org.mockito:mockito-core:5.18.0' + testImplementation 'androidx.test:core:1.7.0' + testImplementation 'org.robolectric:robolectric:4.15.1' } diff --git a/packages/url_launcher/url_launcher_android/example/android/settings.gradle b/packages/url_launcher/url_launcher_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/url_launcher/url_launcher_android/example/android/settings.gradle +++ b/packages/url_launcher/url_launcher_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/url_launcher/url_launcher_android/pubspec.yaml b/packages/url_launcher/url_launcher_android/pubspec.yaml index db86a890a65..4adcf28d196 100644 --- a/packages/url_launcher/url_launcher_android/pubspec.yaml +++ b/packages/url_launcher/url_launcher_android/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher_android description: Android implementation of the url_launcher plugin. repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22 -version: 6.3.16 +version: 6.3.17 environment: sdk: ^3.6.0 flutter: ">=3.27.0" diff --git a/packages/video_player/video_player/example/android/gradle.properties b/packages/video_player/video_player/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/video_player/video_player/example/android/gradle.properties +++ b/packages/video_player/video_player/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/video_player/video_player/example/android/settings.gradle b/packages/video_player/video_player/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/video_player/video_player/example/android/settings.gradle +++ b/packages/video_player/video_player/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 05ad6a287c3..e21943e4a63 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.8.11 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 2.8.10 * Restructures internal logic to move more code to Dart. diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 7377f98ae12..3e7c6b2ca23 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -47,9 +47,9 @@ android { implementation "androidx.media3:media3-exoplayer-rtsp:${exoplayer_version}" implementation "androidx.media3:media3-exoplayer-smoothstreaming:${exoplayer_version}" testImplementation 'junit:junit:4.13.2' - testImplementation 'androidx.test:core:1.6.1' + testImplementation 'androidx.test:core:1.7.0' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'org.robolectric:robolectric:4.14.1' + testImplementation 'org.robolectric:robolectric:4.15.1' testImplementation "androidx.media3:media3-test-utils:${exoplayer_version}" } diff --git a/packages/video_player/video_player_android/example/android/gradle.properties b/packages/video_player/video_player_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/video_player/video_player_android/example/android/gradle.properties +++ b/packages/video_player/video_player_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/video_player/video_player_android/example/android/settings.gradle b/packages/video_player/video_player_android/example/android/settings.gradle index 7ce1cc404d3..fac9e762af9 100644 --- a/packages/video_player/video_player_android/example/android/settings.gradle +++ b/packages/video_player/video_player_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml index 5d6281f5494..a9e239057b8 100644 --- a/packages/video_player/video_player_android/pubspec.yaml +++ b/packages/video_player/video_player_android/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_android description: Android implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 -version: 2.8.10 +version: 2.8.11 environment: sdk: ^3.7.0 diff --git a/packages/webview_flutter/webview_flutter/example/android/gradle.properties b/packages/webview_flutter/webview_flutter/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/webview_flutter/webview_flutter/example/android/gradle.properties +++ b/packages/webview_flutter/webview_flutter/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/webview_flutter/webview_flutter/example/android/settings.gradle b/packages/webview_flutter/webview_flutter/example/android/settings.gradle index 0cb2cff94aa..fac9e762af9 100644 --- a/packages/webview_flutter/webview_flutter/example/android/settings.gradle +++ b/packages/webview_flutter/webview_flutter/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.9.1" apply false - id "org.jetbrains.kotlin.android" version "2.0.21" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md index 25b494d90c8..0d8e243799e 100644 --- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md +++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.9.1 + +* Updates kotlin version to 2.2.0 to enable gradle 8.11 support. + ## 4.9.0 * Adds support for `PlatformWebViewController.loadFileWithParams`. diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index f7e6a534871..b2d1c45296e 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -52,9 +52,9 @@ android { implementation 'androidx.annotation:annotation:1.9.1' implementation 'androidx.webkit:webkit:1.14.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.17.0' + testImplementation 'org.mockito:mockito-core:5.18.0' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'androidx.test:core:1.6.1' + testImplementation 'androidx.test:core:1.7.0' } testOptions { diff --git a/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties b/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties index 598d13fee44..da87b2c8f89 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties +++ b/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/webview_flutter/webview_flutter_android/example/android/settings.gradle b/packages/webview_flutter/webview_flutter_android/example/android/settings.gradle index b646af4deb7..fac9e762af9 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/settings.gradle +++ b/packages/webview_flutter/webview_flutter_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.9.1" apply false - id "org.jetbrains.kotlin.android" version "1.9.10" apply false + id "org.jetbrains.kotlin.android" version "2.2.0" apply false id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1" } diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml index 6498db12370..3400227bbe4 100644 --- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: webview_flutter_android description: A Flutter plugin that provides a WebView widget on Android. repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22 -version: 4.9.0 +version: 4.9.1 environment: sdk: ^3.6.0