Remove jvmToolchain arg

simolus3 · simolus3 · commit de6113032790 · 2025-11-23T20:52:22.000-08:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
         distribution: 'temurin'
     - name: Set up JDK 25
       uses: actions/setup-java@v5
-      if: runner.os == 'Windows' && runner.arch != 'ARM64'
+      if: runner.os == 'Windows' && runner.arch == 'ARM64'
       with:
         java-version: '25-ea'
         distribution: 'temurin'
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -44,9 +44,6 @@ android {
                 .get()
                 .toInt()
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 dokka {
diff --git a/demos/supabase-todolist/androidApp/build.gradle.kts b/demos/supabase-todolist/androidApp/build.gradle.kts
@@ -31,7 +31,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(libs.versions.java.get().toInt())
-    }
 }
diff --git a/demos/supabase-todolist/shared/build.gradle.kts b/demos/supabase-todolist/shared/build.gradle.kts
@@ -89,13 +89,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        jvmToolchain(
-            libs.versions.java
-                .get()
-                .toInt(),
-        )
-    }
 }
 
 val localProperties =
diff --git a/integrations/room/build.gradle.kts b/integrations/room/build.gradle.kts
@@ -90,9 +90,6 @@ android {
                 .get()
                 .toInt()
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 dokka {
diff --git a/integrations/sqldelight/build.gradle.kts b/integrations/sqldelight/build.gradle.kts
@@ -60,9 +60,6 @@ android {
                 .get()
                 .toInt()
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 dokka {
diff --git a/integrations/supabase/build.gradle.kts b/integrations/supabase/build.gradle.kts
@@ -69,9 +69,6 @@ android {
                 .get()
                 .toInt()
     }
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 dokka {

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ android {`
`44`	`44`	`.get()`
`45`	`45`	`.toInt()`
`46`	`46`	`}`
`47`		`- kotlin {`
`48`		`- jvmToolchain(17)`
`49`		`- }`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`dokka {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,4 @@ android {`
`31`	`31`	`sourceCompatibility = JavaVersion.VERSION_17`
`32`	`32`	`targetCompatibility = JavaVersion.VERSION_17`
`33`	`33`	`}`
`34`		`- kotlin {`
`35`		`- jvmToolchain(libs.versions.java.get().toInt())`
`36`		`- }`
`37`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,6 @@ android {`
`89`	`89`	`sourceCompatibility = JavaVersion.VERSION_17`
`90`	`90`	`targetCompatibility = JavaVersion.VERSION_17`
`91`	`91`	`}`
`92`		`- kotlin {`
`93`		`- jvmToolchain(`
`94`		`- libs.versions.java`
`95`		`- .get()`
`96`		`- .toInt(),`
`97`		`- )`
`98`		`- }`
`99`	`92`	`}`
`100`	`93`
`101`	`94`	`val localProperties =`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,6 @@ android {`
`90`	`90`	`.get()`
`91`	`91`	`.toInt()`
`92`	`92`	`}`
`93`		`- kotlin {`
`94`		`- jvmToolchain(17)`
`95`		`- }`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`dokka {`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,6 @@ android {`
`60`	`60`	`.get()`
`61`	`61`	`.toInt()`
`62`	`62`	`}`
`63`		`- kotlin {`
`64`		`- jvmToolchain(17)`
`65`		`- }`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`dokka {`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,6 @@ android {`
`69`	`69`	`.get()`
`70`	`70`	`.toInt()`
`71`	`71`	`}`
`72`		`- kotlin {`
`73`		`- jvmToolchain(17)`
`74`		`- }`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`dokka {`