Merge branch 'dev'

anonvector · anonvector · commit d848eddf8793 · 2026-03-10T01:36:02.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,11 +19,11 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '21'
+          distribution: 'jetbrains'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,7 +12,7 @@ pluginManagement {
     }
 }
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 val localProps = java.util.Properties()
 val localPropsFile = File(rootDir, "local.properties")

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ pluginManagement {`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`plugins {`
`15`		`- id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
	`15`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"`
`16`	`16`	`}`
`17`	`17`	`val localProps = java.util.Properties()`
`18`	`18`	`val localPropsFile = File(rootDir, "local.properties")`