From 03e19a96d93154ce7cd28fba33a8b48c7653ccb5 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Sun, 2 Apr 2023 18:12:23 -0400 Subject: [PATCH] [Many] run agp update to support jdk17 1/N (#3574) [Many] run agp update to support jdk17 1/N --- packages/animations/example/android/app/build.gradle | 9 +++++---- .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 4 ++-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- packages/animations/example/android/build.gradle | 4 ++-- packages/animations/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../dynamic_layouts/example/android/app/build.gradle | 1 + .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- packages/dynamic_layouts/example/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/espresso/example/android/app/build.gradle | 6 +++--- .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- packages/espresso/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 1 + .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- .../example/android/build.gradle | 6 +++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 1 + .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- .../example/android/build.gradle | 2 +- .../flutter_markdown/example/android/app/build.gradle | 3 ++- .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 4 ++-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- packages/flutter_markdown/example/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 7 ++++--- .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- .../example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/go_router/example/android/app/build.gradle | 1 + .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/profile/AndroidManifest.xml | 3 +-- packages/go_router/example/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 48 files changed, 65 insertions(+), 81 deletions(-) diff --git a/packages/animations/example/android/app/build.gradle b/packages/animations/example/android/app/build.gradle index f31d568f922d..c6bffc943b6d 100644 --- a/packages/animations/example/android/app/build.gradle +++ b/packages/animations/example/android/app/build.gradle @@ -32,14 +32,11 @@ android { main.java.srcDirs += 'src/main/kotlin' } - lintOptions { - disable 'InvalidPackage' - } defaultConfig { applicationId "dev.flutter.packages.animations.example" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 32 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -52,6 +49,10 @@ android { signingConfig signingConfigs.debug } } + namespace 'dev.flutter.packages.animations.example' + lint { + disable 'InvalidPackage' + } } flutter { diff --git a/packages/animations/example/android/app/src/debug/AndroidManifest.xml b/packages/animations/example/android/app/src/debug/AndroidManifest.xml index 7eb704db0fcd..f880684a6a9c 100644 --- a/packages/animations/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/animations/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/animations/example/android/app/src/main/AndroidManifest.xml b/packages/animations/example/android/app/src/main/AndroidManifest.xml index 8fd2d323f8b1..3adb2679c59a 100644 --- a/packages/animations/example/android/app/src/main/AndroidManifest.xml +++ b/packages/animations/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -7,6 +6,7 @@ android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" + android:exported="true" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> diff --git a/packages/animations/example/android/app/src/profile/AndroidManifest.xml b/packages/animations/example/android/app/src/profile/AndroidManifest.xml index 7eb704db0fcd..f880684a6a9c 100644 --- a/packages/animations/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/animations/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/animations/example/android/build.gradle b/packages/animations/example/android/build.gradle index 2092f9d1d7b9..d031eb270298 100644 --- a/packages/animations/example/android/build.gradle +++ b/packages/animations/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.6.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/animations/example/android/gradle.properties b/packages/animations/example/android/gradle.properties index 38c8d4544ff1..94adc3a3f97a 100644 --- a/packages/animations/example/android/gradle.properties +++ b/packages/animations/example/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afdda2..6b665338b34e 100644 --- a/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/packages/dynamic_layouts/example/android/app/build.gradle b/packages/dynamic_layouts/example/android/app/build.gradle index 0833ecfca80e..823df22bf352 100644 --- a/packages/dynamic_layouts/example/android/app/build.gradle +++ b/packages/dynamic_layouts/example/android/app/build.gradle @@ -60,6 +60,7 @@ android { signingConfig signingConfigs.debug } } + namespace 'com.example.example' } flutter { diff --git a/packages/dynamic_layouts/example/android/app/src/debug/AndroidManifest.xml b/packages/dynamic_layouts/example/android/app/src/debug/AndroidManifest.xml index 45d523a2a2a1..399f6981d5d3 100644 --- a/packages/dynamic_layouts/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/dynamic_layouts/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/espresso/example/android/app/src/main/AndroidManifest.xml b/packages/espresso/example/android/app/src/main/AndroidManifest.xml index b98fee6c34c6..0c7891fd04ef 100644 --- a/packages/espresso/example/android/app/src/main/AndroidManifest.xml +++ b/packages/espresso/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + diff --git a/packages/espresso/example/android/build.gradle b/packages/espresso/example/android/build.gradle index 56f004030c32..83691fac845b 100644 --- a/packages/espresso/example/android/build.gradle +++ b/packages/espresso/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:7.4.2' } } diff --git a/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties index b776d4b5b27f..6b665338b34e 100644 --- a/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/espresso/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip 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 b6d0e7472874..ffbb8c5de662 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 @@ -49,6 +49,7 @@ android { signingConfig signingConfigs.debug } } + namespace 'io.flutter.plugins.googlesigninexample' } flutter { diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/debug/AndroidManifest.xml b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/debug/AndroidManifest.xml index c61bfd0dc4aa..f880684a6a9c 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/AndroidManifest.xml b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/AndroidManifest.xml index ea0f36a7faee..b537750e63d0 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/AndroidManifest.xml +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/profile/AndroidManifest.xml b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/profile/AndroidManifest.xml index c61bfd0dc4aa..f880684a6a9c 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle b/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle index 8fc2c011cf88..c758d5bebb3f 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle @@ -5,8 +5,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' - classpath 'com.google.gms:google-services:4.3.5' + classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.google.gms:google-services:4.3.10' } } @@ -23,6 +23,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afdda2..562c5e44424e 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/packages/flutter_adaptive_scaffold/example/android/app/build.gradle b/packages/flutter_adaptive_scaffold/example/android/app/build.gradle index b80bb845dd97..39c5b20fb1d3 100644 --- a/packages/flutter_adaptive_scaffold/example/android/app/build.gradle +++ b/packages/flutter_adaptive_scaffold/example/android/app/build.gradle @@ -60,6 +60,7 @@ android { signingConfig signingConfigs.debug } } + namespace 'dev.flutter.example' } flutter { diff --git a/packages/flutter_adaptive_scaffold/example/android/app/src/debug/AndroidManifest.xml b/packages/flutter_adaptive_scaffold/example/android/app/src/debug/AndroidManifest.xml index 30b46fd8a4c6..399f6981d5d3 100644 --- a/packages/flutter_adaptive_scaffold/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/flutter_adaptive_scaffold/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/flutter_markdown/example/android/app/src/main/AndroidManifest.xml b/packages/flutter_markdown/example/android/app/src/main/AndroidManifest.xml index 6d02f614dcb8..ee63e96efb4d 100644 --- a/packages/flutter_markdown/example/android/app/src/main/AndroidManifest.xml +++ b/packages/flutter_markdown/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -9,6 +8,7 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" + android:exported="true" android:windowSoftInputMode="adjustResize"> diff --git a/packages/flutter_markdown/example/android/build.gradle b/packages/flutter_markdown/example/android/build.gradle index 9e8dea7d36d9..d031eb270298 100644 --- a/packages/flutter_markdown/example/android/build.gradle +++ b/packages/flutter_markdown/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.6.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/flutter_markdown/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_markdown/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afdda2..6b665338b34e 100644 --- a/packages/flutter_markdown/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/flutter_markdown/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip 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 fbcdeee2f8b4..d4c35edfe878 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/build.gradle @@ -27,9 +27,6 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion flutter.compileSdkVersion - lintOptions { - disable 'InvalidPackage' - } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). @@ -48,6 +45,10 @@ android { signingConfig signingConfigs.debug } } + namespace 'io.flutter.plugins.flutter_plugin_android_lifecycle_example' + lint { + disable 'InvalidPackage' + } } flutter { diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/debug/AndroidManifest.xml b/packages/flutter_plugin_android_lifecycle/example/android/app/src/debug/AndroidManifest.xml index d7586285fc1e..f880684a6a9c 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/AndroidManifest.xml b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/AndroidManifest.xml index d00868f25cbf..b203b2d8e214 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/AndroidManifest.xml +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/profile/AndroidManifest.xml b/packages/flutter_plugin_android_lifecycle/example/android/app/src/profile/AndroidManifest.xml index d7586285fc1e..f880684a6a9c 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/flutter_plugin_android_lifecycle/example/android/build.gradle b/packages/flutter_plugin_android_lifecycle/example/android/build.gradle index 8b3d2202775d..d29705d60e74 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/build.gradle +++ b/packages/flutter_plugin_android_lifecycle/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.4.2' } } diff --git a/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties index b8793d3c0d69..6b665338b34e 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/flutter_plugin_android_lifecycle/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/packages/go_router/example/android/app/build.gradle b/packages/go_router/example/android/app/build.gradle index ea2856e9a7d6..43fb81bf34fa 100644 --- a/packages/go_router/example/android/app/build.gradle +++ b/packages/go_router/example/android/app/build.gradle @@ -57,6 +57,7 @@ android { signingConfig signingConfigs.debug } } + namespace 'com.example.example' } flutter { diff --git a/packages/go_router/example/android/app/src/debug/AndroidManifest.xml b/packages/go_router/example/android/app/src/debug/AndroidManifest.xml index c208884f3014..f880684a6a9c 100644 --- a/packages/go_router/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/go_router/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/go_router/example/android/app/src/main/AndroidManifest.xml b/packages/go_router/example/android/app/src/main/AndroidManifest.xml index 6f325b42a72d..08740a870bc7 100644 --- a/packages/go_router/example/android/app/src/main/AndroidManifest.xml +++ b/packages/go_router/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/go_router/example/android/app/src/profile/AndroidManifest.xml b/packages/go_router/example/android/app/src/profile/AndroidManifest.xml index c208884f3014..f880684a6a9c 100644 --- a/packages/go_router/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/go_router/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/packages/go_router/example/android/build.gradle b/packages/go_router/example/android/build.gradle index 27ef0fc4b028..a2007dffad52 100644 --- a/packages/go_router/example/android/build.gradle +++ b/packages/go_router/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.6.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afdda2..6b665338b34e 100644 --- a/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/go_router/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip