use java.toolchain and also build against jdk 17

robstoll · May 12, 2023 · 42428a3 · 42428a3
1 parent 0920107
commit 42428a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_version: [ 11, 14 ]
+        java_version: [ 11, 17 ]
 
     steps:
       - uses: actions/checkout@v3
@@ -19,6 +19,8 @@ jobs:
           java-version: ${{ matrix.java_version }}
 
       - name: build
+        env:
+          JAVA_VERSION: ${{ matrix.java_version }}
         run: ./gradlew build
 
       # TODO 1.3.0 re-activate scala API

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_version: [ 11, 14 ]
+        java_version: [ 11, 17 ]
 
     steps:
       - uses: actions/checkout@v3
@@ -21,6 +21,8 @@ jobs:
           java-version: ${{ matrix.java_version }}
 
       - name: build
+        env:
+          JAVA_VERSION: ${{ matrix.java_version }}
         run: ./gradlew build
 
       - name: Cache android jar

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ plugins {
     kotlin("jvm") apply false
     //needs to be applied before tutteli's dokka plugin in order that version takes precedence
     id("org.jetbrains.dokka") version "1.8.10"
-    val tutteliGradleVersion = "4.8.0"
+    val tutteliGradleVersion = "4.9.0"
     id("ch.tutteli.gradle.plugins.dokka") version tutteliGradleVersion
     id("ch.tutteli.gradle.plugins.project.utils") version tutteliGradleVersion
     id("ch.tutteli.gradle.plugins.publish") version tutteliGradleVersion apply false
@@ -133,7 +133,7 @@ configure(multiplatformProjects) {
             withJava()
         }
 
-        //TODO 1.3.0 switch from LEGACY to IR once we output Kotlin > 1.4
+        //TODO 1.1.0 switch from LEGACY to IR
         js(LEGACY) { nodejs() }
 
         sourceSets {
@@ -237,11 +237,22 @@ configure(subprojects.filter {
 }
 
 allprojects {
+    project.extensions.findByType<JavaPluginExtension>()?.apply {
+        toolchain {
+            // reading JAVA_VERSION from env to enable jdk17 build in CI
+            val jdkVersion = System.getenv("JAVA_VERSION")?.toIntOrNull() ?: 11
+            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+        }
+    }
     tasks.withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "11"
         sourceCompatibility = "11"
         targetCompatibility = "11"
     }
+    tasks.withType<JavaCompile> {
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
+    }
 }
 
 //TODO 1.1.0 re-introduce bcTests again? I am currently not sure if it is actually worth it