[merge] Use Java 11 again

Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
This commit is contained in:
SpiritCroc 2022-01-29 10:35:52 +01:00
parent dc42d7e8d7
commit beb2b1e8a0
6 changed files with 5 additions and 8 deletions

View File

@ -37,7 +37,7 @@ android {
targetCompatibility versions.targetCompat targetCompatibility versions.targetCompat
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '11'
} }
buildFeatures { buildFeatures {

View File

@ -3,6 +3,3 @@ apply plugin: 'java-library'
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
} }
sourceCompatibility = "8"
targetCompatibility = "8"

View File

@ -41,7 +41,7 @@ android {
targetCompatibility versions.targetCompat targetCompatibility versions.targetCompat
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '11'
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true

View File

@ -27,7 +27,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
} }

View File

@ -72,7 +72,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
sourceSets { sourceSets {

View File

@ -296,7 +296,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
freeCompilerArgs += [ freeCompilerArgs += [
"-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.RequiresOptIn",
// Fixes false positive "This is an internal Mavericks API. It is not intended for external use." // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."