diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-09 18:22:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-09 18:22:00 +0000 |
| commit | d44444da56da572c05806cbca1d70f3b473eeb47 (patch) | |
| tree | c72e4a4ad950aee164359cb1d6af54cee7eac0b4 | |
| parent | 7dee59e45eea22507d477131e65c8b7c0e1cb0e4 (diff) | |
| parent | 4790ba2c24909edfe56e75f850958e0778d6ef14 (diff) | |
| download | data-binding-d44444da56da572c05806cbca1d70f3b473eeb47.tar.gz | |
Snap for 9716135 from 4790ba2c24909edfe56e75f850958e0778d6ef14 to studio-giraffe-release
Change-Id: I22204da664351921ccd3e4a1f978fe62b224d715
3 files changed, 27 insertions, 0 deletions
diff --git a/integration-tests/KotlinTestApp/app/build.gradle b/integration-tests/KotlinTestApp/app/build.gradle index a185c4cf..55cccfe6 100644 --- a/integration-tests/KotlinTestApp/app/build.gradle +++ b/integration-tests/KotlinTestApp/app/build.gradle @@ -38,6 +38,15 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs.class).configureEach { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) + } } dependencies { diff --git a/integration-tests/KotlinTestApp/library1/build.gradle b/integration-tests/KotlinTestApp/library1/build.gradle index 25be4b80..5919212f 100644 --- a/integration-tests/KotlinTestApp/library1/build.gradle +++ b/integration-tests/KotlinTestApp/library1/build.gradle @@ -35,6 +35,15 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs.class).configureEach { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) + } } dependencies { diff --git a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle index a16bb16a..99441325 100644 --- a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle +++ b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle @@ -38,6 +38,15 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs.class).configureEach { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) + } } dependencies { |