Skip to content

Commit fb04061

Browse files
authored
Update minJdk to11 (kotest#4749)
<!-- If this PR updates documentation, please update all relevant versions of the docs, see: https://github.com/kotest/kotest/tree/master/documentation/versioned_docs The documentation at https://github.com/kotest/kotest/tree/master/documentation/docs is the documentation for the next minor or major version _TO BE RELEASED_ -->
1 parent 6e0ff51 commit fb04061

File tree

7 files changed

+13
-31
lines changed

7 files changed

+13
-31
lines changed

buildSrc/src/main/kotlin/kotest-jvm-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ fun VersionCatalog.findJvmVersion(name: String): Provider<JavaLanguageVersion> =
3434

3535

3636
/** The minimum Java version that Kotest supports. */
37-
val jvmMinTargetVersion = versionCatalog.findJvmVersion("jvmMinTarget")
37+
val jvmMinTargetVersion: Provider<JavaLanguageVersion> = versionCatalog.findJvmVersion("jvmMinTarget")
3838

3939
/** The minimum Java version that Kotest supports. */
40-
val jvmMaxTargetVersion = versionCatalog.findJvmVersion("jvmMaxTarget")
40+
val jvmMaxTargetVersion: Provider<JavaLanguageVersion> = versionCatalog.findJvmVersion("jvmMaxTarget")
4141

4242
/** The Java version used for compilation. */
43-
val jvmCompilerVersion = versionCatalog.findJvmVersion("jvmCompiler")
43+
val jvmCompilerVersion: Provider<JavaLanguageVersion> = versionCatalog.findJvmVersion("jvmCompiler")
4444

4545

4646
//region configure Java compiler

buildSrc/src/main/kotlin/utils/JavaToolchains.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ package utils
33
import org.gradle.api.provider.Provider
44
import org.gradle.jvm.toolchain.JavaLanguageVersion
55
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
6-
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
76
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
87

98
/** Convert a Gradle [JavaLanguageVersion] to a Kotlin [JvmTarget]. */
109
internal fun JavaLanguageVersion.jvmTarget(): JvmTarget {
11-
val version = asInt()
12-
val target = if (version <= 8) "1.$version" else "$version"
13-
return JvmTarget.fromTarget(target)
10+
return JvmTarget.fromTarget(asInt().toString())
1411
}
1512

1613
internal fun Provider<JavaLanguageVersion>.jvmTarget(): Provider<JvmTarget> =
17-
map { it.jvmTarget() }
14+
map { JvmTarget.fromTarget(it.asInt().toString()) }
1815

1916
internal fun Provider<JavaLanguageVersion>.asInt(): Provider<Int> =
2017
map { it.asInt() }

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ arrow = "2.0.1"
3232

3333
### Java compilation ###
3434
# Kotest's minimum supported Java version.
35-
jvmMinTarget = "8"
35+
jvmMinTarget = "11"
3636
# Kotest's maximum supported Java version. (Must be >= jvmMinTarget.)
3737
jvmMaxTarget = "21"
3838
# JDK used to compile Kotest. (Must be >= jvmMaxTarget.)

kotest-extensions/build.gradle.kts

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ kotlin {
77

88
sourceSets {
99

10-
val jvmMain by getting {
10+
jvmMain {
1111
dependencies {
1212
implementation(kotlin("reflect"))
1313
implementation(projects.kotestFramework.kotestFrameworkEngine)
1414
implementation(projects.kotestCommon)
1515
}
1616
}
1717

18-
val jvmTest by getting {
18+
jvmTest {
1919
dependencies {
2020
implementation(projects.kotestAssertions.kotestAssertionsCore)
2121
implementation(libs.kotlinx.coroutines.core)
@@ -24,18 +24,3 @@ kotlin {
2424
}
2525
}
2626
}
27-
28-
tasks.withType<Test>().configureEach {
29-
jvmArgumentProviders.add(CommandLineArgumentProvider {
30-
val javaLauncher = javaLauncher.orNull
31-
buildList {
32-
if (javaLauncher != null && javaLauncher.metadata.languageVersion >= JavaLanguageVersion.of(9)) {
33-
// --add-opens is only available in Java 9+
34-
add("--add-opens=java.base/java.util=ALL-UNNAMED")
35-
add("--add-opens=java.base/java.lang=ALL-UNNAMED")
36-
// have to manually allow security.manager in Java 9+ https://github.com/kotest/kotest/issues/3841
37-
add("-Djava.security.manager=allow")
38-
}
39-
}
40-
})
41-
}

kotest-framework/kotest-framework-multiplatform-plugin-gradle/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ gradlePlugin {
8787
tasks.withType<KotlinCompile>().configureEach {
8888
kotlin {
8989
compilerOptions {
90-
jvmTarget.set(JvmTarget.JVM_1_8)
90+
jvmTarget.set(JvmTarget.JVM_11)
9191
}
9292
}
9393
}
9494

9595
tasks.withType<JavaCompile>().configureEach {
96-
options.release.set(8)
96+
options.release.set(11)
9797
}
9898

9999
val updateKotestPluginConstants by tasks.registering {

kotest-framework/kotest-framework-plugin-gradle/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ gradlePlugin {
6060
tasks.withType<KotlinCompile>().configureEach {
6161
kotlin {
6262
compilerOptions {
63-
jvmTarget.set(JvmTarget.JVM_1_8)
63+
jvmTarget.set(JvmTarget.JVM_11)
6464
}
6565
}
6666
}
6767

6868
tasks.withType<JavaCompile>().configureEach {
69-
options.release.set(8)
69+
options.release.set(11)
7070
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencyResolutionManagement {
4444

4545
plugins {
4646
id("com.gradle.develocity") version "3.17.5"
47-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
47+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
4848
}
4949

5050
include(

0 commit comments

Comments
 (0)