From f13d6dd47c126291aa39880402824858cecc818a Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Thu, 25 Aug 2022 00:09:59 +0200 Subject: [PATCH 1/5] standardise the jvm target to 1.8 --- buildSrc/src/main/kotlin/buildsrc/config/Deps.kt | 7 +++++++ .../buildsrc/convention/android-application.gradle.kts | 7 ++++--- .../kotlin/buildsrc/convention/android-library.gradle.kts | 8 +++++--- .../main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts | 2 ++ .../buildsrc/convention/kotlin-multiplatform.gradle.kts | 6 ++++++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt index b6d467f99..e1a0fd593 100644 --- a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt +++ b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt @@ -1,11 +1,14 @@ package buildsrc.config +import org.gradle.api.JavaVersion import org.gradle.api.Project fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps.Versions.kotlinDefault object Deps { object Versions { + val jvmTarget = JavaVersion.VERSION_1_8 + const val androidTools = "7.2.1" const val dokka = "1.7.10" const val kotlinDefault = "1.7.10" @@ -43,3 +46,7 @@ object Deps { const val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core" } } + + +val JavaVersion.versionName : String + get() = this.toString() diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts index 09f064aed..28382c80f 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts @@ -1,5 +1,6 @@ package buildsrc.convention +import buildsrc.config.Deps import org.gradle.jvm.tasks.Jar plugins { @@ -18,7 +19,7 @@ android { compileSdkVersion = "android-32" kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = Deps.Versions.jvmTarget.toString() } lint { @@ -39,8 +40,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = Deps.Versions.jvmTarget + targetCompatibility = Deps.Versions.jvmTarget } } diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts index 3f3e573e7..29b9b7aaa 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts @@ -1,5 +1,7 @@ package buildsrc.convention +import buildsrc.config.Deps + plugins { id("com.android.library") @@ -16,7 +18,7 @@ android { compileSdkVersion = "android-32" kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = Deps.Versions.jvmTarget.toString() } lint { @@ -37,8 +39,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = Deps.Versions.jvmTarget + targetCompatibility = Deps.Versions.jvmTarget } } diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts index cafa67580..b24ab7b65 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts @@ -1,5 +1,6 @@ package buildsrc.convention +import buildsrc.config.Deps import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -25,6 +26,7 @@ tasks.withType().configureEach { tasks.withType().configureEach { kotlinOptions.apply { freeCompilerArgs += listOf("-Xjsr305=strict") + jvmTarget = Deps.Versions.jvmTarget.toString() apiVersion = "1.5" languageVersion = "1.7" } diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts index 9258aba2e..e1fba20e7 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts @@ -1,5 +1,6 @@ package buildsrc.convention +import buildsrc.config.Deps import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget plugins { @@ -21,6 +22,11 @@ kotlin { } } targets.withType().configureEach { + compilations.configureEach { + kotlinOptions { + jvmTarget = Deps.Versions.jvmTarget.toString() + } + } testRuns["test"].executionTask.configure { useJUnitPlatform() } From b1783cf3726916da429f8bfd5339f30a0e704755 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Thu, 25 Aug 2022 00:24:53 +0200 Subject: [PATCH 2/5] rm unused versionName helper --- buildSrc/src/main/kotlin/buildsrc/config/Deps.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt index e1a0fd593..c136bdc92 100644 --- a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt +++ b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt @@ -46,7 +46,3 @@ object Deps { const val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core" } } - - -val JavaVersion.versionName : String - get() = this.toString() From 9fc5cb40e778f9fe241924a6e8c4305875a9cfaa Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:57:33 +0200 Subject: [PATCH 3/5] formatting --- buildSrc/src/main/kotlin/buildsrc/config/Deps.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt index c136bdc92..8ff5d4752 100644 --- a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt +++ b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt @@ -7,7 +7,7 @@ fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps object Deps { object Versions { - val jvmTarget = JavaVersion.VERSION_1_8 + val jvmTarget = JavaVersion.VERSION_1_8 const val androidTools = "7.2.1" const val dokka = "1.7.10" From 5a9887ad8b474a8b2d214d02f78cde890cad5c3b Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:15:13 +0200 Subject: [PATCH 4/5] add jdk8 to ci matrix #902 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e35730e1f..4b154bd9b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 11, 17, 18 ] # test LTS versions, and the newest + java-version: [ 8, 11, 17, 18 ] # test LTS versions, and the newest kotlin-version: [ 1.5.31, 1.6.21, 1.7.10 ] kotlin-ir-enabled: [ true, false ] fail-fast: false # in case one JDK fails, we still want to see results from others From 7d48dad78e2c5047b45b8757197c4e8922d8f57d Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:54:41 +0200 Subject: [PATCH 5/5] rm 1.8 from test matrix - Android requires jdk11 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4b154bd9b..e35730e1f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 8, 11, 17, 18 ] # test LTS versions, and the newest + java-version: [ 11, 17, 18 ] # test LTS versions, and the newest kotlin-version: [ 1.5.31, 1.6.21, 1.7.10 ] kotlin-ir-enabled: [ true, false ] fail-fast: false # in case one JDK fails, we still want to see results from others