Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make Java source code target jvm 8 #907

Merged
merged 1 commit into from Aug 29, 2022
Merged

make Java source code target jvm 8 #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
View file
Open in desktop
Expand Up @@ -22,11 +22,6 @@ kotlin {
}
}
targets.withType<KotlinJvmTarget>().configureEach {
compilations.configureEach {
kotlinOptions {
jvmTarget = Deps.Versions.jvmTarget.toString()
}
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
14 changes: 14 additions & 0 deletions buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts
View file
Open in desktop
@@ -1,12 +1,26 @@
package buildsrc.convention

import buildsrc.config.Deps
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain


description = "Set JavaToolchain for compiling main and test code"


tasks.withType<JavaCompile>().configureEach {
options.encoding = "UTF-8"
sourceCompatibility = Deps.Versions.jvmTarget.toString()
targetCompatibility = Deps.Versions.jvmTarget.toString()
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = Deps.Versions.jvmTarget.toString()
}
}

// Retrieve the JavaToolchainService extension
val javaToolchains: JavaToolchainService = extensions.getByType()

Expand Down