From e496b37fbe6e520ba2ad84bbf0989c5e93c7f2f4 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 15 Aug 2022 14:11:35 -0700 Subject: [PATCH 01/13] Upgrade Android SDK to 33 --- DEPS | 2 +- tools/android_sdk/create_cipd_packages.sh | 17 +++++++++++++---- tools/android_sdk/packages.txt | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 1d36eb1477b0d..c1b4d68dfdf6a 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:32v1' + 'version': 'version:33v0' } ], 'condition': 'download_android_deps', diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index b3bbb3184e8b5..07e65599aa32a 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -3,11 +3,14 @@ # This script requires depot_tools to be on path. print_usage () { - echo "Usage: create_cipd_united_package.sh [PATH_TO_SDK_DIR]" - echo " where:" - echo " - VERSION_TAG is the tag of the cipd packages, e.g. 28r6 or 31v1" - echo " - PATH_TO_SDK_DIR is the path to the sdk folder. If omitted, this defaults to" + echo "Usage:" + echo " ./create_cipd_united_package.sh [PATH_TO_SDK_DIR]" + echo " Downloads, packages, and uploads Android SDK packages where:" + echo " - VERSION_TAG is the tag of the cipd packages, e.g. 28r6 or 31v1" + echo " - PATH_TO_SDK_DIR is the path to the sdk folder. If omitted, this defaults to" echo " your ANDROID_SDK_ROOT environment variable." + echo " ./create_cipd_united_package.sh list" + echo " Lists the available packages for use in 'packages.txt'" echo "" echo "This script downloads the packages specified in packages.txt and uploads" echo "them to CIPD for linux, mac, and windows." @@ -69,6 +72,12 @@ while [ ! -f "$sdkmanager_path" ]; do ((i++)) done +# list available packages +if [ $version_tag == "list" ]; then + $sdkmanager_path --list --include_obsolete + exit 0 +fi + # We create a new temporary SDK directory because the default working directory # tends to not update/re-download packages if they are being used. This guarantees # a clean install of Android SDK. diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index c0961a9c7fe65..9afa769cb4199 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-32:platforms +platforms;android-33:platforms cmdline-tools;latest:cmdline-tools -build-tools;33.0.0-rc4:build-tools +build-tools;33.0.0:build-tools platform-tools:platform-tools tools:tools ndk-bundle:ndk-bundle \ No newline at end of file From 05048dc2db70146b9fae131164c982f262ffe555 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 15 Aug 2022 15:07:41 -0700 Subject: [PATCH 02/13] Kick tests From 2fcf7690d1b5db09024f6c5a5ca7d37d2427d093 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 15 Aug 2022 16:01:16 -0700 Subject: [PATCH 03/13] Version lock NDK --- DEPS | 2 +- tools/android_sdk/create_cipd_packages.sh | 7 +++++-- tools/android_sdk/packages.txt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index c1b4d68dfdf6a..29c2887274c04 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v0' + 'version': 'version:33v1' } ], 'condition': 'download_android_deps', diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 07e65599aa32a..7da230018c006 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -108,8 +108,11 @@ for platform in "${platforms[@]}"; do done # Special treatment for NDK to move to expected directory. - mv $upload_dir/sdk/ndk-bundle $upload_dir - mv $upload_dir/ndk-bundle $upload_dir/ndk + mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle + ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d` + ndk_sub_paths_arr=($ndk_sub_paths) + mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk + rm -rf $upload_dir/ndk-bundle # Accept all licenses to ensure they are generated and uploaded. yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index 9afa769cb4199..db793dcc33b72 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -3,4 +3,4 @@ cmdline-tools;latest:cmdline-tools build-tools;33.0.0:build-tools platform-tools:platform-tools tools:tools -ndk-bundle:ndk-bundle \ No newline at end of file +ndk;25.0.8775105:ndk \ No newline at end of file From 3d0395d934e620ff5a6b83f6b5db33119b4bd5c4 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 15 Aug 2022 17:00:52 -0700 Subject: [PATCH 04/13] kick tests From 926380e06f32cdc0882d7c2e04ccaaf3725813a6 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 15 Aug 2022 17:18:32 -0700 Subject: [PATCH 05/13] Bump gen_javadocs --- tools/javadoc/gen_javadoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index e10a046cb051c..92b49ad77118d 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -58,7 +58,7 @@ def main(): classpath = [ args.android_source_root, os.path.join( - args.third_party, 'android_tools/sdk/platforms/android-32/android.jar' + args.third_party, 'android_tools/sdk/platforms/android-33/android.jar' ), os.path.join( args.third_party, 'android_embedding_dependencies', 'lib', '*' From 57ac992e7d386abb0689286591256b907a180388 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Tue, 16 Aug 2022 12:40:19 -0700 Subject: [PATCH 06/13] Roll buildroot --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 29c2887274c04..c31cad32a726a 100644 --- a/DEPS +++ b/DEPS @@ -102,7 +102,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '4dfab138e7dcc4d174ad0032c102d0f9055ba904', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '25e5fd0200ff0bbf4761f3e73cab67a16e928955', # Fuchsia compatibility # From e7401f00b6f2369a46b58c1a42a178482597675f Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Wed, 17 Aug 2022 00:56:51 -0700 Subject: [PATCH 07/13] Revert ndk version --- DEPS | 2 +- tools/android_sdk/packages.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index c31cad32a726a..1c9e1b6df15b5 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v1' + 'version': 'version:33v2' } ], 'condition': 'download_android_deps', diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index db793dcc33b72..b257101a496af 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -3,4 +3,4 @@ cmdline-tools;latest:cmdline-tools build-tools;33.0.0:build-tools platform-tools:platform-tools tools:tools -ndk;25.0.8775105:ndk \ No newline at end of file +ndk;22.1.7171670:ndk \ No newline at end of file From c30bf3e080e5a1e6af18f719dd7a906139cebb69 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Wed, 17 Aug 2022 02:04:25 -0700 Subject: [PATCH 08/13] Fix linter and test_runner --- .../io/flutter/plugin/localization/LocalizationPlugin.java | 2 +- shell/platform/android/test_runner/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java index 38dc780ed79fe..2b4a164a4e972 100644 --- a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java +++ b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java @@ -23,7 +23,7 @@ public class LocalizationPlugin { @NonNull private final LocalizationChannel localizationChannel; @NonNull private final Context context; - @SuppressLint("AppBundleLocaleChanges") // This is optionally turned on by apps. + @SuppressLint({"AppBundleLocaleChanges", "DiscouragedApi"}) // This is optionally turned on by apps. @VisibleForTesting final LocalizationChannel.LocalizationMessageHandler localizationMessageHandler = new LocalizationChannel.LocalizationMessageHandler() { diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 5d6aca1b8dfe5..dfdf361aeeae0 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -33,7 +33,7 @@ println "AVAILABLE PROCESSORS: $availableProcessors" println "==========================================" android { - compileSdkVersion 32 + compileSdkVersion 33 defaultConfig { minSdkVersion 16 From 5e653396a75f3faf29ced51af7c00cd8c42b144f Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Wed, 17 Aug 2022 02:25:18 -0700 Subject: [PATCH 09/13] Formatting --- .../io/flutter/plugin/localization/LocalizationPlugin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java index 2b4a164a4e972..acb1e904ca629 100644 --- a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java +++ b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java @@ -23,7 +23,10 @@ public class LocalizationPlugin { @NonNull private final LocalizationChannel localizationChannel; @NonNull private final Context context; - @SuppressLint({"AppBundleLocaleChanges", "DiscouragedApi"}) // This is optionally turned on by apps. + @SuppressLint({ + "AppBundleLocaleChanges", + "DiscouragedApi" + }) // This is optionally turned on by apps. @VisibleForTesting final LocalizationChannel.LocalizationMessageHandler localizationMessageHandler = new LocalizationChannel.LocalizationMessageHandler() { From 0521b3a41bdfd4fcada65e1aa74b6fd35c67a897 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Wed, 17 Aug 2022 14:32:48 -0700 Subject: [PATCH 10/13] Update android_lint --- DEPS | 2 +- tools/android_lint/bin/main.dart | 4 ++-- tools/android_lint/project.xml | 2 +- tools/android_sdk/packages.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 1c9e1b6df15b5..2f3eb79a1efe3 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v2' + 'version': 'version:33v0' } ], 'condition': 'download_android_deps', diff --git a/tools/android_lint/bin/main.dart b/tools/android_lint/bin/main.dart index e304caa158da5..88cfd040e231b 100644 --- a/tools/android_lint/bin/main.dart +++ b/tools/android_lint/bin/main.dart @@ -73,7 +73,7 @@ Future runLint(ArgParser argParser, ArgResults argResults) async { - + '''); for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) { @@ -95,7 +95,7 @@ Future runLint(ArgParser argParser, ArgResults argResults) async { final List lintArgs = [ path.join(androidSdkDir.path, 'cmdline-tools', 'latest', 'bin', 'lint'), '--project', projectXmlPath, - '--compile-sdk-version', '31', + '--compile-sdk-version', '33', '--showall', '--exitcode', // Set non-zero exit code on errors '-Wall', diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml index 1b1c2d514f6ef..af48aa0b7c75c 100644 --- a/tools/android_lint/project.xml +++ b/tools/android_lint/project.xml @@ -2,7 +2,7 @@ - + diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index b257101a496af..8a922dcdf3088 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -3,4 +3,4 @@ cmdline-tools;latest:cmdline-tools build-tools;33.0.0:build-tools platform-tools:platform-tools tools:tools -ndk;22.1.7171670:ndk \ No newline at end of file +ndk;21.2.6472646:ndk \ No newline at end of file From fd1012478919b4bfa97e2fde0da71e63cbc2cd7c Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Wed, 17 Aug 2022 15:43:14 -0700 Subject: [PATCH 11/13] Use 33v5 --- DEPS | 2 +- tools/android_sdk/packages.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 2f3eb79a1efe3..c8c179c6efab4 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v0' + 'version': 'version:33v5' } ], 'condition': 'download_android_deps', diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index 8a922dcdf3088..b257101a496af 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -3,4 +3,4 @@ cmdline-tools;latest:cmdline-tools build-tools;33.0.0:build-tools platform-tools:platform-tools tools:tools -ndk;21.2.6472646:ndk \ No newline at end of file +ndk;22.1.7171670:ndk \ No newline at end of file From 69a68e1cebf2cb83ce6c20ae097383b8fba68758 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Thu, 18 Aug 2022 18:35:48 +0000 Subject: [PATCH 12/13] Generate packages on Linux --- DEPS | 2 +- tools/android_sdk/create_cipd_packages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index c8c179c6efab4..e53d9a7805f32 100644 --- a/DEPS +++ b/DEPS @@ -546,7 +546,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v5' + 'version': 'version:33v6' } ], 'condition': 'download_android_deps', diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 7da230018c006..c618ddeb025b8 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -81,7 +81,7 @@ fi # We create a new temporary SDK directory because the default working directory # tends to not update/re-download packages if they are being used. This guarantees # a clean install of Android SDK. -temp_dir=`mktemp -d -t android_sdk` +temp_dir=`mktemp -d -t android_sdkXXXX` for platform in "${platforms[@]}"; do sdk_root="$temp_dir/sdk_$platform" From 40882b5c1c21453c890d9f38a9f7131f2d77f608 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Thu, 18 Aug 2022 19:34:09 +0000 Subject: [PATCH 13/13] Bump testing to android33 --- testing/android_background_image/android/app/build.gradle | 6 +++--- testing/scenario_app/android/app/build.gradle | 6 +++--- tools/cipd/android_embedding_bundle/build.gradle | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle index cfa8d98bedf23..c7346c23e8422 100644 --- a/testing/android_background_image/android/app/build.gradle +++ b/testing/android_background_image/android/app/build.gradle @@ -16,8 +16,8 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable' } - buildToolsVersion = '33.0.0-rc4' - compileSdkVersion 32 + buildToolsVersion = '33.0.0' + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 @@ -25,7 +25,7 @@ android { defaultConfig { applicationId 'dev.flutter.android_background_image' minSdkVersion 16 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 1 versionName '1.0' } diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index d36ff250c7383..5f2a94523b996 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -18,8 +18,8 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } - buildToolsVersion = '33.0.0-rc4' - compileSdkVersion 32 + buildToolsVersion = '33.0.0' + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 @@ -27,7 +27,7 @@ android { defaultConfig { applicationId 'dev.flutter.scenarios' minSdkVersion 18 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 1 versionName '1.0' testInstrumentationRunner 'dev.flutter.TestRunner' diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index 66d2dfbc9aeb8..93c76e84fd384 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -29,7 +29,7 @@ allprojects { apply plugin: "com.android.application" android { - compileSdkVersion 32 + compileSdkVersion 33 } configurations {