Use JDK 17 on CI (#244)

JuulLabs · May 15, 2023 · 9be9800 · 9be9800
1 parent 3f0ea40
commit 9be9800
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - uses: actions/cache@v3
         with:

diff --git a/axis/build.gradle.kts b/axis/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/box/build.gradle.kts b/box/build.gradle.kts
@@ -6,8 +6,9 @@ plugins {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
-    android { publishAllLibraryVariants() }
+    android().publishAllLibraryVariants()
     jvm()
     js().browser()
     macosArm64()
@@ -91,15 +92,19 @@ kotlin {
 // }
 
 android {
-    compileSdkVersion(libs.versions.android.compile.get())
-
-    defaultConfig {
-        minSdkVersion(libs.versions.android.min.get())
+    // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09.
+    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        isAbortOnError = true
-        isWarningsAsErrors = true
+    compileSdk = libs.versions.android.compile.get().toInt()
+    defaultConfig.minSdk = libs.versions.android.min.get().toInt()
+
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
     }
 
     sourceSets {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,6 @@ plugins {
     alias(libs.plugins.kotlinter) apply false
     alias(libs.plugins.dokka)
     alias(libs.plugins.maven.publish) apply false
-    alias(libs.plugins.java8)
     alias(libs.plugins.validator)
 }
 

diff --git a/color/build.gradle.kts b/color/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     android() { publishAllLibraryVariants() }
     jvm("desktop")
@@ -41,15 +42,19 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(libs.versions.android.compile.get())
-
-    defaultConfig {
-        minSdkVersion(libs.versions.android.min.get())
+    // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09.
+    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        isAbortOnError = true
-        isWarningsAsErrors = true
+    compileSdk = libs.versions.android.compile.get().toInt()
+    defaultConfig.minSdk = libs.versions.android.min.get().toInt()
+
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
     }
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

diff --git a/element-view/build.gradle.kts b/element-view/build.gradle.kts
@@ -8,8 +8,9 @@ plugins {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
-    android { publishAllLibraryVariants() }
+    android().publishAllLibraryVariants()
     js().browser()
 
     sourceSets {
@@ -53,15 +54,19 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(libs.versions.android.compile.get())
-
-    defaultConfig {
-        minSdkVersion(libs.versions.android.min.get())
+    // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09.
+    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        isAbortOnError = true
-        isWarningsAsErrors = true
+    compileSdk = libs.versions.android.compile.get().toInt()
+    defaultConfig.minSdk = libs.versions.android.min.get().toInt()
+
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
     }
 
     sourceSets {

diff --git a/element-view/src/androidMain/kotlin/ElementView.kt b/element-view/src/androidMain/kotlin/ElementView.kt
@@ -26,7 +26,7 @@ public class ElementView @JvmOverloads constructor(
     private val blitPaint = AndroidPaint()
 
     /** The chart [ElementViewAdapter]. */
-    var adapter: ElementViewAdapter<*>? = null
+    public var adapter: ElementViewAdapter<*>? = null
         set(value) {
             if (isAttachedToWindow) {
                 field?.onDetached()

diff --git a/element/build.gradle.kts b/element/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx2048m
 
 # Android Configuration
 android.useAndroidX=true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
 agp = "7.4.1" # 7.4.1 is the maximum version supported by IDEA 2023.1
-android-compile = "android-33"
-android-target = "32"
+android-compile = "33"
 android-min = "21"
+android-target = "32"
 compose = "1.4.0"
 coroutines = "1.7.1"
 jacoco = "0.8.7"
+jvm-toolchain = "11"
 kotlin = "1.8.20"
 
 [libraries]
@@ -27,7 +28,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 atomicfu = { id = "kotlinx-atomicfu", version = "0.20.2" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 dokka = { id = "org.jetbrains.dokka", version = "1.8.10" }
-java8 = { id = "net.mbonnin.one.eight", version = "0.2" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "3.14.0" }
 maven-publish = { id = "com.vanniktech.maven.publish", version = "0.25.2" }

diff --git a/hierarchy/build.gradle.kts b/hierarchy/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/interpolate/build.gradle.kts b/interpolate/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/kanvas/build.gradle.kts b/kanvas/build.gradle.kts
@@ -15,8 +15,9 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
-    android { publishAllLibraryVariants() }
+    android().publishAllLibraryVariants()
     jvm()
     js().browser()
     iosArm64()
@@ -85,15 +86,19 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(libs.versions.android.compile.get())
-
-    defaultConfig {
-        minSdkVersion(libs.versions.android.min.get())
+    // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09.
+    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        isAbortOnError = true
-        isWarningsAsErrors = true
+    compileSdk = libs.versions.android.compile.get().toInt()
+    defaultConfig.minSdk = libs.versions.android.min.get().toInt()
+
+    lint {
+        abortOnError = true
+        warningsAsErrors = true
     }
 
     sourceSets {

diff --git a/kanvas/src/androidMain/kotlin/KanvasView.kt b/kanvas/src/androidMain/kotlin/KanvasView.kt
@@ -9,7 +9,7 @@ import android.util.TypedValue.applyDimension
 import android.view.View
 
 /** Base class for custom [View]s implemented using Krayon. */
-abstract class KanvasView(
+public abstract class KanvasView(
     context: Context,
     attrs: AttributeSet? = null,
 ) : View(context, attrs) {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -9,6 +9,8 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
+
     android()
     jvm("desktop")
     js {
@@ -78,10 +80,17 @@ kotlin {
 }
 
 android {
-    compileSdkVersion(libs.versions.android.compile.get())
+    // Workaround (for `jvmToolchain` not being honored) needed until AGP 8.1.0-alpha09.
+    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    compileSdk = libs.versions.android.compile.get().toInt()
 
     defaultConfig {
-        minSdkVersion(libs.versions.android.min.get())
+        minSdk = libs.versions.android.min.get().toInt()
         targetSdk = libs.versions.android.target.get().toInt()
         versionCode = 1
         versionName = "sample"
@@ -92,7 +101,7 @@ android {
         viewBinding = true
     }
 
-    lintOptions {
+    lint {
         // Good habits for a real app, but trying to keep the sample project minimal.
         disable += "AllowBackup"
         disable += "MissingApplicationIcon"

diff --git a/scale/build.gradle.kts b/scale/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/selection/build.gradle.kts b/selection/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/shape/build.gradle.kts b/shape/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()

diff --git a/time/build.gradle.kts b/time/build.gradle.kts
@@ -14,6 +14,7 @@ jacoco {
 
 kotlin {
     explicitApi()
+    jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     jvm()
     js().browser()