Merge pull request #1056 from aSemy/fix/configurable_kotlin_version

update Kotlin and Java Toolchain properties, and setting them in CI
mockk · Sep 19, 2023 · 3261aff · 3261aff
2 parents f131526 + 8479d34
commit 3261aff
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -37,8 +37,8 @@ jobs:
         run: >
           ./gradlew check
           --stacktrace
-          -Pkotlin.version=${{ matrix.kotlin-version }}
-          -PjavaToolchainTestVersion=${{ matrix.java-version }}
+          -Pio_mockk_kotlin_version=${{ matrix.kotlin-version }}
+          -Pio_mockk_java_toolchain_test_version=${{ matrix.java-version }}
 
   android-instrumented-tests:
     runs-on: macos-latest

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     `kotlin-dsl`
 }
@@ -25,19 +23,3 @@ dependencies {
 
     implementation("org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidator")
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
-kotlinDslPluginOptions {
-    jvmTarget.set("11")
-}
diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt
@@ -3,7 +3,9 @@ package buildsrc.config
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
-fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps.Versions.kotlinDefault
+fun Project.kotlinVersion(): String =
+    providers.gradleProperty("io_mockk_kotlin_version")
+        .getOrElse(Deps.Versions.kotlinDefault)
 
 object Deps {
     object Versions {

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts
@@ -25,8 +25,8 @@ tasks.withType<KotlinCompile>().configureEach {
 val javaToolchains: JavaToolchainService = extensions.getByType()
 
 
-val javaToolchainMainVersion = javaLanguageVersion("javaToolchainMainVersion")
-val javaToolchainTestVersion = javaLanguageVersion("javaToolchainTestVersion")
+val javaToolchainMainVersion = javaLanguageVersion("io_mockk_java_toolchain_main_version")
+val javaToolchainTestVersion = javaLanguageVersion("io_mockk_java_toolchain_test_version")
 
 
 // The Java Toolchains that will compile/launch *main* code

diff --git a/gradle.properties b/gradle.properties
@@ -8,8 +8,12 @@ org.gradle.welcome=never
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=768m
 kotlin.mpp.stability.nowarn=true
 localrepo=build/maven-local-repo
-android.useAndroidX=true
+########################
 # version of Java that will be used to build the project
-javaToolchainMainVersion=11
+io_mockk_java_toolchain_main_version=11
 # the Java version tests will run against - this is overridden in the GitHub actions
-javaToolchainTestVersion=11
+io_mockk_java_toolchain_test_version=11
+########################
+# Android properties:
+android.useAndroidX=true
+########################