add compile sdk overriding to the buildflutterapk tests

Author: Gray Mackall

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/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'));

packages/flutter_tools/test/android_java11_integration.shard/android_dependency_version_checking_test.dart

@@ -14,6 +14,8 @@ import '../src/context.dart';
 
 
 // This test requires Java 11 due to the intentionally low version of Gradle.
+// It also overrides the template compile sdk version to 34, because using 35
+// requires AGP 8.0+.
 void main() {
   late Directory tempDir;
 
@@ -31,6 +33,7 @@ void main() {
     final VersionTuple versionTuple = VersionTuple(agpVersion: '7.0.0', gradleVersion: '7.5', kotlinVersion: '1.7.10');
     final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions(
         versions: versionTuple,
+        compileSdkOverride: '34',
         tempDir: tempDir
     );
     expect(result, const ProcessResultMatcher());
@@ -44,6 +47,7 @@ void main() {
     final VersionTuple versionTuple = VersionTuple(agpVersion: '7.0.0', gradleVersion: '7.0.2', kotlinVersion: '1.7.10');
     final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions(
         versions: versionTuple,
+        compileSdkOverride: '34',
         tempDir: tempDir
     );
     expect(result, const ProcessResultMatcher());
@@ -56,6 +60,7 @@ void main() {
     final VersionTuple versionTuple = VersionTuple(agpVersion: '7.4.0', gradleVersion: '7.5', kotlinVersion: '1.7.0');
     final ProcessResult result = await buildFlutterApkWithSpecifiedDependencyVersions(
         versions: versionTuple,
+        compileSdkOverride: '34',
         tempDir: tempDir
     );
 

packages/flutter_tools/test/src/android_common.dart

@@ -117,6 +117,7 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_REPLACE
 ''';
 
 const String gradleReplacementString = 'GRADLE_REPLACE_ME';
+const String flutterCompileSdkString = 'flutter.compileSdkVersion';
 
 class VersionTuple {
 
@@ -141,6 +142,7 @@ class VersionTuple {
 /// ProcessResult.
 Future<ProcessResult> buildFlutterApkWithSpecifiedDependencyVersions({
   required VersionTuple versions,
+  String? compileSdkOverride,
   required Directory tempDir,}) async {
   // Create a new flutter project.
   final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
@@ -154,6 +156,14 @@ Future<ProcessResult> buildFlutterApkWithSpecifiedDependencyVersions({
 
   final Directory app = Directory(fileSystem.path.join(tempDir.path, 'dependency_checker_app'));
 
+  if (compileSdkOverride != null) {
+    final File appGradleBuild = File(fileSystem.path.join(
+        app.path, '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 = File(fileSystem.path.join(
       app.path, 'android', 'gradle', 'wrapper', 'gradle-wrapper.properties'));