Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add kotlinOptions jvmTarget to templates #147326

Merged
merged 7 commits into from May 7, 2024
Merged

Add kotlinOptions jvmTarget to templates #147326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85db08f
templates
Apr 24, 2024
db30bd6
other instances (and a template I missed):
Apr 24, 2024
3cd015a
remove duplicate
Apr 24, 2024
8b8543d
remove from templates that don't use kotlin
Apr 24, 2024
742b9b1
spacing
Apr 24, 2024
e22f0b2
remove from .kts file
Apr 30, 2024
846fcab
Merge branch 'master' into kotlinOptions
gmackall Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand Down
2 changes: 1 addition & 1 deletion dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand Down
6 changes: 5 additions & 1 deletion dev/integration_tests/android_semantics_testing/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand All @@ -25,6 +25,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
Expand Down
4 changes: 4 additions & 0 deletions dev/integration_tests/channels/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -36,6 +36,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.channels"
Expand Down
2 changes: 1 addition & 1 deletion dev/integration_tests/non_nullable/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand Down
6 changes: 5 additions & 1 deletion dev/integration_tests/release_smoke_test/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand Down Expand Up @@ -35,6 +35,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.release_smoke_test"
Expand Down
2 changes: 1 addition & 1 deletion dev/integration_tests/spell_check/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@

plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
Expand Down
4 changes: 4 additions & 0 deletions dev/integration_tests/ui/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -17,6 +17,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_tools/templates/app_shared/android-java.tmpl/app/build.gradle.tmpl
View file
Open in desktop
Expand Up @@ -15,6 +15,10 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "{{androidIdentifier}}"
Expand Down
4 changes: 4 additions & 0 deletions packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/app/build.gradle.tmpl
View file
Open in desktop
Expand Up @@ -15,6 +15,10 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "{{androidIdentifier}}"
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ android {
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}

sourceSets {
Expand Down