From 432fe18b3b860b8110b5351922ad42ccaefac17f Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 10:49:42 -0700 Subject: [PATCH 1/7] see what happens --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 0635e8e6ba02c..a7628982f6631 100644 --- a/DEPS +++ b/DEPS @@ -731,7 +731,7 @@ deps = { { # See tools/gradle/README.md for update instructions. # Version here means the CIPD tag. - 'version': 'version:7.5.1', + 'version': 'version:8.3', 'package': 'flutter/gradle' } ], From c4ef3229f6844f9070550ca901d8765d94326bc7 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 11:27:48 -0700 Subject: [PATCH 2/7] upgrade to agp 7.3 --- shell/platform/android/test_runner/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 7439db16168e5..0dbba1ebd7b3d 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.0.0" + classpath "com.android.tools.build:gradle:7.3.0" } } From 1b5ad2045b24c038695ee2d01d57edb52ad555c7 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 12:09:27 -0700 Subject: [PATCH 3/7] another agp upgrade --- testing/android_background_image/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle index 51b93f95dc279..b7aed46aa3f3f 100644 --- a/testing/android_background_image/android/build.gradle +++ b/testing/android_background_image/android/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From d71d49b9852ac004a8eea88983232972ee013a3a Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 13:32:23 -0700 Subject: [PATCH 4/7] gradle changes for android_background_image --- testing/android_background_image/android/app/build.gradle | 1 + .../android/app/src/main/AndroidManifest.xml | 4 +--- testing/android_background_image/android/build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle index d866acf038def..3b064625a8a23 100644 --- a/testing/android_background_image/android/app/build.gradle +++ b/testing/android_background_image/android/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace 'dev.flutter.android_background_image' lintOptions { abortOnError true checkAllWarnings true diff --git a/testing/android_background_image/android/app/src/main/AndroidManifest.xml b/testing/android_background_image/android/app/src/main/AndroidManifest.xml index d55247e606a67..a3a4f995b8227 100644 --- a/testing/android_background_image/android/app/src/main/AndroidManifest.xml +++ b/testing/android_background_image/android/app/src/main/AndroidManifest.xml @@ -1,10 +1,8 @@ - + Date: Thu, 14 Mar 2024 14:23:59 -0700 Subject: [PATCH 5/7] consistency --- shell/platform/android/test_runner/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 0dbba1ebd7b3d..65ecaf9e94337 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.3.0" + classpath "com.android.tools.build:gradle:8.0.1" } } From b02fd464598e8acece617593d833193b7ca0d8b9 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 14:40:28 -0700 Subject: [PATCH 6/7] move package name to namespace attribute for test_runner --- shell/platform/android/test_runner/build.gradle | 1 + shell/platform/android/test_runner/src/main/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 65ecaf9e94337..774bbd0e8cb40 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -32,6 +32,7 @@ println "AVAILABLE PROCESSORS: $availableProcessors" println "==========================================" android { + namespace 'package="io.flutter.app.test' compileSdkVersion 34 defaultConfig { diff --git a/shell/platform/android/test_runner/src/main/AndroidManifest.xml b/shell/platform/android/test_runner/src/main/AndroidManifest.xml index d67f4e5760241..57bdeee858695 100644 --- a/shell/platform/android/test_runner/src/main/AndroidManifest.xml +++ b/shell/platform/android/test_runner/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + From df0223a97ef030b09370c565786f16b081a5eaa9 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Thu, 14 Mar 2024 14:57:27 -0700 Subject: [PATCH 7/7] fix lazy copy paste --- shell/platform/android/test_runner/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 774bbd0e8cb40..50e8e4f3f8912 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -32,7 +32,7 @@ println "AVAILABLE PROCESSORS: $availableProcessors" println "==========================================" android { - namespace 'package="io.flutter.app.test' + namespace 'io.flutter.app.test' compileSdkVersion 34 defaultConfig {