Fix validation errors after updating TeamCity base image (#5587)

MatkovIvan · web-flow · commit 9ea4e7fb0880 · 2026-04-29T14:18:21.000+02:00
```
org.gradle.jvm.toolchain.internal.install.exceptions.ToolchainProvisioningException: Cannot find a Java installation on your machine (Linux 5.15.0-1084-aws amd64) matching: {languageVersion=17, vendor=any vendor, implementation=vendor-specific}. Some toolchain resolvers had internal failures: foojay (Requesting vendor list failed: {
  "result":[],
  "message":"There was an internal error and the pkg cache is currently be restored, please try again later"
}).
```

- Use `jvmTarget` instead of `jvmToolchain` to build the project without
JDK 17 installed (only with JDK 21)
- Update `org.gradle.toolchains.foojay-resolver-convention` to a stable
version

## Release Notes
N/A
diff --git a/ci/templates/maven-test-project/pom.xml b/ci/templates/maven-test-project/pom.xml
@@ -99,6 +99,11 @@
             <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.compose.runtime</groupId>
+            <artifactId>runtime-saveable-desktop</artifactId>
+            <version>${compose.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.compose.ui</groupId>
             <artifactId>ui-desktop</artifactId>
diff --git a/ci/templates/multiplatform-template/android/build.gradle.kts b/ci/templates/multiplatform-template/android/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -20,8 +23,11 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
+}
+
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
diff --git a/ci/templates/multiplatform-template/common/build.gradle.kts b/ci/templates/multiplatform-template/common/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
@@ -28,6 +31,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "com.myapplication.common"
@@ -39,9 +48,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
     sourceSets {
         named("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
diff --git a/ci/templates/multiplatform-template/settings.gradle.kts b/ci/templates/multiplatform-template/settings.gradle.kts
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 include(":common", ":android", ":desktop")
diff --git a/examples/chat/androidApp/build.gradle.kts b/examples/chat/androidApp/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -16,6 +19,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.chat"
@@ -30,7 +39,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/chat/settings.gradle.kts b/examples/chat/settings.gradle.kts
@@ -29,7 +29,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 rootProject.name = "chat-mpp"
diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts
@@ -1,5 +1,8 @@
 @file:Suppress("OPT_IN_IS_NOT_ENABLED")
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -85,6 +88,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.chat"
@@ -97,7 +106,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -16,6 +19,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.codeviewer"
@@ -30,7 +39,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/codeviewer/settings.gradle.kts b/examples/codeviewer/settings.gradle.kts
@@ -23,7 +23,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 rootProject.name = "codeviewer"
diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts
@@ -1,5 +1,8 @@
 @file:Suppress("OPT_IN_IS_NOT_ENABLED")
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -65,6 +68,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.codeviewer.common"
@@ -76,7 +85,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/graphics-2d/androidApp/build.gradle.kts b/examples/graphics-2d/androidApp/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -16,6 +19,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.graphics2d"
@@ -30,7 +39,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/graphics-2d/settings.gradle.kts b/examples/graphics-2d/settings.gradle.kts
@@ -22,7 +22,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 rootProject.name = "graphics-2d"
diff --git a/examples/graphics-2d/shared/build.gradle.kts b/examples/graphics-2d/shared/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
@@ -66,6 +68,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "org.jetbrains.Graphics2D"
@@ -78,7 +86,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/imageviewer/androidApp/build.gradle.kts b/examples/imageviewer/androidApp/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -17,6 +20,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "example.imageviewer"
@@ -31,9 +40,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 secrets {
diff --git a/examples/imageviewer/settings.gradle.kts b/examples/imageviewer/settings.gradle.kts
@@ -23,7 +23,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 rootProject.name = "imageviewer"
diff --git a/examples/imageviewer/shared/build.gradle.kts b/examples/imageviewer/shared/build.gradle.kts
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
@@ -92,6 +94,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 android {
     compileSdk = 35
     namespace = "example.imageviewer.shared"
@@ -105,7 +113,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -20,8 +23,11 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
+}
+
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
@@ -35,6 +38,12 @@ kotlin {
     }
 }
 
+tasks.withType<KotlinCompile>() {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 apollo {
     generateKotlinModels.set(true)
     customTypeMapping.putAll(mapOf("DateTime" to "java.util.Date"))
@@ -51,9 +60,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(17)
-    }
     sourceSets {
         named("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
diff --git a/examples/issues/settings.gradle.kts b/examples/issues/settings.gradle.kts
@@ -21,7 +21,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")
 }
 
 include(":common", ":android", ":desktop")
diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/jvm/build.gradle
diff --git a/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/mpp/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
	`3`	`+`
`1`	`4`	`plugins {`
`2`	`5`	`id("com.android.application")`
`3`	`6`	`kotlin("android")`
`@@ -20,8 +23,11 @@ android {`
`20`	`23`	`sourceCompatibility = JavaVersion.VERSION_17`
`21`	`24`	`targetCompatibility = JavaVersion.VERSION_17`
`22`	`25`	`}`
`23`		`- kotlin {`
`24`		`- jvmToolchain(17)`
	`26`	`+}`
	`27`	`+`
	`28`	`+tasks.withType<KotlinCompile>() {`
	`29`	`+ compilerOptions {`
	`30`	`+ jvmTarget.set(JvmTarget.JVM_17)`
`25`	`31`	`}`
`26`	`32`	`}`
`27`	`33`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencyResolutionManagement {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`plugins {`
`28`		`- id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")`
	`28`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`include(":common", ":android", ":desktop")`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ dependencyResolutionManagement {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`plugins {`
`32`		`- id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")`
	`32`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`rootProject.name = "chat-mpp"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ pluginManagement {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`plugins {`
`26`		`- id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")`
	`26`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0")`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`rootProject.name = "codeviewer"`