Merge pull request #16 from plaidev/feature/update-jdk-update

feat jdk error
plaidev · Aug 16, 2024 · 8f3203f · 8f3203f
2 parents 58a5cb6 + 4e4f4c4
commit 8f3203f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle
@@ -61,15 +61,17 @@ afterEvaluate {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
-
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
@@ -81,6 +83,16 @@ android {
   }
 }
 
+kotlin {
+  jvmToolchain(11)
+}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
   mavenCentral()
 }

diff --git a/plugin/package.json b/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "karte-expo-plugin",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Config plugin for karte-react-native package",
   "main": "build/withKarte.js",
   "types": "build/withKarte.d.ts",