test

toasterofbread · toasterofbread · commit ec8a8202bf02 · 2025-03-12T14:20:12.000Z
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -23,8 +23,7 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: |
-          22
-          21
+          23
 
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v3
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -127,14 +127,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_22
-        targetCompatibility = JavaVersion.VERSION_22
+        sourceCompatibility = JavaVersion.VERSION_23
+        targetCompatibility = JavaVersion.VERSION_23
         isCoreLibraryDesugaringEnabled = true
     }
 
     kotlin {
         jvmToolchain {
-            version = "17"
+            version = "23"
         }
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -14,5 +14,5 @@ dependencies {
 }
 
 tasks.withType(JavaCompile::class) {
-    options.release.set(21)
+    options.release.set(23)
 }
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -47,7 +47,7 @@ fun getString(key: String): String {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(23)
 
     jvm()
     sourceSets {
diff --git a/gradle.properties b/gradle.properties
@@ -22,9 +22,7 @@ android.suppressUnsupportedCompileSdk=34,35
 org.jetbrains.compose.experimental.wasm.enabled=true
 
 # Plugin versions
-kotlin.version=2.1.0
-agp.version=8.4.1
+kotlin.version=2.1.10
+agp.version=8.8.2
 compose.version=1.8.0-alpha01
 sqldelight.version=2.0.2
-
-org.gradle.java.installations.fromEnv=JAVA_HOME_21_X64,JAVA_HOME_22_X64
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jul 19 17:43:19 GMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -189,8 +189,8 @@ android {
     namespace = "com.toasterofbread.spmp.shared"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_22
-        targetCompatibility = JavaVersion.VERSION_22
+        sourceCompatibility = JavaVersion.VERSION_23
+        targetCompatibility = JavaVersion.VERSION_23
     }
 
     sourceSets.getByName("main") {

Original file line number	Diff line number	Diff line change
`@@ -127,14 +127,14 @@ android {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`compileOptions {`
`130`		`- sourceCompatibility = JavaVersion.VERSION_22`
`131`		`- targetCompatibility = JavaVersion.VERSION_22`
	`130`	`+ sourceCompatibility = JavaVersion.VERSION_23`
	`131`	`+ targetCompatibility = JavaVersion.VERSION_23`
`132`	`132`	`isCoreLibraryDesugaringEnabled = true`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`kotlin {`
`136`	`136`	`jvmToolchain {`
`137`		`- version = "17"`
	`137`	`+ version = "23"`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ dependencies {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`tasks.withType(JavaCompile::class) {`
`17`		`- options.release.set(21)`
	`17`	`+ options.release.set(23)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ fun getString(key: String): String {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`kotlin {`
`50`		`- jvmToolchain(21)`
	`50`	`+ jvmToolchain(23)`
`51`	`51`
`52`	`52`	`jvm()`
`53`	`53`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,8 @@ android {`
`189`	`189`	`namespace = "com.toasterofbread.spmp.shared"`
`190`	`190`
`191`	`191`	`compileOptions {`
`192`		`- sourceCompatibility = JavaVersion.VERSION_22`
`193`		`- targetCompatibility = JavaVersion.VERSION_22`
	`192`	`+ sourceCompatibility = JavaVersion.VERSION_23`
	`193`	`+ targetCompatibility = JavaVersion.VERSION_23`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`sourceSets.getByName("main") {`