* update jvmToolchain DSL

amostyaev · amostyaev · commit 065a39cd4b11 · 2025-12-17T11:50:34.000+03:00
diff --git a/01_firstapp/app/build.gradle.kts b/01_firstapp/app/build.gradle.kts
@@ -27,8 +27,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/02_resources/app/build.gradle.kts b/02_resources/app/build.gradle.kts
@@ -27,8 +27,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/03_constraintlayout/app/build.gradle.kts b/03_constraintlayout/app/build.gradle.kts
@@ -27,8 +27,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/04_events/app/build.gradle.kts b/04_events/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/05_mvvm/app/build.gradle.kts b/05_mvvm/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/06_recyclerview/diffutils/app/build.gradle.kts b/06_recyclerview/diffutils/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/06_recyclerview/manual/app/build.gradle.kts b/06_recyclerview/manual/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/06_recyclerview/recyclerview/app/build.gradle.kts b/06_recyclerview/recyclerview/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/07_crud/app/build.gradle.kts b/07_crud/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/08_material/app/build.gradle.kts b/08_material/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/09_navigation/app/build.gradle.kts b/09_navigation/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/10_storage/app/build.gradle.kts b/10_storage/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/11_fragments/app/build.gradle.kts b/11_fragments/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/12_sql/app/build.gradle.kts b/12_sql/app/build.gradle.kts
@@ -31,8 +31,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/13_room/app/build.gradle.kts b/13_room/app/build.gradle.kts
@@ -32,8 +32,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 
diff --git a/14_pushes/app/build.gradle.kts b/14_pushes/app/build.gradle.kts
@@ -34,8 +34,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(11)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ android {`
`27`	`27`	`sourceCompatibility = JavaVersion.VERSION_11`
`28`	`28`	`targetCompatibility = JavaVersion.VERSION_11`
`29`	`29`	`}`
`30`		`- kotlinOptions {`
`31`		`- jvmTarget = "11"`
	`30`	`+ kotlin {`
	`31`	`+ jvmToolchain(11)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ android {`
`31`	`31`	`sourceCompatibility = JavaVersion.VERSION_11`
`32`	`32`	`targetCompatibility = JavaVersion.VERSION_11`
`33`	`33`	`}`
`34`		`- kotlinOptions {`
`35`		`- jvmTarget = "11"`
	`34`	`+ kotlin {`
	`35`	`+ jvmToolchain(11)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`