Remove obsolete workaround for jansi clash issue
This was needed to workaround KT-17031 which is now fixed
This commit is contained in:
@@ -459,7 +459,6 @@ fun jdkPath(version: String): String = jdkPathIfFound(version)
|
|||||||
?: throw GradleException ("Please set environment variable JDK_${version.replace(".", "")} to point to JDK $version installation")
|
?: throw GradleException ("Please set environment variable JDK_${version.replace(".", "")} to point to JDK $version installation")
|
||||||
|
|
||||||
fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
|
fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
|
||||||
|
|
||||||
tasks.withType<JavaCompile> {
|
tasks.withType<JavaCompile> {
|
||||||
options.isFork = true
|
options.isFork = true
|
||||||
options.forkOptions.javaHome = file(javaHome)
|
options.forkOptions.javaHome = file(javaHome)
|
||||||
@@ -470,9 +469,6 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
|
|||||||
tasks.withType<KotlinCompile> {
|
tasks.withType<KotlinCompile> {
|
||||||
kotlinOptions.jdkHome = javaHome
|
kotlinOptions.jdkHome = javaHome
|
||||||
kotlinOptions.jvmTarget = javaVersion
|
kotlinOptions.jvmTarget = javaVersion
|
||||||
doFirst {
|
|
||||||
System.setProperty("kotlin.colors.enabled", "false")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Test> {
|
tasks.withType<Test> {
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ val serialize = task("serialize") {
|
|||||||
outputs.dir(outDir)
|
outputs.dir(outDir)
|
||||||
inputs.files(*inDirs)
|
inputs.files(*inDirs)
|
||||||
doLast {
|
doLast {
|
||||||
System.setProperty("kotlin.colors.enabled", "false")
|
|
||||||
BuiltInsSerializer(dependOnOldBuiltIns = false)
|
BuiltInsSerializer(dependOnOldBuiltIns = false)
|
||||||
.serialize(outDir, inDirs.asList(), listOf()) { totalSize, totalFiles ->
|
.serialize(outDir, inDirs.asList(), listOf()) { totalSize, totalFiles ->
|
||||||
println("Total bytes written: $totalSize to $totalFiles files")
|
println("Total bytes written: $totalSize to $totalFiles files")
|
||||||
|
|||||||
@@ -22,17 +22,12 @@ ext.configureJvmProject = { Project project ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
// sourceCompatibility = 1.6
|
|
||||||
// targetCompatibility = 1.6
|
|
||||||
options.fork = true
|
options.fork = true
|
||||||
options.forkOptions.javaHome = file(JDK_18)
|
options.forkOptions.javaHome = file(JDK_18)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(project.compileKotlin.class) {
|
tasks.withType(project.compileKotlin.class) {
|
||||||
kotlinOptions.jdkHome = JDK_18
|
kotlinOptions.jdkHome = JDK_18
|
||||||
doFirst {
|
|
||||||
System.setProperty("kotlin.colors.enabled", "false")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
@@ -61,9 +56,6 @@ ext.configureJvm6Project = { Project project ->
|
|||||||
tasks.withType(project.compileKotlin.class) {
|
tasks.withType(project.compileKotlin.class) {
|
||||||
kotlinOptions.jdkHome = JDK_16
|
kotlinOptions.jdkHome = JDK_16
|
||||||
kotlinOptions.jvmTarget = "1.6"
|
kotlinOptions.jvmTarget = "1.6"
|
||||||
doFirst {
|
|
||||||
System.setProperty("kotlin.colors.enabled", "false")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|||||||
Reference in New Issue
Block a user