Removing toolchain (#1526)

riggaroo · web-flow · commit 16bd3ccfd973 · 2025-02-13T10:29:45.000Z
diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts
@@ -68,15 +68,15 @@ android {
             isDebuggable = false
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         compose = true
         // Disable unused AGP features
diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts
@@ -59,6 +59,9 @@ android {
                     "proguard-rules.pro")
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -77,10 +80,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
-
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts
@@ -23,15 +23,16 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
     implementation(projects.core.domain)
 
diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts
@@ -25,15 +25,16 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
     coreLibraryDesugaring(libs.core.jdk.desugaring)
     implementation(projects.core.data)
diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts
@@ -24,7 +24,9 @@ android {
         compose = true
         buildConfig = true
     }
-
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -36,9 +38,6 @@ android {
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
 
 dependencies {
 
diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts
@@ -61,6 +61,9 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -81,9 +84,7 @@ android {
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 
 dependencies {
     implementation(libs.androidx.core.ktx)
diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle
@@ -54,6 +54,7 @@ android {
             includeAndroidResources true
         }
     }
+    
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
@@ -62,16 +63,15 @@ android {
     buildFeatures {
         compose true
     }
+    
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
             excludes += "rome-utils-" + libs.rometools.rome.get().version + ".jar"
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
 
 
diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts
@@ -61,6 +61,9 @@ android {
         }
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -79,9 +82,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts
@@ -73,13 +73,14 @@ android {
         }
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions { jvmTarget = "17" }
-
     buildFeatures {
         compose = true
     }
diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts
@@ -93,9 +93,6 @@ android {
         compose = true
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
 
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)

Original file line number	Diff line number	Diff line change
`@@ -68,15 +68,15 @@ android {`
`68`	`68`	`isDebuggable = false`
`69`	`69`	`}`
`70`	`70`	`}`
	`71`	`+ kotlinOptions {`
	`72`	`+ jvmTarget = "17"`
	`73`	`+ }`
`71`	`74`
`72`	`75`	`compileOptions {`
`73`	`76`	`isCoreLibraryDesugaringEnabled = true`
`74`	`77`	`sourceCompatibility = JavaVersion.VERSION_17`
`75`	`78`	`targetCompatibility = JavaVersion.VERSION_17`
`76`	`79`	`}`
`77`		`- kotlinOptions {`
`78`		`- jvmTarget = "17"`
`79`		`- }`
`80`	`80`	`buildFeatures {`
`81`	`81`	`compose = true`
`82`	`82`	`// Disable unused AGP features`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ android {`
`59`	`59`	`"proguard-rules.pro")`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ kotlinOptions {`
	`63`	`+ jvmTarget = "17"`
	`64`	`+ }`
`62`	`65`
`63`	`66`	`compileOptions {`
`64`	`67`	`sourceCompatibility = JavaVersion.VERSION_17`
`@@ -77,10 +80,6 @@ android {`
`77`	`80`	`}`
`78`	`81`	`}`
`79`	`82`
`80`		`-kotlin {`
`81`		`- jvmToolchain(17)`
`82`		`-}`
`83`		`-`
`84`	`83`	`dependencies {`
`85`	`84`	`val composeBom = platform(libs.androidx.compose.bom)`
`86`	`85`	`implementation(composeBom)`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,16 @@ android {`
`23`	`23`	`)`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+ kotlinOptions {`
	`27`	`+ jvmTarget = "17"`
	`28`	`+ }`
`26`	`29`	`compileOptions {`
`27`	`30`	`isCoreLibraryDesugaringEnabled = true`
`28`	`31`	`sourceCompatibility = JavaVersion.VERSION_17`
`29`	`32`	`targetCompatibility = JavaVersion.VERSION_17`
`30`	`33`	`}`
`31`	`34`	`}`
`32`		`-kotlin {`
`33`		`- jvmToolchain(17)`
`34`		`-}`
	`35`	`+`
`35`	`36`	`dependencies {`
`36`	`37`	`implementation(projects.core.domain)`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,16 @@ android {`
`25`	`25`	`)`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+ kotlinOptions {`
	`29`	`+ jvmTarget = "17"`
	`30`	`+ }`
`28`	`31`	`compileOptions {`
`29`	`32`	`isCoreLibraryDesugaringEnabled = true`
`30`	`33`	`sourceCompatibility = JavaVersion.VERSION_17`
`31`	`34`	`targetCompatibility = JavaVersion.VERSION_17`
`32`	`35`	`}`
`33`	`36`	`}`
`34`		`-kotlin {`
`35`		`- jvmToolchain(17)`
`36`		`-}`
	`37`	`+`
`37`	`38`	`dependencies {`
`38`	`39`	`coreLibraryDesugaring(libs.core.jdk.desugaring)`
`39`	`40`	`implementation(projects.core.data)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ android {`
`24`	`24`	`compose = true`
`25`	`25`	`buildConfig = true`
`26`	`26`	`}`
`27`		`-`
	`27`	`+ kotlinOptions {`
	`28`	`+ jvmTarget = "17"`
	`29`	`+ }`
`28`	`30`	`compileOptions {`
`29`	`31`	`sourceCompatibility = JavaVersion.VERSION_17`
`30`	`32`	`targetCompatibility = JavaVersion.VERSION_17`
`@@ -36,9 +38,6 @@ android {`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
`39`		`-kotlin {`
`40`		`- jvmToolchain(17)`
`41`		`-}`
`42`	`41`
`43`	`42`	`dependencies {`
`44`	`43`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ android {`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`	`}`
	`64`	`+ kotlinOptions {`
	`65`	`+ jvmTarget = "17"`
	`66`	`+ }`
`64`	`67`
`65`	`68`	`compileOptions {`
`66`	`69`	`isCoreLibraryDesugaringEnabled = true`
`@@ -81,9 +84,7 @@ android {`
`81`	`84`	`}`
`82`	`85`	`}`
`83`	`86`	`}`
`84`		`-kotlin {`
`85`		`- jvmToolchain(17)`
`86`		`-}`
	`87`	`+`
`87`	`88`
`88`	`89`	`dependencies {`
`89`	`90`	`implementation(libs.androidx.core.ktx)`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ android {`
`54`	`54`	`includeAndroidResources true`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+`
`57`	`58`	`kotlinOptions {`
`58`	`59`	`jvmTarget = JavaVersion.VERSION_17.majorVersion`
`59`	`60`	`freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"`
`@@ -62,16 +63,15 @@ android {`
`62`	`63`	`buildFeatures {`
`63`	`64`	`compose true`
`64`	`65`	`}`
	`66`	`+`
`65`	`67`	`packagingOptions {`
`66`	`68`	`resources {`
`67`	`69`	`excludes += "/META-INF/{AL2.0,LGPL2.1}"`
`68`	`70`	`excludes += "rome-utils-" + libs.rometools.rome.get().version + ".jar"`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`	`}`
`72`		`-kotlin {`
`73`		`- jvmToolchain(17)`
`74`		`-}`
	`74`	`+`
`75`	`75`	`dependencies {`
`76`	`76`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,14 @@ android {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ kotlinOptions {`
	`77`	`+ jvmTarget = "17"`
	`78`	`+ }`
`76`	`79`	`compileOptions {`
`77`	`80`	`sourceCompatibility = JavaVersion.VERSION_17`
`78`	`81`	`targetCompatibility = JavaVersion.VERSION_17`
`79`	`82`	`}`
`80`	`83`
`81`		`- kotlinOptions { jvmTarget = "17" }`
`82`		`-`
`83`	`84`	`buildFeatures {`
`84`	`85`	`compose = true`
`85`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,6 @@ android {`
`93`	`93`	`compose = true`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`-kotlin {`
`97`		`- jvmToolchain(17)`
`98`		`-}`
`99`	`96`
`100`	`97`	`dependencies {`
`101`	`98`	`val composeBom = platform(libs.androidx.compose.bom)`