Update TeamCity configuration

gradle · Oct 25, 2024 · c9339e7 · c9339e7
1 parent 2fd2324
commit c9339e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.teamcity/settings/GradleProfilerTest.kt b/.teamcity/settings/GradleProfilerTest.kt
@@ -10,9 +10,9 @@ open class GradleProfilerTest(os: Os, javaVersion: JavaVersion, arch: Arch = Arc
     gradleProfilerVcs()
 
     params {
-        // Java home must always use Java11
-        // since intellij-gradle-plugin is not compatible with Java8
-        javaHome(os, JavaVersion.OPENJDK_11)
+        // Java home must always use Java17
+        // since intellij-gradle-plugin requires Java17+
+        javaHome(os, JavaVersion.OPENJDK_17)
         androidHome(os)
     }
 

diff --git a/.teamcity/settings/extensions.kt b/.teamcity/settings/extensions.kt
@@ -17,7 +17,10 @@ fun BuildType.agentRequirement(os: Os, arch: Arch = Arch.AMD64) {
 fun toolchainConfiguration(os: Os) = listOf(
     "-Porg.gradle.java.installations.auto-detect=false",
     "-Porg.gradle.java.installations.auto-download=false",
-    """"-Porg.gradle.java.installations.paths=%${os.name}.java8.oracle.64bit%,%${os.name}.java11.openjdk.64bit%""""
+    """"-Porg.gradle.java.installations.paths=
+        |%${os.name}.java8.oracle.64bit%,
+        |%${os.name}.java11.openjdk.64bit%,
+        |%${os.name}.java17.openjdk.64bit%"""".trimMargin()
 ).joinToString(" ")
 
 fun ParametrizedWithType.javaHome(os: Os, javaVersion: JavaVersion) {
@@ -36,6 +39,7 @@ fun ParametrizedWithType.androidHome(os: Os) {
 enum class JavaVersion(val majorVersion: String, val vendor: String, private val javaHomePostfix: String) {
     ORACLE_JAVA_8("8", "oracle", "java8.oracle.64bit"),
     OPENJDK_11("11", "openjdk", "java11.openjdk.64bit");
+    OPENJDK_17("17", "openjdk", "java17.openjdk.64bit");
 
     fun javaHome(os: Os) = "%${os.name}.$javaHomePostfix%"
 }