Skip to content

Commit c376ca2

Browse files
authored
[ Device Lab ] Upgrade Device Lab projects to Java 18 (#165987)
Should resolve issues related to the following messages being output on stderr: ``` warning: [options] source value 8 is obsolete and will be removed in a future release" warning: [options] target value 8 is obsolete and will be removed in a future release warning: [options] To suppress warnings about obsolete options, use -Xlint:-options. ``` Fixes flutter/flutter#165973
1 parent 1bfb6ec commit c376ca2

File tree

15 files changed

+34
-40
lines changed

15 files changed

+34
-40
lines changed

dev/devicelab/lib/tasks/run_tests.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ class AndroidRunOutputTest extends RunOutputTask {
105105
}
106106
}
107107

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-
114108
@override
115109
TaskResult verify(List<String> stdout, List<String> stderr) {
116110
final String gradleTask = release ? 'assembleRelease' : 'assembleDebug';

dev/integration_tests/android_engine_test/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ android {
2323
}
2424

2525
compileOptions {
26-
sourceCompatibility = JavaVersion.VERSION_1_8
27-
targetCompatibility = JavaVersion.VERSION_1_8
26+
sourceCompatibility = JavaVersion.VERSION_17
27+
targetCompatibility = JavaVersion.VERSION_17
2828
}
2929

3030
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_1_8
31+
jvmTarget = JavaVersion.VERSION_17
3232
}
3333

3434
defaultConfig {

dev/integration_tests/android_semantics_testing/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ android {
3030
}
3131

3232
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
33+
sourceCompatibility JavaVersion.VERSION_17
34+
targetCompatibility JavaVersion.VERSION_17
3535
}
3636

3737
kotlinOptions {
38-
jvmTarget = JavaVersion.VERSION_1_8
38+
jvmTarget = JavaVersion.VERSION_17
3939
}
4040

4141
defaultConfig {

dev/integration_tests/android_views/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android {
3939
}
4040

4141
compileOptions {
42-
sourceCompatibility JavaVersion.VERSION_1_8
43-
targetCompatibility JavaVersion.VERSION_1_8
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/integration_tests/channels/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ android {
4040
}
4141

4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
43+
sourceCompatibility JavaVersion.VERSION_17
44+
targetCompatibility JavaVersion.VERSION_17
4545
}
4646

4747
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8
48+
jvmTarget = JavaVersion.VERSION_17
4949
}
5050

5151
defaultConfig {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ android {
5050
}
5151

5252
compileOptions {
53-
sourceCompatibility = JavaVersion.VERSION_1_8
54-
targetCompatibility = JavaVersion.VERSION_1_8
53+
sourceCompatibility = JavaVersion.VERSION_17
54+
targetCompatibility = JavaVersion.VERSION_17
5555
}
5656
}
5757

dev/integration_tests/external_textures/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
}
3030

3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3434
}
3535

3636
defaultConfig {

dev/integration_tests/flavors/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
}
3030

3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3434
}
3535

3636
defaultConfig {

dev/integration_tests/flutter_gallery/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ android {
5555
}
5656

5757
compileOptions {
58-
sourceCompatibility JavaVersion.VERSION_1_8
59-
targetCompatibility JavaVersion.VERSION_1_8
58+
sourceCompatibility JavaVersion.VERSION_17
59+
targetCompatibility JavaVersion.VERSION_17
6060
}
6161

6262
defaultConfig {

dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ android {
1818
}
1919

2020
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_1_8
22-
targetCompatibility JavaVersion.VERSION_1_8
21+
sourceCompatibility JavaVersion.VERSION_17
22+
targetCompatibility JavaVersion.VERSION_17
2323
}
2424

2525
defaultConfig {

dev/integration_tests/platform_interaction/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
}
3030

3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3434
}
3535

3636
defaultConfig {

dev/integration_tests/pure_android_host_apps/host_app_kotlin_gradle_dsl/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android {
3939
}
4040
}
4141
compileOptions {
42-
sourceCompatibility = JavaVersion.VERSION_1_8
43-
targetCompatibility = JavaVersion.VERSION_1_8
42+
sourceCompatibility = JavaVersion.VERSION_17
43+
targetCompatibility = JavaVersion.VERSION_17
4444
}
4545
kotlinOptions {
4646
jvmTarget = "1.8"

dev/integration_tests/release_smoke_test/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ android {
4040
}
4141

4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
43+
sourceCompatibility JavaVersion.VERSION_17
44+
targetCompatibility JavaVersion.VERSION_17
4545
}
4646

4747
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8
48+
jvmTarget = JavaVersion.VERSION_17
4949
}
5050

5151
defaultConfig {

dev/integration_tests/spell_check/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ android {
4040
}
4141

4242
compileOptions {
43-
sourceCompatibility = JavaVersion.VERSION_1_8
44-
targetCompatibility = JavaVersion.VERSION_1_8
43+
sourceCompatibility = JavaVersion.VERSION_17
44+
targetCompatibility = JavaVersion.VERSION_17
4545
}
4646

4747
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8.toString()
48+
jvmTarget = JavaVersion.VERSION_17.toString()
4949
}
5050

5151
sourceSets {

dev/integration_tests/ui/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ android {
2222
}
2323

2424
compileOptions {
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
2727
}
2828

2929
kotlinOptions {
30-
jvmTarget = JavaVersion.VERSION_1_8
30+
jvmTarget = JavaVersion.VERSION_17
3131
}
3232

3333
defaultConfig {

0 commit comments

Comments
 (0)