Revert "Reverts "Update template/test compileSdk, targetSdk, ndk versions (flutter#152487)" (flutter#153793)"

This reverts commit 7730f29.

Author: Gray Mackall

dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

dev/benchmarks/microbenchmarks/android/settings.gradle

@@ -23,8 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

dev/benchmarks/multiple_flutters/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.3.0"
+        classpath "com.android.tools.build:gradle:8.1.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // Do not place your application dependencies here; they belong

dev/benchmarks/multiple_flutters/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.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

dev/devicelab/bin/tasks/android_java11_dependency_smoke_tests.dart

@@ -25,14 +25,22 @@ List<VersionTuple> versionTuples = <VersionTuple>[
 
 // This test requires a Java version less than 17 due to the intentionally low
 // version of Gradle. We choose 11 because this was the primary version used in
-// CI before 17, and hence it is also hosted on CIPD.
+// CI before 17, and hence it is also hosted on CIPD. It also overrides to
+// compileSdkVersion 34 because compileSdk 35 requires AGP 8.0+.
 // https://docs.gradle.org/current/userguide/compatibility.html
 Future<void> main() async {
   /// The [FileSystem] for the integration test environment.
   const LocalFileSystem fileSystem = LocalFileSystem();
 
-  final Directory tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_android_dependency_version_tests');
+  final Directory tempDir = fileSystem
+      .systemTempDirectory
+      .createTempSync('flutter_android_dependency_version_tests');
   await task(() {
-    return buildFlutterApkWithSpecifiedDependencyVersions(versionTuples: versionTuples, tempDir: tempDir, localFileSystem: fileSystem);
+    return buildFlutterApkWithSpecifiedDependencyVersions(
+        versionTuples: versionTuples,
+        compileSdkOverride: '34',
+        tempDir: tempDir,
+        localFileSystem: fileSystem
+    );
   });
 }

dev/devicelab/bin/tasks/module_test.dart

@@ -449,7 +449,7 @@ class ModuleTest {
 Future<void> main() async {
   await task(combine(<TaskFunction>[
     // ignore: avoid_redundant_argument_values
-    ModuleTest('module-gradle-7.6', gradleVersion: '7.6.3').call,
-    ModuleTest('module-gradle-7.6', gradleVersion: '7.6-rc-2').call,
+    ModuleTest('module-gradle-7.6', gradleVersion: '8.4').call,
+    ModuleTest('module-gradle-7.6', gradleVersion: '8.4-rc-3').call,
   ]));
 }

dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart

@@ -58,6 +58,7 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE
 ''';
 
 const String gradleReplacementString = 'GRADLE_REPLACE_ME';
+const String flutterCompileSdkString = 'flutter.compileSdkVersion';
 
 /// A simple class containing a Kotlin, Gradle, and AGP version.
 class VersionTuple {
@@ -87,6 +88,7 @@ class VersionTuple {
 /// fails, returns a successful result otherwise. Cleans up in either case.
 Future<TaskResult> buildFlutterApkWithSpecifiedDependencyVersions({
   required List<VersionTuple> versionTuples,
+  String? compileSdkOverride,
   required Directory tempDir,
   required LocalFileSystem localFileSystem,}) async {
   for (final VersionTuple versions in versionTuples) {
@@ -105,6 +107,14 @@ Future<TaskResult> buildFlutterApkWithSpecifiedDependencyVersions({
 
       final String appPath = '${innerTempDir.absolute.path}/dependency_checker_app';
 
+      if (compileSdkOverride != null) {
+        final File appGradleBuild = localFileSystem.file(localFileSystem.path.join(
+            appPath, 'android', 'app', 'build.gradle'));
+        final String appBuildContent = appGradleBuild.readAsStringSync()
+            .replaceFirst(flutterCompileSdkString, compileSdkOverride);
+        appGradleBuild.writeAsStringSync(appBuildContent);
+      }
+
       // Modify gradle version to passed in version.
       final File gradleWrapperProperties = localFileSystem.file(localFileSystem.path.join(
           appPath, 'android', 'gradle', 'wrapper', 'gradle-wrapper.properties'));

dev/integration_tests/android_custom_host_app/SampleApp/build.gradle

@@ -5,6 +5,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace = "io.flutter.add2app"
     compileSdk 34
 
     compileOptions {

dev/integration_tests/android_custom_host_app/SampleApp/src/main/AndroidManifest.xml

@@ -3,8 +3,7 @@ Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="io.flutter.add2app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application android:allowBackup="false"
         tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon">

dev/integration_tests/android_custom_host_app/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
 }