Skip to content

Commit 2a109b4

Browse files
Migrate tests and documentation to set java version to 17 (flutter#176204)
## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
1 parent 5d00bf8 commit 2a109b4

10 files changed

Lines changed: 26 additions & 26 deletions

File tree

dev/a11y_assessments/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ android {
4646
}
4747

4848
compileOptions {
49-
sourceCompatibility = JavaVersion.VERSION_11
50-
targetCompatibility = JavaVersion.VERSION_11
49+
sourceCompatibility = JavaVersion.VERSION_17
50+
targetCompatibility = JavaVersion.VERSION_17
5151
}
5252

5353
kotlinOptions {
54-
jvmTarget = JavaVersion.VERSION_11.toString()
54+
jvmTarget = JavaVersion.VERSION_17.toString()
5555
}
5656

5757
sourceSets {

dev/benchmarks/complex_layout/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/benchmarks/macrobenchmarks/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/benchmarks/microbenchmarks/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/benchmarks/platform_views_layout/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/benchmarks/platform_views_layout_hybrid_composition/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/benchmarks/test_apps/stocks/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_11
43-
targetCompatibility JavaVersion.VERSION_11
42+
sourceCompatibility JavaVersion.VERSION_17
43+
targetCompatibility JavaVersion.VERSION_17
4444
}
4545

4646
defaultConfig {

dev/manual_tests/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_11
44-
targetCompatibility JavaVersion.VERSION_11
43+
sourceCompatibility JavaVersion.VERSION_17
44+
targetCompatibility JavaVersion.VERSION_17
4545
}
4646

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

5151
sourceSets {

docs/contributing/Android-API-And-Related-Versions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
129129
- jvmTarget should use JavaVersion.<SOMEVERSION>.toString() or there should be a comment explaining why.
130130

131131
```
132-
// Ok
132+
// Correct configuration
133133
compileOptions {
134-
sourceCompatibility = JavaVersion.VERSION_11
135-
targetCompatibility = JavaVersion.VERSION_11
134+
sourceCompatibility = JavaVersion.VERSION_17
135+
targetCompatibility = JavaVersion.VERSION_17
136136
}
137137
138138
kotlinOptions {
139-
jvmTarget = JavaVersion.VERSION_11.toString()
139+
jvmTarget = JavaVersion.VERSION_17.toString()
140140
}
141141
```
142142

143143
```
144-
// Not ok
144+
// Not ok, kotlinOptions uses a string.
145145
compileOptions {
146146
sourceCompatibility = JavaVersion.VERSION_17
147147
targetCompatibility = JavaVersion.VERSION_17
@@ -153,7 +153,7 @@ kotlinOptions {
153153
```
154154

155155
```
156-
// Not ok
156+
// Not ok, different versions of java
157157
compileOptions {
158158
sourceCompatibility = JavaVersion.VERSION_11
159159
targetCompatibility = JavaVersion.VERSION_11

engine/src/flutter/shell/platform/android/test_runner/build.gradle

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

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

4747
testOptions {

0 commit comments

Comments
 (0)