update Kotlin and Java Toolchain properties, and setting them in CI

mockk · Sep 19, 2023 · dc7968b · dc7968b
1 parent f131526
commit dc7968b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -34,11 +34,12 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
 
       - name: Run tests with Gradle
+        env:
+          ORG_GRADLE_PROJECT_io_mockk_kotlin_version: ${{ matrix.kotlin-version }}
+          ORG_GRADLE_PROJECT_io_mockk_java_toolchain_test_version: ${{ matrix.java-version }}
         run: >
           ./gradlew check
           --stacktrace
-          -Pkotlin.version=${{ matrix.kotlin-version }}
-          -PjavaToolchainTestVersion=${{ matrix.java-version }}
 
   android-instrumented-tests:
     runs-on: macos-latest

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 // set the versions of Gradle plugins that the subprojects will use here
-val kotlinPluginVersion: String = "1.9.10"
+val kotlinPluginVersion: String = providers.gradleProperty("io_mockk_kotlin_version").getOrElse("1.9.10")
 
 val androidGradle = "8.1.1"
 val kotlinxKover = "0.7.3"

diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt
@@ -3,8 +3,6 @@ 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_11

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
+########################