From 84dd6aa4a14950920e87b247a59657e2211f6991 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 2 Jan 2024 12:59:29 -0800 Subject: [PATCH 01/10] Bump + rename --- .ci/legacy_project/all_packages/android/app/build.gradle | 2 +- packages/animations/example/android/app/build.gradle | 2 +- packages/camera/camera/example/android/app/build.gradle | 2 +- packages/camera/camera_android/android/build.gradle | 2 +- .../camera_android/example/android/app/build.gradle | 2 +- .../camera/camera_android_camerax/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- packages/dynamic_layouts/example/android/app/build.gradle | 2 +- packages/espresso/android/build.gradle | 2 +- packages/espresso/example/android/app/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../file_selector/example/android/app/build.gradle | 2 +- .../file_selector_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- packages/flutter_image/example/android/app/build.gradle | 2 +- .../flutter_markdown/example/android/app/build.gradle | 2 +- .../flutter_plugin_android_lifecycle/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- packages/go_router/example/android/app/build.gradle | 2 +- .../google_maps_flutter/example/android/app/build.gradle | 2 +- .../google_maps_flutter_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../google_sign_in/example/android/app/build.gradle | 2 +- .../google_sign_in_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../image_picker/example/android/app/build.gradle | 2 +- .../image_picker_android/android/build.gradle | 2 +- .../image_picker_android/example/android/app/build.gradle | 2 +- .../in_app_purchase/example/android/app/build.gradle | 2 +- .../in_app_purchase_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../local_auth/example/android/app/build.gradle | 2 +- .../local_auth/local_auth_android/android/build.gradle | 2 +- .../local_auth_android/example/android/app/build.gradle | 2 +- .../palette_generator/example/android/app/build.gradle | 2 +- .../path_provider/example/android/app/build.gradle | 2 +- .../path_provider_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- packages/pigeon/example/app/android/app/build.gradle | 2 +- .../alternate_language_test_plugin/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../platform_tests/test_plugin/android/build.gradle | 2 +- .../test_plugin/example/android/app/build.gradle | 2 +- packages/platform/example/android/app/build.gradle | 2 +- .../quick_actions/example/android/app/build.gradle | 2 +- .../quick_actions_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- packages/rfw/example/hello/android/app/build.gradle | 2 +- packages/rfw/example/local/android/app/build.gradle | 2 +- packages/rfw/example/remote/android/app/build.gradle | 2 +- .../shared_preferences/example/android/app/build.gradle | 2 +- .../shared_preferences_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../url_launcher/example/android/app/build.gradle | 2 +- .../url_launcher_android/android/build.gradle | 2 +- .../url_launcher_android/example/android/app/build.gradle | 2 +- .../video_player/example/android/app/build.gradle | 2 +- .../video_player_android/android/build.gradle | 2 +- .../video_player_android/example/android/app/build.gradle | 2 +- .../webview_flutter/example/android/app/build.gradle | 2 +- .../webview_flutter_android/android/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- script/tool/lib/src/create_all_packages_app_command.dart | 4 ++-- .../tool/test/create_all_packages_app_command_test.dart | 8 ++++---- script/tool/test/gradle_check_command_test.dart | 4 ++-- 67 files changed, 72 insertions(+), 72 deletions(-) diff --git a/.ci/legacy_project/all_packages/android/app/build.gradle b/.ci/legacy_project/all_packages/android/app/build.gradle index b75c7b0561b..0c49fab0a8f 100644 --- a/.ci/legacy_project/all_packages/android/app/build.gradle +++ b/.ci/legacy_project/all_packages/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdk 30 defaultConfig { applicationId "com.example.all_packages" diff --git a/packages/animations/example/android/app/build.gradle b/packages/animations/example/android/app/build.gradle index 11055bc3b52..f807599056d 100644 --- a/packages/animations/example/android/app/build.gradle +++ b/packages/animations/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.packages.animations.example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/packages/camera/camera/example/android/app/build.gradle b/packages/camera/camera/example/android/app/build.gradle index 61b278f8d43..a6e00fd3896 100644 --- a/packages/camera/camera/example/android/app/build.gradle +++ b/packages/camera/camera/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.cameraexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle index 2c14eb03c98..824931536ec 100644 --- a/packages/camera/camera_android/android/build.gradle +++ b/packages/camera/camera_android/android/build.gradle @@ -34,7 +34,7 @@ buildFeatures { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.camera' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/packages/camera/camera_android/example/android/app/build.gradle b/packages/camera/camera_android/example/android/app/build.gradle index 61b278f8d43..a6e00fd3896 100644 --- a/packages/camera/camera_android/example/android/app/build.gradle +++ b/packages/camera/camera_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.cameraexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 5530a3bb104..dc61dd2640c 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -27,7 +27,7 @@ android { namespace 'io.flutter.plugins.camerax' } // CameraX dependencies require compilation against version 33 or later. - compileSdkVersion 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/camera/camera_android_camerax/example/android/app/build.gradle b/packages/camera/camera_android_camerax/example/android/app/build.gradle index 44b11029bb1..c9117991074 100644 --- a/packages/camera/camera_android_camerax/example/android/app/build.gradle +++ b/packages/camera/camera_android_camerax/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.cameraxexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/dynamic_layouts/example/android/app/build.gradle b/packages/dynamic_layouts/example/android/app/build.gradle index a898241f15b..f2293865f2f 100644 --- a/packages/dynamic_layouts/example/android/app/build.gradle +++ b/packages/dynamic_layouts/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.packages.animations.example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle index c9c0e225fd1..4fc9453880e 100644 --- a/packages/espresso/android/build.gradle +++ b/packages/espresso/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'com.example.espresso' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/espresso/example/android/app/build.gradle b/packages/espresso/example/android/app/build.gradle index 9a4b2825328..6deacadd65c 100644 --- a/packages/espresso/example/android/app/build.gradle +++ b/packages/espresso/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). namespace "com.example.espresso_example" diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle index 9f6114ae3b7..497c231a3ab 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/file_selector/file_selector/example/android/app/build.gradle b/packages/file_selector/file_selector/example/android/app/build.gradle index 56af9bc1f95..4728b6c2863 100644 --- a/packages/file_selector/file_selector/example/android/app/build.gradle +++ b/packages/file_selector/file_selector/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "dev.flutter.plugins.file_selector_example" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/file_selector/file_selector_android/android/build.gradle b/packages/file_selector/file_selector_android/android/build.gradle index 27c4ac6e926..0d36575bd71 100644 --- a/packages/file_selector/file_selector_android/android/build.gradle +++ b/packages/file_selector/file_selector_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'dev.flutter.packages.file_selector_android' } - compileSdkVersion 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/file_selector/file_selector_android/example/android/app/build.gradle b/packages/file_selector/file_selector_android/example/android/app/build.gradle index 8e9407350c0..a0a7ccb1e24 100644 --- a/packages/file_selector/file_selector_android/example/android/app/build.gradle +++ b/packages/file_selector/file_selector_android/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "dev.flutter.packages.file_selector_android_example" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/flutter_adaptive_scaffold/example/android/app/build.gradle b/packages/flutter_adaptive_scaffold/example/android/app/build.gradle index 39c5b20fb1d..9d27f54fdcb 100644 --- a/packages/flutter_adaptive_scaffold/example/android/app/build.gradle +++ b/packages/flutter_adaptive_scaffold/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/flutter_image/example/android/app/build.gradle b/packages/flutter_image/example/android/app/build.gradle index 02ac52a437f..dc2df2c455e 100644 --- a/packages/flutter_image/example/android/app/build.gradle +++ b/packages/flutter_image/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "com.example.example" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/flutter_markdown/example/android/app/build.gradle b/packages/flutter_markdown/example/android/app/build.gradle index b2f0f4bc8ed..e542c8f72cb 100644 --- a/packages/flutter_markdown/example/android/app/build.gradle +++ b/packages/flutter_markdown/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/packages/flutter_plugin_android_lifecycle/android/build.gradle b/packages/flutter_plugin_android_lifecycle/android/build.gradle index 44194833c94..43581360120 100644 --- a/packages/flutter_plugin_android_lifecycle/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.flutter_plugin_android_lifecycle' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle b/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle index 3e603d54f87..19689e74b47 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/go_router/example/android/app/build.gradle b/packages/go_router/example/android/app/build.gradle index f8b6fdbd569..5ea125183af 100644 --- a/packages/go_router/example/android/app/build.gradle +++ b/packages/go_router/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle index 1425832cda3..a1ea94ae55c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { 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 93ad81bf154..e9ea102e397 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 @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.googlemaps' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 20 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle b/packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle index cd426eeb89d..e153293498e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.googlemapsexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/google_sign_in/google_sign_in/example/android/app/build.gradle b/packages/google_sign_in/google_sign_in/example/android/app/build.gradle index 809ca7d7fd6..422b58cc519 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/build.gradle +++ b/packages/google_sign_in/google_sign_in/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.googlesigninexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/google_sign_in/google_sign_in_android/android/build.gradle b/packages/google_sign_in/google_sign_in_android/android/build.gradle index 127eb709698..de3ca75ca1c 100644 --- a/packages/google_sign_in/google_sign_in_android/android/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.googlesignin' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle b/packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle index 809ca7d7fd6..422b58cc519 100644 --- a/packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle +++ b/packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.googlesigninexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/image_picker/image_picker/example/android/app/build.gradle b/packages/image_picker/image_picker/example/android/app/build.gradle index da9fb763371..e72b6897764 100755 --- a/packages/image_picker/image_picker/example/android/app/build.gradle +++ b/packages/image_picker/image_picker/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.imagepickerexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion testOptions.unitTests.includeAndroidResources = true diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle index 9aa57dc326d..eaeb2d94706 100644 --- a/packages/image_picker/image_picker_android/android/build.gradle +++ b/packages/image_picker/image_picker_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.imagepicker' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/image_picker/image_picker_android/example/android/app/build.gradle b/packages/image_picker/image_picker_android/example/android/app/build.gradle index 3ae9dab303e..1be93f0fa34 100755 --- a/packages/image_picker/image_picker_android/example/android/app/build.gradle +++ b/packages/image_picker/image_picker_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.imagepickerexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion testOptions.unitTests.includeAndroidResources = true diff --git a/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle b/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle index b0f7453a43f..d1e8ea9832f 100644 --- a/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle +++ b/packages/in_app_purchase/in_app_purchase/example/android/app/build.gradle @@ -64,7 +64,7 @@ android { } } - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { 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 8482d3f3ea5..b729b7022ad 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 @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.inapppurchase' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/in_app_purchase/in_app_purchase_android/example/android/app/build.gradle b/packages/in_app_purchase/in_app_purchase_android/example/android/app/build.gradle index dd0c26c8a49..1cffa7dfb76 100644 --- a/packages/in_app_purchase/in_app_purchase_android/example/android/app/build.gradle +++ b/packages/in_app_purchase/in_app_purchase_android/example/android/app/build.gradle @@ -55,7 +55,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.inapppurchaseexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion signingConfigs { release { diff --git a/packages/local_auth/local_auth/example/android/app/build.gradle b/packages/local_auth/local_auth/example/android/app/build.gradle index 0520ad0e2b6..f075d5813cf 100644 --- a/packages/local_auth/local_auth/example/android/app/build.gradle +++ b/packages/local_auth/local_auth/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.localauthexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/local_auth/local_auth_android/android/build.gradle b/packages/local_auth/local_auth_android/android/build.gradle index b91b9825a19..c47f143610a 100644 --- a/packages/local_auth/local_auth_android/android/build.gradle +++ b/packages/local_auth/local_auth_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.localauth' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/local_auth/local_auth_android/example/android/app/build.gradle b/packages/local_auth/local_auth_android/example/android/app/build.gradle index 0520ad0e2b6..f075d5813cf 100644 --- a/packages/local_auth/local_auth_android/example/android/app/build.gradle +++ b/packages/local_auth/local_auth_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.localauthexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/palette_generator/example/android/app/build.gradle b/packages/palette_generator/example/android/app/build.gradle index 82aebe0c93c..c03f3db0324 100644 --- a/packages/palette_generator/example/android/app/build.gradle +++ b/packages/palette_generator/example/android/app/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/path_provider/path_provider/example/android/app/build.gradle b/packages/path_provider/path_provider/example/android/app/build.gradle index f7674c02641..3e67e5d7f4c 100644 --- a/packages/path_provider/path_provider/example/android/app/build.gradle +++ b/packages/path_provider/path_provider/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.pathproviderexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/path_provider/path_provider_android/android/build.gradle b/packages/path_provider/path_provider_android/android/build.gradle index da1b2feeb6f..22eb84b41bd 100644 --- a/packages/path_provider/path_provider_android/android/build.gradle +++ b/packages/path_provider/path_provider_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.pathprovider' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/path_provider/path_provider_android/example/android/app/build.gradle b/packages/path_provider/path_provider_android/example/android/app/build.gradle index f7674c02641..3e67e5d7f4c 100644 --- a/packages/path_provider/path_provider_android/example/android/app/build.gradle +++ b/packages/path_provider/path_provider_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.pathproviderexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/pigeon/example/app/android/app/build.gradle b/packages/pigeon/example/app/android/app/build.gradle index f3c3deea4fa..0877433025a 100644 --- a/packages/pigeon/example/app/android/app/build.gradle +++ b/packages/pigeon/example/app/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "dev.flutter.pigeon_example_app" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { 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 a6a50278f9f..46b0b9ef1bf 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 @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'com.example.alternate_language_test_plugin' } - compileSdkVersion 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle index 9f01f9bdb6b..aecfb56abf7 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'com.example.alternate_language_test_plugin_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 65c1aed04f9..0c9d5d437c4 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -29,7 +29,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'com.example.test_plugin' } - compileSdkVersion 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle index ff91598737f..92b34cf1b3e 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'com.example.test_plugin_example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/platform/example/android/app/build.gradle b/packages/platform/example/android/app/build.gradle index 2e6f34a135b..94702dbb807 100644 --- a/packages/platform/example/android/app/build.gradle +++ b/packages/platform/example/android/app/build.gradle @@ -24,7 +24,7 @@ if (flutterVersionName == null) { android { namespace "dev.flutter.plaform_example" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/quick_actions/quick_actions/example/android/app/build.gradle b/packages/quick_actions/quick_actions/example/android/app/build.gradle index a231ccdbcdb..132e1b9618a 100644 --- a/packages/quick_actions/quick_actions/example/android/app/build.gradle +++ b/packages/quick_actions/quick_actions/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.quickactionsexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/quick_actions/quick_actions_android/android/build.gradle b/packages/quick_actions/quick_actions_android/android/build.gradle index 942584d964d..a66c18177f7 100644 --- a/packages/quick_actions/quick_actions_android/android/build.gradle +++ b/packages/quick_actions/quick_actions_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.quickactions' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/quick_actions/quick_actions_android/example/android/app/build.gradle b/packages/quick_actions/quick_actions_android/example/android/app/build.gradle index 2fe40dfe654..82f0366b547 100644 --- a/packages/quick_actions/quick_actions_android/example/android/app/build.gradle +++ b/packages/quick_actions/quick_actions_android/example/android/app/build.gradle @@ -28,7 +28,7 @@ def androidXTestVersion = '1.2.0' android { namespace 'io.flutter.plugins.quickactionsexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/rfw/example/hello/android/app/build.gradle b/packages/rfw/example/hello/android/app/build.gradle index d345ff3a66e..100a64244e1 100644 --- a/packages/rfw/example/hello/android/app/build.gradle +++ b/packages/rfw/example/hello/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.rfw.examples.hello' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/rfw/example/local/android/app/build.gradle b/packages/rfw/example/local/android/app/build.gradle index 1227c5e713c..5bbaeffa4b3 100644 --- a/packages/rfw/example/local/android/app/build.gradle +++ b/packages/rfw/example/local/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.rfw.examples.local' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/rfw/example/remote/android/app/build.gradle b/packages/rfw/example/remote/android/app/build.gradle index a3f96e0be73..8ece05d61c0 100644 --- a/packages/rfw/example/remote/android/app/build.gradle +++ b/packages/rfw/example/remote/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.rfw.examples.remote' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/shared_preferences/shared_preferences/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences/example/android/app/build.gradle index 5ba2f9fbca5..237a211a6cc 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/build.gradle +++ b/packages/shared_preferences/shared_preferences/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.sharedpreferencesexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/packages/shared_preferences/shared_preferences_android/android/build.gradle b/packages/shared_preferences/shared_preferences_android/android/build.gradle index f3074dd3adc..ef0a6afef70 100644 --- a/packages/shared_preferences/shared_preferences_android/android/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/android/build.gradle @@ -34,7 +34,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.sharedpreferences' } - compileSdkVersion 33 + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle index 5ba2f9fbca5..237a211a6cc 100644 --- a/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle +++ b/packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.sharedpreferencesexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/packages/two_dimensional_scrollables/example/android/app/build.gradle b/packages/two_dimensional_scrollables/example/android/app/build.gradle index 2f3d3531e36..6648ebb4f24 100644 --- a/packages/two_dimensional_scrollables/example/android/app/build.gradle +++ b/packages/two_dimensional_scrollables/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'dev.flutter.packages.two_dimensional_scrollables.example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/packages/url_launcher/url_launcher/example/android/app/build.gradle b/packages/url_launcher/url_launcher/example/android/app/build.gradle index 19036583100..60d78e27eb3 100644 --- a/packages/url_launcher/url_launcher/example/android/app/build.gradle +++ b/packages/url_launcher/url_launcher/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.urllauncherexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/url_launcher/url_launcher_android/android/build.gradle b/packages/url_launcher/url_launcher_android/android/build.gradle index 9626cf53f15..ca7fab0259a 100644 --- a/packages/url_launcher/url_launcher_android/android/build.gradle +++ b/packages/url_launcher/url_launcher_android/android/build.gradle @@ -29,7 +29,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.urllauncher' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/url_launcher/url_launcher_android/example/android/app/build.gradle b/packages/url_launcher/url_launcher_android/example/android/app/build.gradle index 19036583100..60d78e27eb3 100644 --- a/packages/url_launcher/url_launcher_android/example/android/app/build.gradle +++ b/packages/url_launcher/url_launcher_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.urllauncherexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/video_player/video_player/example/android/app/build.gradle b/packages/video_player/video_player/example/android/app/build.gradle index d72e21b2017..097935b6b0b 100644 --- a/packages/video_player/video_player/example/android/app/build.gradle +++ b/packages/video_player/video_player/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.videoplayerexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index c842cacaa1c..88a412dd319 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -31,7 +31,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.videoplayer' } - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 16 diff --git a/packages/video_player/video_player_android/example/android/app/build.gradle b/packages/video_player/video_player_android/example/android/app/build.gradle index 6862f8c9b7c..697bde16c07 100644 --- a/packages/video_player/video_player_android/example/android/app/build.gradle +++ b/packages/video_player/video_player_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.videoplayerexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle index b090c497b48..a30fd72bb1a 100644 --- a/packages/webview_flutter/webview_flutter/example/android/app/build.gradle +++ b/packages/webview_flutter/webview_flutter/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.webviewflutterexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/packages/webview_flutter/webview_flutter_android/android/build.gradle b/packages/webview_flutter/webview_flutter_android/android/build.gradle index 3e2ffff1e0b..76b56e0d2a6 100644 --- a/packages/webview_flutter/webview_flutter_android/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/android/build.gradle @@ -26,7 +26,7 @@ android { if (project.android.hasProperty("namespace")) { namespace 'io.flutter.plugins.webviewflutter' } - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 19 diff --git a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle index 533fd0193c6..095cb635c40 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'io.flutter.plugins.webviewflutterexample' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { diff --git a/script/tool/lib/src/create_all_packages_app_command.dart b/script/tool/lib/src/create_all_packages_app_command.dart index ab49174a7b0..27687b371c5 100644 --- a/script/tool/lib/src/create_all_packages_app_command.dart +++ b/script/tool/lib/src/create_all_packages_app_command.dart @@ -236,8 +236,8 @@ dependencies {} replacements: >{ // minSdkVersion 21 is required by camera_android. 'minSdkVersion': ['minSdkVersion 21'], - // compileSdkVersion 33 is required by local_auth. - 'compileSdkVersion': ['compileSdkVersion 33'], + // compileSdk version 33 is required by local_auth. + 'compileSdkVersion': ['compileSdk 33'], }, additions: >{ 'defaultConfig {': [' multiDexEnabled true'], diff --git a/script/tool/test/create_all_packages_app_command_test.dart b/script/tool/test/create_all_packages_app_command_test.dart index 15d828a9099..156d27eee47 100644 --- a/script/tool/test/create_all_packages_app_command_test.dart +++ b/script/tool/test/create_all_packages_app_command_test.dart @@ -68,7 +68,7 @@ dependencies { ..writeAsStringSync(''' android { namespace 'dev.flutter.packages.foo.example' - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -300,7 +300,7 @@ project 'Runner', { const String legacyAppBuildGradleContents = ''' # This is the legacy file android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion defaultConfig { minSdkVersion flutter.minSdkVersion } @@ -328,7 +328,7 @@ android { containsAll([ contains('This is the legacy file'), contains('minSdkVersion 21'), - contains('compileSdkVersion 33'), + contains('compileSdk 33'), ])); }); @@ -362,7 +362,7 @@ android { buildGradle, containsAll([ contains('minSdkVersion 21'), - contains('compileSdkVersion 33'), + contains('compileSdk 33'), contains('multiDexEnabled true'), contains('androidx.lifecycle:lifecycle-runtime'), ])); diff --git a/script/tool/test/gradle_check_command_test.dart b/script/tool/test/gradle_check_command_test.dart index a7db8317b94..2e1b7146a41 100644 --- a/script/tool/test/gradle_check_command_test.dart +++ b/script/tool/test/gradle_check_command_test.dart @@ -96,7 +96,7 @@ apply plugin: 'com.android.library' ${includeLanguageVersion ? javaSection : ''} android { ${includeNamespace ? namespace : ''} - compileSdkVersion 33 + compileSdk 33 defaultConfig { minSdkVersion 30 @@ -234,7 +234,7 @@ apply from: "\$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { ${includeNamespace ? namespace : ''} - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion lintOptions { disable 'InvalidPackage' From e5647d519cfe51d5d37580e0661dff1a118ea61e Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 10:28:40 -0800 Subject: [PATCH 02/10] Bump all packages --- script/tool/lib/src/create_all_packages_app_command.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/tool/lib/src/create_all_packages_app_command.dart b/script/tool/lib/src/create_all_packages_app_command.dart index 27687b371c5..b84d0b41bd2 100644 --- a/script/tool/lib/src/create_all_packages_app_command.dart +++ b/script/tool/lib/src/create_all_packages_app_command.dart @@ -236,8 +236,7 @@ dependencies {} replacements: >{ // minSdkVersion 21 is required by camera_android. 'minSdkVersion': ['minSdkVersion 21'], - // compileSdk version 33 is required by local_auth. - 'compileSdkVersion': ['compileSdk 33'], + 'compileSdkVersion': ['compileSdk 34'], }, additions: >{ 'defaultConfig {': [' multiDexEnabled true'], From e11dd0aa6124479dfb7d56938029adb9676cf8a8 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 11:15:12 -0800 Subject: [PATCH 03/10] Try bump to 33 --- .ci/legacy_project/all_packages/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/legacy_project/all_packages/android/app/build.gradle b/.ci/legacy_project/all_packages/android/app/build.gradle index 0c49fab0a8f..0fc722fc59c 100644 --- a/.ci/legacy_project/all_packages/android/app/build.gradle +++ b/.ci/legacy_project/all_packages/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk 30 + compileSdk 33 defaultConfig { applicationId "com.example.all_packages" From cbc265e7cf5a08e2ec0d6ab3020a293f999c80dc Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 12:50:33 -0800 Subject: [PATCH 04/10] Legacy proj updates --- .ci/legacy_project/README.md | 2 ++ .ci/legacy_project/all_packages/android/app/build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/legacy_project/README.md b/.ci/legacy_project/README.md index ac2285a1c5f..98ad7d49aed 100644 --- a/.ci/legacy_project/README.md +++ b/.ci/legacy_project/README.md @@ -37,3 +37,5 @@ and then deleting everything but `android/` from it: - Added license boilerplate. - Replaced `jcenter` in build.gradle with `mavenCentral`, due to the jcenter.bintray.com shutdown. +- Update `compileSdkVersion` from 30 to 33 to maintain compatibility + with plugins that use API 34. diff --git a/.ci/legacy_project/all_packages/android/app/build.gradle b/.ci/legacy_project/all_packages/android/app/build.gradle index 0fc722fc59c..e63210bfca1 100644 --- a/.ci/legacy_project/all_packages/android/app/build.gradle +++ b/.ci/legacy_project/all_packages/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk 33 + compileSdkVersion 33 defaultConfig { applicationId "com.example.all_packages" From cf74f8ffcb58c1f4d5a6e4874f5d2615938724a2 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 13:15:36 -0800 Subject: [PATCH 05/10] Add changelog entries --- packages/camera/camera_android/CHANGELOG.md | 4 ++++ packages/camera/camera_android_camerax/CHANGELOG.md | 4 ++++ packages/espresso/CHANGELOG.md | 1 + packages/file_selector/file_selector_android/CHANGELOG.md | 4 ++++ packages/flutter_plugin_android_lifecycle/CHANGELOG.md | 1 + .../google_maps_flutter_android/CHANGELOG.md | 4 ++++ packages/google_sign_in/google_sign_in_android/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker_android/CHANGELOG.md | 4 ++++ packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md | 4 ++++ packages/local_auth/local_auth_android/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider_android/CHANGELOG.md | 4 ++++ packages/quick_actions/quick_actions_android/CHANGELOG.md | 4 ++++ .../shared_preferences_android/CHANGELOG.md | 1 + packages/url_launcher/url_launcher_android/CHANGELOG.md | 4 ++++ packages/video_player/video_player_android/CHANGELOG.md | 4 ++++ 15 files changed, 51 insertions(+) diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index d3b85feaf9f..5afd95b3ab0 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 0.10.8+16 * Fixes new lint warnings. diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index b34eb68980a..0f4e0409e61 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 0.5.0+26 * Fixes new lint warnings. diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md index 7c6d5d4166f..d7348d3a261 100644 --- a/packages/espresso/CHANGELOG.md +++ b/packages/espresso/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Updates compileSdk version to 34. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 0.3.0+6 diff --git a/packages/file_selector/file_selector_android/CHANGELOG.md b/packages/file_selector/file_selector_android/CHANGELOG.md index 4b331b57bbf..ac0ffa6b45a 100644 --- a/packages/file_selector/file_selector_android/CHANGELOG.md +++ b/packages/file_selector/file_selector_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 0.5.0+6 * Updates minimum required plugin_platform_interface version to 2.1.7. diff --git a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md index 1fcbd140aae..f19cf5d4100 100644 --- a/packages/flutter_plugin_android_lifecycle/CHANGELOG.md +++ b/packages/flutter_plugin_android_lifecycle/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Updates compileSdk version to 34. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 2.0.17 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 dff0dde06b8..ccc8251c834 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 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 2.6.2 * Updates minimum required plugin_platform_interface version to 2.1.7. 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 7e42f74fcc7..7685f7bd164 100644 --- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 6.1.21 * Updates `clearAuthCache` override to match base class declaration. diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md index c0b84ef8062..fa85ee54ef5 100644 --- a/packages/image_picker/image_picker_android/CHANGELOG.md +++ b/packages/image_picker/image_picker_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 0.8.9+2 * Fixes new lint warnings. 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 fb472b9d18e..aa4b3ffe6b9 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 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 0.3.0+16 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/local_auth/local_auth_android/CHANGELOG.md b/packages/local_auth/local_auth_android/CHANGELOG.md index 8d744bc2b43..4d1c6950cb9 100644 --- a/packages/local_auth/local_auth_android/CHANGELOG.md +++ b/packages/local_auth/local_auth_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 1.0.36 * Updates androidx.fragment version to 1.6.2. diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md index 3dc087d634c..e9ee13d76f5 100644 --- a/packages/path_provider/path_provider_android/CHANGELOG.md +++ b/packages/path_provider/path_provider_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 2.2.2 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/quick_actions/quick_actions_android/CHANGELOG.md b/packages/quick_actions/quick_actions_android/CHANGELOG.md index ce9ca9580b9..bf48a6447d5 100644 --- a/packages/quick_actions/quick_actions_android/CHANGELOG.md +++ b/packages/quick_actions/quick_actions_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 1.0.10 * Updates minimum required plugin_platform_interface version to 2.1.7. diff --git a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md index f6612120a56..a5e2beaca01 100644 --- a/packages/shared_preferences/shared_preferences_android/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_android/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Updates compileSdk version to 34. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 2.2.1 diff --git a/packages/url_launcher/url_launcher_android/CHANGELOG.md b/packages/url_launcher/url_launcher_android/CHANGELOG.md index 41ce8906337..68a4562758b 100644 --- a/packages/url_launcher/url_launcher_android/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 6.2.2 * Updates minimum required plugin_platform_interface version to 2.1.7. diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 4116740efa8..8faafadf36b 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Updates compileSdk version to 34. + ## 2.4.11 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. From 681f8edc565e6194f4dae99dff0a98e4ad30374e Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 13:22:09 -0800 Subject: [PATCH 06/10] Update tool tests --- script/tool/test/create_all_packages_app_command_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/tool/test/create_all_packages_app_command_test.dart b/script/tool/test/create_all_packages_app_command_test.dart index 156d27eee47..1eff5bfe993 100644 --- a/script/tool/test/create_all_packages_app_command_test.dart +++ b/script/tool/test/create_all_packages_app_command_test.dart @@ -328,7 +328,7 @@ android { containsAll([ contains('This is the legacy file'), contains('minSdkVersion 21'), - contains('compileSdk 33'), + contains('compileSdk 34'), ])); }); @@ -362,7 +362,7 @@ android { buildGradle, containsAll([ contains('minSdkVersion 21'), - contains('compileSdk 33'), + contains('compileSdk 34'), contains('multiDexEnabled true'), contains('androidx.lifecycle:lifecycle-runtime'), ])); From 7261d035b10cb0858b8529d25dddf29736a9382d Mon Sep 17 00:00:00 2001 From: camsim99 Date: Tue, 9 Jan 2024 14:17:24 -0800 Subject: [PATCH 07/10] test vid player --- .../example/integration_test/video_player_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart index b6c592e54e2..cf261363b1f 100644 --- a/packages/video_player/video_player/example/integration_test/video_player_test.dart +++ b/packages/video_player/video_player/example/integration_test/video_player_test.dart @@ -128,8 +128,8 @@ void main() { // Mute to allow playing without DOM interaction on Web. // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes await controller.setVolume(0); - final Duration tenMillisBeforeEnd = - controller.value.duration - const Duration(milliseconds: 10); + final Duration tenMillisBeforeEnd = controller.value.duration - + const Duration(milliseconds: 1); // TEST CHANGE ONLY await controller.seekTo(tenMillisBeforeEnd); await controller.play(); await tester.pumpAndSettle(_playDuration); From 9a3c4aeed59a37bc81bb8efd84a5200adad82acd Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jan 2024 10:36:35 -0800 Subject: [PATCH 08/10] Try 5 millis --- .../example/integration_test/video_player_test.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart index cf261363b1f..6b324b86d35 100644 --- a/packages/video_player/video_player/example/integration_test/video_player_test.dart +++ b/packages/video_player/video_player/example/integration_test/video_player_test.dart @@ -128,19 +128,19 @@ void main() { // Mute to allow playing without DOM interaction on Web. // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes await controller.setVolume(0); - final Duration tenMillisBeforeEnd = controller.value.duration - - const Duration(milliseconds: 1); // TEST CHANGE ONLY - await controller.seekTo(tenMillisBeforeEnd); + final Duration fiveMillisBeforeEnd = + controller.value.duration - const Duration(milliseconds: 5); + await controller.seekTo(fiveMillisBeforeEnd); await controller.play(); await tester.pumpAndSettle(_playDuration); expect(controller.value.isPlaying, false); expect(controller.value.position, controller.value.duration); - await controller.seekTo(tenMillisBeforeEnd); + await controller.seekTo(fiveMillisBeforeEnd); await tester.pumpAndSettle(_playDuration); expect(controller.value.isPlaying, false); - expect(controller.value.position, tenMillisBeforeEnd); + expect(controller.value.position, fiveMillisBeforeEnd); }, // Flaky on web: https://github.com/flutter/flutter/issues/130147 skip: kIsWeb, From d852709c6f9dabc3df672390638ee154c029dceb Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 10 Jan 2024 12:52:04 -0800 Subject: [PATCH 09/10] See if flake --- .../example/integration_test/video_player_test.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/video_player/video_player/example/integration_test/video_player_test.dart b/packages/video_player/video_player/example/integration_test/video_player_test.dart index 6b324b86d35..b6c592e54e2 100644 --- a/packages/video_player/video_player/example/integration_test/video_player_test.dart +++ b/packages/video_player/video_player/example/integration_test/video_player_test.dart @@ -128,19 +128,19 @@ void main() { // Mute to allow playing without DOM interaction on Web. // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes await controller.setVolume(0); - final Duration fiveMillisBeforeEnd = - controller.value.duration - const Duration(milliseconds: 5); - await controller.seekTo(fiveMillisBeforeEnd); + final Duration tenMillisBeforeEnd = + controller.value.duration - const Duration(milliseconds: 10); + await controller.seekTo(tenMillisBeforeEnd); await controller.play(); await tester.pumpAndSettle(_playDuration); expect(controller.value.isPlaying, false); expect(controller.value.position, controller.value.duration); - await controller.seekTo(fiveMillisBeforeEnd); + await controller.seekTo(tenMillisBeforeEnd); await tester.pumpAndSettle(_playDuration); expect(controller.value.isPlaying, false); - expect(controller.value.position, fiveMillisBeforeEnd); + expect(controller.value.position, tenMillisBeforeEnd); }, // Flaky on web: https://github.com/flutter/flutter/issues/130147 skip: kIsWeb, From fcb661556b09a54143a455ee97b2d4f642af784f Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 11 Jan 2024 17:40:38 -0800 Subject: [PATCH 10/10] Empty-Commit