Skip to content

Commit 4e37b2f

Browse files
gmackallpull[bot]
authored andcommitted
Add kotlinOptions jvmTarget to templates (flutter#147326)
Adds jvmTarget to gradle templates. Fixes flutter#147185. Interestingly, we already had this in many of our examples/tests, see search results here https://github.com/search?q=repo%3Aflutter%2Fflutter%20jvmTarget&type=code.
1 parent 068bd80 commit 4e37b2f

File tree

11 files changed

+31
-7
lines changed

11 files changed

+31
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()
@@ -25,6 +25,10 @@ android {
2525
targetCompatibility JavaVersion.VERSION_1_8
2626
}
2727

28+
kotlinOptions {
29+
jvmTarget = JavaVersion.VERSION_1_8
30+
}
31+
2832
defaultConfig {
2933
minSdkVersion flutter.minSdkVersion
3034
targetSdkVersion flutter.targetSdkVersion

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ android {
3636
targetCompatibility JavaVersion.VERSION_1_8
3737
}
3838

39+
kotlinOptions {
40+
jvmTarget = JavaVersion.VERSION_1_8
41+
}
42+
3943
defaultConfig {
4044
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4145
applicationId "com.example.channels"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()
@@ -35,6 +35,10 @@ android {
3535
targetCompatibility JavaVersion.VERSION_1_8
3636
}
3737

38+
kotlinOptions {
39+
jvmTarget = JavaVersion.VERSION_1_8
40+
}
41+
3842
defaultConfig {
3943
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4044
applicationId "com.example.release_smoke_test"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
plugins {
66
id "com.android.application"
7-
id "dev.flutter.flutter-gradle-plugin"
87
id "kotlin-android"
8+
id "dev.flutter.flutter-gradle-plugin"
99
}
1010

1111
def localProperties = new Properties()

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ android {
1717
targetCompatibility JavaVersion.VERSION_1_8
1818
}
1919

20+
kotlinOptions {
21+
jvmTarget = JavaVersion.VERSION_1_8
22+
}
23+
2024
defaultConfig {
2125
minSdkVersion flutter.minSdkVersion
2226
targetSdkVersion flutter.targetSdkVersion

packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ android {
1515
targetCompatibility = JavaVersion.VERSION_1_8
1616
}
1717

18+
kotlinOptions {
19+
jvmTarget = JavaVersion.VERSION_1_8
20+
}
21+
1822
defaultConfig {
1923
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2024
applicationId = "{{androidIdentifier}}"

packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ android {
1515
targetCompatibility = JavaVersion.VERSION_1_8
1616
}
1717

18+
kotlinOptions {
19+
jvmTarget = JavaVersion.VERSION_1_8
20+
}
21+
1822
defaultConfig {
1923
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2024
applicationId = "{{androidIdentifier}}"

packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
}
3838

3939
kotlinOptions {
40-
jvmTarget = "1.8"
40+
jvmTarget = JavaVersion.VERSION_1_8
4141
}
4242

4343
sourceSets {

0 commit comments

Comments
 (0)