Reapply "[ Device Lab ] Upgrade Device Lab projects to Java 18" (#166016) (#166059)

bkonyi · web-flow · commit 7cb926a33d8e · 2025-03-27T15:07:22.000Z
This reverts commit flutter/flutter@8dccbc3. Find/replace didn't catch the use of `jvmTarget = "1.8"` in `dev/integration_tests/android_engine_test/android/app/build.gradle` and `android_engine_test` needed to have `"com.android.application"` updated.
diff --git a/dev/devicelab/lib/tasks/run_tests.dart b/dev/devicelab/lib/tasks/run_tests.dart
@@ -105,12 +105,6 @@ class AndroidRunOutputTest extends RunOutputTask {
     }
   }
 
-  @override
-  bool isExpectedStderr(String line) {
-    // TODO(egarciad): Remove once https://github.com/flutter/flutter/issues/95131 is fixed.
-    return line.contains('Mapping new ns');
-  }
-
   @override
   TaskResult verify(List<String> stdout, List<String> stderr) {
     final String gradleTask = release ? 'assembleRelease' : 'assembleDebug';
diff --git a/dev/integration_tests/android_engine_test/android/app/build.gradle b/dev/integration_tests/android_engine_test/android/app/build.gradle
@@ -23,12 +23,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/android_engine_test/android/settings.gradle b/dev/integration_tests/android_engine_test/android/settings.gradle
@@ -22,7 +22,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
+    id "com.android.application" version "8.2.1" apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
diff --git a/dev/integration_tests/android_semantics_testing/android/app/build.gradle b/dev/integration_tests/android_semantics_testing/android/app/build.gradle
@@ -30,12 +30,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/android_views/android/app/build.gradle b/dev/integration_tests/android_views/android/app/build.gradle
@@ -39,8 +39,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/channels/android/app/build.gradle b/dev/integration_tests/channels/android/app/build.gradle
@@ -40,12 +40,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/deferred_components_test/android/component1/build.gradle b/dev/integration_tests/deferred_components_test/android/component1/build.gradle
@@ -50,8 +50,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
diff --git a/dev/integration_tests/external_textures/android/app/build.gradle b/dev/integration_tests/external_textures/android/app/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/flavors/android/app/build.gradle b/dev/integration_tests/flavors/android/app/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/flutter_gallery/android/app/build.gradle b/dev/integration_tests/flutter_gallery/android/app/build.gradle
@@ -55,8 +55,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle b/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle
@@ -18,8 +18,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/platform_interaction/android/app/build.gradle b/dev/integration_tests/platform_interaction/android/app/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/pure_android_host_apps/host_app_kotlin_gradle_dsl/app/build.gradle.kts b/dev/integration_tests/pure_android_host_apps/host_app_kotlin_gradle_dsl/app/build.gradle.kts
@@ -39,11 +39,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17
     }
     buildFeatures {
         compose = true
diff --git a/dev/integration_tests/release_smoke_test/android/app/build.gradle b/dev/integration_tests/release_smoke_test/android/app/build.gradle
@@ -40,12 +40,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
diff --git a/dev/integration_tests/spell_check/android/app/build.gradle b/dev/integration_tests/spell_check/android/app/build.gradle
@@ -40,12 +40,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/dev/integration_tests/ui/android/app/build.gradle b/dev/integration_tests/ui/android/app/build.gradle
@@ -22,12 +22,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {

Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,6 @@ class AndroidRunOutputTest extends RunOutputTask {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- @override`
`109`		`- bool isExpectedStderr(String line) {`
`110`		`- // TODO(egarciad): Remove once https://github.com/flutter/flutter/issues/95131 is fixed.`
`111`		`- return line.contains('Mapping new ns');`
`112`		`- }`
`113`		`-`
`114`	`108`	`@override`
`115`	`109`	`TaskResult verify(List<String> stdout, List<String> stderr) {`
`116`	`110`	`final String gradleTask = release ? 'assembleRelease' : 'assembleDebug';`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ android {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`compileOptions {`
`26`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`27`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`26`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`27`	`+ targetCompatibility = JavaVersion.VERSION_17`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`kotlinOptions {`
`31`		`- jvmTarget = JavaVersion.VERSION_1_8`
	`31`	`+ jvmTarget = JavaVersion.VERSION_17`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pluginManagement {`
`22`	`22`
`23`	`23`	`plugins {`
`24`	`24`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`25`		`- id "com.android.application" version "8.1.0" apply false`
	`25`	`+ id "com.android.application" version "8.2.1" apply false`
`26`	`26`	`id "org.jetbrains.kotlin.android" version "1.8.22" apply false`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@ android {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`compileOptions {`
`33`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`34`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`33`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`34`	`+ targetCompatibility JavaVersion.VERSION_17`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`kotlinOptions {`
`38`		`- jvmTarget = JavaVersion.VERSION_1_8`
	`38`	`+ jvmTarget = JavaVersion.VERSION_17`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ android {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`compileOptions {`
`42`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`43`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`42`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`43`	`+ targetCompatibility JavaVersion.VERSION_17`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ android {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`compileOptions {`
`43`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`44`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`43`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`44`	`+ targetCompatibility JavaVersion.VERSION_17`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`kotlinOptions {`
`48`		`- jvmTarget = JavaVersion.VERSION_1_8`
	`48`	`+ jvmTarget = JavaVersion.VERSION_17`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ android {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`compileOptions {`
`53`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`54`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`53`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`54`	`+ targetCompatibility = JavaVersion.VERSION_17`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ android {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`33`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`33`	`+ targetCompatibility JavaVersion.VERSION_17`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ android {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`compileOptions {`
`58`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`59`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`58`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`59`	`+ targetCompatibility JavaVersion.VERSION_17`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ android {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`compileOptions {`
`21`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`22`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`21`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`22`	`+ targetCompatibility JavaVersion.VERSION_17`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`defaultConfig {`