Merge 70b344bbbd into 2b900fe982

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Install flutter
         uses: subosito/flutter-action@v2

android/app/build.gradle

@@ -28,15 +28,6 @@ android {
 
     compileSdkVersion 34
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -72,6 +63,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 flutter {
     source '../..'
 }

android/settings.gradle

@@ -17,6 +17,7 @@ pluginManagement {
 }
 
 plugins {
+    id "org.gradle.toolchains.foojay-resolver-convention" version "0.8.0"
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.6.1' apply false
     id "org.jetbrains.kotlin.android" version "2.0.20" apply false