Enable bytecode desugaring in Android test projects
After advancing stdlib jvmTarget to 1.8.
This commit is contained in:
committed by
Space
parent
45abea5b0a
commit
9134b81863
+6
@@ -18,6 +18,12 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
flavorDimensions "color"
|
flavorDimensions "color"
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
|
|||||||
+6
@@ -13,6 +13,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -13,6 +13,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -24,6 +24,12 @@ android {
|
|||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -12,6 +12,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
buildTypes.release.minifyEnabled = false
|
buildTypes.release.minifyEnabled = false
|
||||||
lintOptions.abortOnError = false
|
lintOptions.abortOnError = false
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -11,6 +11,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
buildTypes.release.minifyEnabled = false
|
buildTypes.release.minifyEnabled = false
|
||||||
lintOptions.abortOnError = false
|
lintOptions.abortOnError = false
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -11,6 +11,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
buildTypes.release.minifyEnabled = false
|
buildTypes.release.minifyEnabled = false
|
||||||
lintOptions.abortOnError = false
|
lintOptions.abortOnError = false
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -33,6 +33,12 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -13,6 +13,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -20,6 +20,12 @@ android {
|
|||||||
targetSdkVersion 22
|
targetSdkVersion 22
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
flavorDimensions "myFlavor"
|
flavorDimensions "myFlavor"
|
||||||
productFlavors {
|
productFlavors {
|
||||||
flavor1 {
|
flavor1 {
|
||||||
|
|||||||
+6
@@ -20,6 +20,12 @@ android {
|
|||||||
targetSdkVersion 22
|
targetSdkVersion 22
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
flavorDimensions "myFlavor"
|
flavorDimensions "myFlavor"
|
||||||
productFlavors {
|
productFlavors {
|
||||||
flavor1 { dimension "myFlavor" }
|
flavor1 { dimension "myFlavor" }
|
||||||
|
|||||||
+6
@@ -20,6 +20,12 @@ android {
|
|||||||
testApplicationId 'org.jetbrains.kotlin.gradle.test.androidalfa'
|
testApplicationId 'org.jetbrains.kotlin.gradle.test.androidalfa'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
targetProjectPath ':Android'
|
targetProjectPath ':Android'
|
||||||
if (VersionNumber.parse(android_tools_version) < VersionNumber.parse("3.0.0-alpha1")) {
|
if (VersionNumber.parse(android_tools_version) < VersionNumber.parse("3.0.0-alpha1")) {
|
||||||
targetVariant 'flavor1Debug'
|
targetVariant 'flavor1Debug'
|
||||||
|
|||||||
+6
@@ -14,6 +14,12 @@ android {
|
|||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
|
javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
+6
@@ -11,6 +11,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
+6
@@ -29,6 +29,12 @@ android {
|
|||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
dataBinding {
|
dataBinding {
|
||||||
enabled true
|
enabled true
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -13,6 +13,12 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer.
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
|||||||
Reference in New Issue
Block a user