azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add simple test of KAPT working under JDK 16

Browse Source
This commit is contained in:
Andrey Uskov
2021-10-07 22:47:30 +03:00
committed by TeamCityServer
parent 52e45062cf
commit 4a99f04b41
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/JvmToolchain.kt
+1
View File
@@ -21,6 +21,7 @@ enum class JdkMajorVersion(
JDK_9(9, overrideMajorVersion = 11),
JDK_10(10, mandatory = false, overrideMajorVersion = 11),
JDK_11(11, mandatory = false),
JDK_16(16, mandatory = false),
JDK_17(17, mandatory = false);
fun isMandatory(): Boolean = mandatory
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+2
View File
@@ -217,6 +217,7 @@ tasks.withType<Test> {
val jdk9Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_9).map { it.metadata.installationPath.asFile.absolutePath }
val jdk10Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_10).map { it.metadata.installationPath.asFile.absolutePath }
val jdk11Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_11).map { it.metadata.installationPath.asFile.absolutePath }
val jdk16Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_16).map { it.metadata.installationPath.asFile.absolutePath }
val mavenLocalRepo = project.providers.systemProperty("maven.repo.local").forUseAtConfigurationTime().orNull
// Query required JDKs paths only on execution phase to avoid triggering auto-download on project configuration phase
@@ -224,6 +225,7 @@ tasks.withType<Test> {
systemProperty("jdk9Home", jdk9Provider.get())
systemProperty("jdk10Home", jdk10Provider.get())
systemProperty("jdk11Home", jdk11Provider.get())
systemProperty("jdk16Home", jdk16Provider.get())
if (mavenLocalRepo != null) {
systemProperty("maven.repo.local", mavenLocalRepo)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+15 -13
View File
@@ -73,13 +73,13 @@ open class Kapt3WorkersIT : Kapt3IT() {
}
}
@Test
fun testSimpleWithJdk10() {
val javaHome = File(System.getProperty("jdk10Home")!!)
Assume.assumeTrue("JDK 10 isn't available", javaHome.isDirectory)
fun doTestSimpleWithCustomJdk(jdkVersion: Int, minumalGradleVersion: String = GradleVersionRequired.OLDEST_SUPPORTED) {
val javaHome = File(System.getProperty("jdk${jdkVersion}Home")!!)
Assume.assumeTrue("JDK $jdkVersion isn't available", javaHome.isDirectory)
val options = defaultBuildOptions().copy(javaHome = javaHome)
val project = Project("simple", directoryPrefix = "kapt2")
val project =
Project("simple", directoryPrefix = "kapt2", gradleVersionRequirement = GradleVersionRequired.AtLeast(minumalGradleVersion))
project.build("build", options = options) {
assertSuccessful()
assertKaptSuccessful()
@@ -90,15 +90,17 @@ open class Kapt3WorkersIT : Kapt3IT() {
@Test
fun testSimpleWithJdk11() {
val javaHome = File(System.getProperty("jdk11Home")!!)
Assume.assumeTrue("JDK 11 isn't available", javaHome.isDirectory)
val options = defaultBuildOptions().copy(javaHome = javaHome)
doTestSimpleWithCustomJdk(11)
}
val project = Project("simple", directoryPrefix = "kapt2")
project.build("build", options = options) {
assertSuccessful()
assertKaptSuccessful()
}
@Test
fun testSimpleWithJdk10() {
doTestSimpleWithCustomJdk(10)
}
@Test
fun testSimpleWithJdk16() {
doTestSimpleWithCustomJdk(16, "7.0")
}
}