Ensure compatibility with Java 21. (#759)

* Ensure compatibility with Java 21. * Switch back to using the NDK version provided by flutter.
jonbhanson · Feb 23, 2025 · 9e08acf · 9e08acf
1 parent 2b36513
commit 9e08acf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [2.4.6] - ()
+
+- Ensure compatibility with Java 21.
+
 ## [2.4.5] - (2025-Feb-16)
 - Updated readme.  Closes [#765](https://github.com/jonbhanson/flutter_native_splash/issues/765).  Thanks [Jason](https://github.com/kingdomseed) for [PR #767](https://github.com/jonbhanson/flutter_native_splash/pull/767).
 - Fixes for Swift Package Manager.  Thanks [Dimas](https://github.com/dinyok) for [PR #762](https://github.com/jonbhanson/flutter_native_splash/pull/762) and [Maarten](https://github.com/lazytesting) for [PR #760](https://github.com/jonbhanson/flutter_native_splash/pull/760).

diff --git a/android/build.gradle b/android/build.gradle
@@ -29,8 +29,8 @@ android {
     compileSdkVersion 31
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     defaultConfig {

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     defaultConfig {

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
+    id "com.android.application" version '8.7.3' apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }