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

Reverts: flutter#152487
Initiated by: gmackall
Reason for reverting: 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)
Original PR Author: gmackall

Reviewed By: {reidbaker}

This change reverts the following previous change:
Updates `compileSdk`, `targetSdk`, and `ndk` versions (former 2 to latest, latter to the version of the ndk we are hosting on CIPD).

Summary of changes:
- Updates mentioned template values
- `compileSdk` 35 requires AGP 8.0+, so updated to 8.1 in many places.
- This also necessitated Gradle upgrades in most places
- This also necessitated moving the `package` xml attribute to the AGP `namespace` field in a couple places (test + template).
- Some tests use the output of `flutter create` but then use intentionally lower AGP versions. [I downgraded the `compileSdk` in these tests.](flutter@fee34fd)
- [Stopped lockfile generation](flutter@82324a2) script from hitting the `hello_world` example because it uses `.kts` gradle files.
- One test needed [some Gradle options we had already added to templates](flutter@6aa187b).

Author: auto-submit[bot]

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-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-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 "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 
 include ":app"

dev/benchmarks/multiple_flutters/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.0"
+        classpath "com.android.tools.build:gradle:7.3.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-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

dev/devicelab/bin/tasks/android_java11_dependency_smoke_tests.dart

@@ -25,22 +25,14 @@ 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. It also overrides to
-// compileSdkVersion 34 because compileSdk 35 requires AGP 8.0+.
+// CI before 17, and hence it is also hosted on CIPD.
 // 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,
-        compileSdkOverride: '34',
-        tempDir: tempDir,
-        localFileSystem: fileSystem
-    );
+    return buildFlutterApkWithSpecifiedDependencyVersions(versionTuples: versionTuples, 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: '8.4').call,
-    ModuleTest('module-gradle-7.6', gradleVersion: '8.4-rc-3').call,
+    ModuleTest('module-gradle-7.6', gradleVersion: '7.6.3').call,
+    ModuleTest('module-gradle-7.6', gradleVersion: '7.6-rc-2').call,
   ]));
 }

dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart

@@ -58,7 +58,6 @@ 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 {
@@ -88,7 +87,6 @@ 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) {
@@ -107,14 +105,6 @@ 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,7 +5,6 @@
 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,7 +3,8 @@ 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.flutter.add2app">
 
     <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:8.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 

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

dev/integration_tests/android_driver_test/android/build.gradle

@@ -2,31 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto generated.
-// To update all the build.gradle files in the Flutter repo,
-// See dev/tools/bin/generate_gradle_lockfiles.dart.
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
-
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
-    dependencyLocking {
-        ignoredDependencies.add('io.flutter:*')
-        lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
-        if (!project.hasProperty('local-engine-repo')) {
-          lockAllConfigurations()
-        }
-    }
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

dev/integration_tests/android_driver_test/android/settings.gradle

@@ -2,21 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto generated.
-// To update all the settings.gradle files in the Flutter repo,
-// See dev/tools/bin/generate_gradle_lockfiles.dart.
-
 pluginManagement {
     def flutterSdkPath = {
         def properties = new Properties()
         file("local.properties").withInputStream { properties.load(it) }
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
@@ -25,17 +20,10 @@ pluginManagement {
     }
 }
 
-buildscript {
-    dependencyLocking {
-        lockFile = file("${rootProject.projectDir}/buildscript-gradle.lockfile")
-        lockAllConfigurations()
-    }
-}
-
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

dev/integration_tests/android_host_app_v2_embedding/app/build.gradle

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

dev/integration_tests/android_host_app_v2_embedding/app/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@ 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.flutter.add2app">
 
     <application android:allowBackup="false"
         tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon">

dev/integration_tests/android_host_app_v2_embedding/build.gradle

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

dev/integration_tests/deferred_components_test/android/build.gradle

@@ -7,14 +7,14 @@
 // See dev/tools/bin/generate_gradle_lockfiles.dart.
 
 buildscript {
-    ext.kotlin_version = '1.8.22'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 

dev/integration_tests/deferred_components_test/android/component1/build.gradle

@@ -24,7 +24,7 @@ apply plugin: "com.android.dynamic-feature"
 
 android {
     namespace "io.flutter.integration.deferred_components_test.component1"
-    compileSdk 35
+    compileSdk 34
 
     sourceSets {
         applicationVariants.all { variant ->
@@ -35,7 +35,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

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

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

dev/integration_tests/external_textures/android/settings.gradle

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