diff options
| author | Hung Nguyen <hungnv@google.com> | 2023-02-27 17:21:53 +0000 |
|---|---|---|
| committer | Hung Nguyen <hungnv@google.com> | 2023-03-02 19:29:58 +0000 |
| commit | 4790ba2c24909edfe56e75f850958e0778d6ef14 (patch) | |
| tree | c72e4a4ad950aee164359cb1d6af54cee7eac0b4 | |
| parent | 21b14f9f278ecf3f0e0bb7ecd191a56f4d16610a (diff) | |
| download | data-binding-4790ba2c24909edfe56e75f850958e0778d6ef14.tar.gz | |
Use KGP 1.8.20-Beta for tests (tools/data-binding)
Steps specific to this update:
- Add jvmTarget = '1.8' in
+ integration-tests/KotlinTestApp/**/build.gradle
+ integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle
Bug: 269424891
Test: Existing tests
Change-Id: Ide8d732fd3f2d9145e7267b7941359274dea604c
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 { |