Remove Jvm toolchain from conventions, upgrade Github workflow Jdk to 21
This commit is contained in:
2
.github/workflows/generate-screenshots.yml
vendored
2
.github/workflows/generate-screenshots.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
cache: gradle
|
cache: gradle
|
||||||
|
|
||||||
- name: Build OPENRNDR
|
- name: Build OPENRNDR
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Build ORX
|
- name: Build ORX
|
||||||
run: ./gradlew -Prelease.useLastTag=true build
|
run: ./gradlew -Prelease.useLastTag=true build
|
||||||
- name: Decode
|
- name: Decode
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Build ORX
|
- name: Build ORX
|
||||||
run: ./gradlew -Prelease.useLastTag=true build
|
run: ./gradlew -Prelease.useLastTag=true build
|
||||||
- name: Decode
|
- name: Decode
|
||||||
|
|||||||
@@ -57,9 +57,7 @@ dependencies {
|
|||||||
"demoRuntimeOnly"(libs.slf4j.simple)
|
"demoRuntimeOnly"(libs.slf4j.simple)
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(libs.versions.jvmTarget.get().toInt())
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
@@ -79,14 +77,19 @@ tasks {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
withType<KotlinCompile>() {
|
withType<KotlinCompile>() {
|
||||||
|
kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
|
||||||
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
|
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
|
||||||
kotlinOptions.languageVersion = libs.versions.kotlinLanguage.get()
|
kotlinOptions.languageVersion = libs.versions.kotlinLanguage.get()
|
||||||
|
kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes"
|
||||||
|
kotlinOptions.freeCompilerArgs += "-Xjdk-release=${libs.versions.jvmTarget.get()}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
withJavadocJar()
|
withJavadocJar()
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
|
targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
|
||||||
|
sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
|
||||||
}
|
}
|
||||||
|
|
||||||
val isReleaseVersion = !(version.toString()).endsWith("SNAPSHOT")
|
val isReleaseVersion = !(version.toString()).endsWith("SNAPSHOT")
|
||||||
|
|||||||
@@ -4,7 +4,10 @@ import CollectScreenshotsTask
|
|||||||
import org.gradle.accessors.dm.LibrariesForLibs
|
import org.gradle.accessors.dm.LibrariesForLibs
|
||||||
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
||||||
|
|
||||||
|
|
||||||
val libs = the<LibrariesForLibs>()
|
val libs = the<LibrariesForLibs>()
|
||||||
|
|
||||||
@@ -28,14 +31,18 @@ repositories {
|
|||||||
|
|
||||||
group = "org.openrndr.extra"
|
group = "org.openrndr.extra"
|
||||||
|
|
||||||
tasks.withType<KotlinCompile>() {
|
tasks.withType<KotlinCompile<*>> {
|
||||||
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
|
kotlinOptions.apiVersion = libs.versions.kotlinApi.get()
|
||||||
kotlinOptions.languageVersion = libs.versions.kotlinLanguage.get()
|
kotlinOptions.languageVersion = libs.versions.kotlinLanguage.get()
|
||||||
|
kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes"
|
||||||
|
kotlinOptions.freeCompilerArgs += "-Xjdk-release=${libs.versions.jvmTarget.get()}"
|
||||||
|
}
|
||||||
|
tasks.withType<KotlinJvmCompile>().configureEach {
|
||||||
|
compilerOptions.jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
jvmToolchain(libs.versions.jvmTarget.get().toInt())
|
|
||||||
compilations {
|
compilations {
|
||||||
val main by getting
|
val main by getting
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user