File tree Expand file tree Collapse file tree 7 files changed +13
-31
lines changed
kotest-framework-multiplatform-plugin-gradle
kotest-framework-plugin-gradle Expand file tree Collapse file tree 7 files changed +13
-31
lines changed Original file line number Diff line number Diff line change @@ -34,13 +34,13 @@ fun VersionCatalog.findJvmVersion(name: String): Provider<JavaLanguageVersion> =
34
34
35
35
36
36
/* * The minimum Java version that Kotest supports. */
37
- val jvmMinTargetVersion = versionCatalog.findJvmVersion(" jvmMinTarget" )
37
+ val jvmMinTargetVersion: Provider < JavaLanguageVersion > = versionCatalog.findJvmVersion(" jvmMinTarget" )
38
38
39
39
/* * The minimum Java version that Kotest supports. */
40
- val jvmMaxTargetVersion = versionCatalog.findJvmVersion(" jvmMaxTarget" )
40
+ val jvmMaxTargetVersion: Provider < JavaLanguageVersion > = versionCatalog.findJvmVersion(" jvmMaxTarget" )
41
41
42
42
/* * The Java version used for compilation. */
43
- val jvmCompilerVersion = versionCatalog.findJvmVersion(" jvmCompiler" )
43
+ val jvmCompilerVersion: Provider < JavaLanguageVersion > = versionCatalog.findJvmVersion(" jvmCompiler" )
44
44
45
45
46
46
// region configure Java compiler
Original file line number Diff line number Diff line change @@ -3,18 +3,15 @@ package utils
3
3
import org.gradle.api.provider.Provider
4
4
import org.gradle.jvm.toolchain.JavaLanguageVersion
5
5
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
6
- import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
7
6
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
8
7
9
8
/* * Convert a Gradle [JavaLanguageVersion] to a Kotlin [JvmTarget]. */
10
9
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())
14
11
}
15
12
16
13
internal fun Provider<JavaLanguageVersion>.jvmTarget (): Provider <JvmTarget > =
17
- map { it.jvmTarget( ) }
14
+ map { JvmTarget .fromTarget( it.asInt().toString() ) }
18
15
19
16
internal fun Provider<JavaLanguageVersion>.asInt (): Provider <Int > =
20
17
map { it.asInt() }
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ arrow = "2.0.1"
32
32
33
33
# ## Java compilation ###
34
34
# Kotest's minimum supported Java version.
35
- jvmMinTarget = " 8 "
35
+ jvmMinTarget = " 11 "
36
36
# Kotest's maximum supported Java version. (Must be >= jvmMinTarget.)
37
37
jvmMaxTarget = " 21"
38
38
# JDK used to compile Kotest. (Must be >= jvmMaxTarget.)
Original file line number Diff line number Diff line change @@ -7,15 +7,15 @@ kotlin {
7
7
8
8
sourceSets {
9
9
10
- val jvmMain by getting {
10
+ jvmMain {
11
11
dependencies {
12
12
implementation(kotlin(" reflect" ))
13
13
implementation(projects.kotestFramework.kotestFrameworkEngine)
14
14
implementation(projects.kotestCommon)
15
15
}
16
16
}
17
17
18
- val jvmTest by getting {
18
+ jvmTest {
19
19
dependencies {
20
20
implementation(projects.kotestAssertions.kotestAssertionsCore)
21
21
implementation(libs.kotlinx.coroutines.core)
@@ -24,18 +24,3 @@ kotlin {
24
24
}
25
25
}
26
26
}
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
- }
Original file line number Diff line number Diff line change @@ -87,13 +87,13 @@ gradlePlugin {
87
87
tasks.withType<KotlinCompile >().configureEach {
88
88
kotlin {
89
89
compilerOptions {
90
- jvmTarget.set(JvmTarget .JVM_1_8 )
90
+ jvmTarget.set(JvmTarget .JVM_11 )
91
91
}
92
92
}
93
93
}
94
94
95
95
tasks.withType<JavaCompile >().configureEach {
96
- options.release.set(8 )
96
+ options.release.set(11 )
97
97
}
98
98
99
99
val updateKotestPluginConstants by tasks.registering {
Original file line number Diff line number Diff line change @@ -60,11 +60,11 @@ gradlePlugin {
60
60
tasks.withType<KotlinCompile >().configureEach {
61
61
kotlin {
62
62
compilerOptions {
63
- jvmTarget.set(JvmTarget .JVM_1_8 )
63
+ jvmTarget.set(JvmTarget .JVM_11 )
64
64
}
65
65
}
66
66
}
67
67
68
68
tasks.withType<JavaCompile >().configureEach {
69
- options.release.set(8 )
69
+ options.release.set(11 )
70
70
}
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ dependencyResolutionManagement {
44
44
45
45
plugins {
46
46
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"
48
48
}
49
49
50
50
include(
You can’t perform that action at this time.
0 commit comments