Merge pull request #1582 from MarijnS95/icon-pack-JavaVersion

Add `JavaVersion` compatible to `icon-pack`
This commit is contained in:
Jérémy JAMET
2023-07-31 16:08:35 +02:00
committed by GitHub
3 changed files with 18 additions and 5 deletions

View File

@@ -22,7 +22,7 @@ android {
minifyEnabled false minifyEnabled false
} }
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path "src/main/jni/CMakeLists.txt" path "src/main/jni/CMakeLists.txt"
@@ -30,11 +30,12 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = "1.8"
} }
} }

View File

@@ -18,13 +18,16 @@ android {
minifyEnabled false minifyEnabled false
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = "1.8"
} }
testOptions { testOptions {
unitTests { unitTests {
includeAndroidResources = true includeAndroidResources = true

View File

@@ -10,6 +10,15 @@ android {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 33 targetSdkVersion 33
} }
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
} }
dependencies { dependencies {