Skip to content

Commit 8f3203f

Browse files
authored
Merge pull request #16 from plaidev/feature/update-jdk-update
feat jdk error
2 parents 58a5cb6 + 4e4f4c4 commit 8f3203f

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

plugin/android/build.gradle

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,17 @@ afterEvaluate {
6161
android {
6262
compileSdkVersion safeExtGet("compileSdkVersion", 33)
6363

64-
compileOptions {
65-
sourceCompatibility JavaVersion.VERSION_11
66-
targetCompatibility JavaVersion.VERSION_11
67-
}
64+
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
65+
if (agpVersion.tokenize('.')[0].toInteger() < 8) {
66+
compileOptions {
67+
sourceCompatibility JavaVersion.VERSION_11
68+
targetCompatibility JavaVersion.VERSION_11
69+
}
6870

69-
kotlinOptions {
70-
jvmTarget = JavaVersion.VERSION_11.majorVersion
71+
kotlinOptions {
72+
jvmTarget = JavaVersion.VERSION_11.majorVersion
73+
}
7174
}
72-
7375
defaultConfig {
7476
minSdkVersion safeExtGet("minSdkVersion", 21)
7577
targetSdkVersion safeExtGet("targetSdkVersion", 33)
@@ -81,6 +83,16 @@ android {
8183
}
8284
}
8385

86+
kotlin {
87+
jvmToolchain(11)
88+
}
89+
90+
java {
91+
toolchain {
92+
languageVersion.set(JavaLanguageVersion.of(11))
93+
}
94+
}
95+
8496
repositories {
8597
mavenCentral()
8698
}

plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "karte-expo-plugin",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "Config plugin for karte-react-native package",
55
"main": "build/withKarte.js",
66
"types": "build/withKarte.d.ts",

0 commit comments

Comments
 (0)