Reland "Update template/test compileSdk, targetSdk, ndk versions" (#153795)

Relands flutter/flutter#152487.

The difference is in the two new commits:
-flutter/flutter@1354c6d
-flutter/flutter@931788a, short version is that:
- I forgot that I need to override the compileSdkVersion in the AGP 8.0 [instance of this test](https://github.com/flutter/flutter/blob/ef9cd32f5a2c0e27300fb9f4662d11da976087d7/dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart#L19)
- A postsubmit integration test needed new lockfiles + the package attribute -> AGP namespace change.

These were the only two postsubmit failures: [dashboard](https://flutter-dashboard.appspot.com/#/build).

Author: gmackall

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

@@ -16,23 +16,30 @@ import 'package:flutter_devicelab/framework/framework.dart';
 // - Kotlin: No methodology as of yet.
 // (*) - support range defined in packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts.
 List<VersionTuple> versionTuples = <VersionTuple>[
-  VersionTuple(agpVersion: '7.0.1', gradleVersion: '7.0.2', kotlinVersion: '1.7.10'),
-  VersionTuple(agpVersion: '7.1.0', gradleVersion: '7.2', kotlinVersion: '1.7.10'),
-  VersionTuple(agpVersion: '7.2.0', gradleVersion: '7.3.3', kotlinVersion: '1.7.10'),
-  VersionTuple(agpVersion: '7.3.0', gradleVersion: '7.4', kotlinVersion: '1.7.10'),
-  VersionTuple(agpVersion: '7.4.0', gradleVersion: '7.5', kotlinVersion: '1.8.10'),
+  VersionTuple(agpVersion: '7.0.1', gradleVersion: '7.0.2', kotlinVersion: '1.7.10', compileSdkVersion: '34'),
+  VersionTuple(agpVersion: '7.1.0', gradleVersion: '7.2',   kotlinVersion: '1.7.10', compileSdkVersion: '34'),
+  VersionTuple(agpVersion: '7.2.0', gradleVersion: '7.3.3', kotlinVersion: '1.7.10', compileSdkVersion: '34'),
+  VersionTuple(agpVersion: '7.3.0', gradleVersion: '7.4',   kotlinVersion: '1.7.10', compileSdkVersion: '34'),
+  VersionTuple(agpVersion: '7.4.0', gradleVersion: '7.5',   kotlinVersion: '1.8.10', compileSdkVersion: '34'),
 ];
 
 // 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,
+        tempDir: tempDir,
+        localFileSystem: fileSystem
+    );
   });
 }

dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart

@@ -15,8 +15,9 @@ import 'package:flutter_devicelab/framework/framework.dart';
 //           https://developer.android.com/build/releases/past-releases/agp-8-4-0-release-notes.
 // - Kotlin: No methodology as of yet.
 // (*) - support range defined in packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts.
+// Note that compileSdk 35 requires AGP 8.1.0+, so override to compileSdk 34 for AGP 8.0.
 List<VersionTuple> versionTuples = <VersionTuple>[
-  VersionTuple(agpVersion: '8.0.0', gradleVersion: '8.0', kotlinVersion: '1.8.22'),
+  VersionTuple(agpVersion: '8.0.0', gradleVersion: '8.0', kotlinVersion: '1.8.22', compileSdkVersion: '34'),
   VersionTuple(agpVersion: '8.1.0', gradleVersion: '8.0', kotlinVersion: '1.8.22'),
   VersionTuple(agpVersion: '8.2.0', gradleVersion: '8.2', kotlinVersion: '1.8.22'),
   VersionTuple(agpVersion: '8.3.0', gradleVersion: '8.4', kotlinVersion: '1.8.22'),

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,23 +58,27 @@ 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 {
 
   VersionTuple({
     required this.agpVersion,
     required this.gradleVersion,
-    required this.kotlinVersion
+    required this.kotlinVersion,
+    this.compileSdkVersion,
   });
 
   String agpVersion;
   String gradleVersion;
   String kotlinVersion;
+  String? compileSdkVersion;
 
   @override
   String toString() {
-    return '(AGP version: $agpVersion, Gradle version: $gradleVersion, Kotlin version: $kotlinVersion)';
+    return '(AGP version: $agpVersion, Gradle version: $gradleVersion, Kotlin version: $kotlinVersion'
+        '${(compileSdkVersion == null) ? '' : ', compileSdk version: $compileSdkVersion)'}';
   }
 }
 
@@ -93,7 +97,7 @@ Future<TaskResult> buildFlutterApkWithSpecifiedDependencyVersions({
     final Directory innerTempDir = tempDir.createTempSync(versions.gradleVersion);
     try {
       // Create a new flutter project.
-      section('Create new app with Gradle ${versions.gradleVersion}, AGP ${versions.agpVersion}, and Kotlin ${versions.kotlinVersion}');
+      section('Create new app with dependency versions: $versions');
       await flutter(
         'create',
         options: <String>[
@@ -105,6 +109,14 @@ Future<TaskResult> buildFlutterApkWithSpecifiedDependencyVersions({
 
       final String appPath = '${innerTempDir.absolute.path}/dependency_checker_app';
 
+      if (versions.compileSdkVersion != null) {
+        final File appGradleBuild = localFileSystem.file(localFileSystem.path.join(
+            appPath, 'android', 'app', 'build.gradle'));
+        final String appBuildContent = appGradleBuild.readAsStringSync()
+            .replaceFirst(flutterCompileSdkString, versions.compileSdkVersion!);
+        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">