Set java version to gradle daemon and fixed vendor for executors project

dkrasnoff · dkrasnoff · commit 8c5c31181a81 · 2024-09-20T14:27:32.000+02:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -169,6 +169,10 @@ tasks.named<Copy>("processResources") {
 tasks.withType<Test> {
     dependsOn(rootProject.the<NodeJsRootExtension>().nodeJsSetupTaskProvider)
     useJUnitPlatform()
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.AMAZON)
+    })
     val executablePath = rootProject.the<NodeJsRootExtension>().requireConfigured().executable
     doFirst {
         this@withType.environment("kotlin.wasm.node.path", executablePath)
diff --git a/executors/build.gradle.kts b/executors/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 kotlin.jvmToolchain {
   languageVersion.set(JavaLanguageVersion.of(17))
-  vendor.set(JvmVendorSpec.ADOPTIUM)
+  vendor.set(JvmVendorSpec.AMAZON)
 }
 
 dependencies {
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=17

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`
`5`	`5`	`kotlin.jvmToolchain {`
`6`	`6`	`languageVersion.set(JavaLanguageVersion.of(17))`
`7`		`- vendor.set(JvmVendorSpec.ADOPTIUM)`
	`7`	`+ vendor.set(JvmVendorSpec.AMAZON)`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#This file is generated by updateDaemonJvm`
	`2`	`+toolchainVersion=17`