From a29631ff8e166dfe611359160ac0e4a639322d8c Mon Sep 17 00:00:00 2001 From: xeromank Date: Mon, 19 Feb 2024 15:54:45 +0900 Subject: [PATCH] refactor: target jvm version to 17 --- .idea/codeStyles/Project.xml | 10 +--------- .idea/compiler.xml | 12 ++++++------ .idea/kotlinc.xml | 6 ++++++ .idea/misc.xml | 5 ++++- buildSrc/build.gradle.kts | 6 +++--- fixture-android-tests/build.gradle.kts | 11 ++++++++--- fixture-generex/build.gradle.kts | 6 +++--- fixture-javafaker/build.gradle.kts | 19 +++++++++++-------- fixture-kotest/build.gradle.kts | 6 +++--- fixture/build.gradle.kts | 6 +++--- 10 files changed, 48 insertions(+), 39 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 417b42b1..51da24c5 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -121,15 +121,7 @@ - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 5f1f7f02..b17e7e34 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,11 +1,11 @@ - - - - - + + + + + - \ No newline at end of file + diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..217e5c51 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index ddaffea4..913a8d6a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,10 @@ - + + + + \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d29565ce..7f5501e6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -25,12 +25,12 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType(KotlinCompile::class.java).all { kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } diff --git a/fixture-android-tests/build.gradle.kts b/fixture-android-tests/build.gradle.kts index 33bd4033..9a450fc7 100644 --- a/fixture-android-tests/build.gradle.kts +++ b/fixture-android-tests/build.gradle.kts @@ -44,8 +44,13 @@ android { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } } @@ -69,7 +74,7 @@ dependencies { } tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } tasks.named("check") { diff --git a/fixture-generex/build.gradle.kts b/fixture-generex/build.gradle.kts index 5c209377..1008f109 100644 --- a/fixture-generex/build.gradle.kts +++ b/fixture-generex/build.gradle.kts @@ -47,12 +47,12 @@ lint { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } tasks.named("check") { diff --git a/fixture-javafaker/build.gradle.kts b/fixture-javafaker/build.gradle.kts index 219c484c..f07b22b5 100644 --- a/fixture-javafaker/build.gradle.kts +++ b/fixture-javafaker/build.gradle.kts @@ -28,12 +28,15 @@ apply(from = "$rootDir/gradle/scripts/jacoco.gradle.kts") dependencies { api(kotlin("stdlib-jdk8")) api(project(":fixture")) - api("com.github.javafaker:javafaker:${Versions.javafaker}") - api("org.yaml:snakeyaml:android") { - version { - strictly("1.27") - } + api("com.github.javafaker:javafaker:${Versions.javafaker}") { + exclude("org.yaml", "snakeyaml") } + api("org.yaml:snakeyaml:2.2") +// api("org.yaml:snakeyaml:android") { +// version { +// strictly("1.27") +// } +// } testImplementation("junit:junit:${Versions.junit4}") testImplementation(kotlin("test")) @@ -52,12 +55,12 @@ lint { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } tasks.named("check") { diff --git a/fixture-kotest/build.gradle.kts b/fixture-kotest/build.gradle.kts index eaa30c95..12b421cc 100644 --- a/fixture-kotest/build.gradle.kts +++ b/fixture-kotest/build.gradle.kts @@ -47,12 +47,12 @@ lint { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } tasks.named("check") { diff --git a/fixture/build.gradle.kts b/fixture/build.gradle.kts index f020b81b..f76ee374 100644 --- a/fixture/build.gradle.kts +++ b/fixture/build.gradle.kts @@ -64,12 +64,12 @@ lint { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } tasks.named("check") {