Skip to content

Commit 9cb222d

Browse files
committed
Use java8 compatible to fix build issues
Also enable multidex
1 parent 84c10aa commit 9cb222d

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

ui/espresso/AccessibilitySample/app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ android {
1111
versionName "1.0"
1212

1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14+
15+
multiDexEnabled true
1416
}
1517
lintOptions {
1618
abortOnError false
@@ -22,6 +24,10 @@ android {
2224
includeAndroidResources = true
2325
}
2426
}
27+
compileOptions {
28+
sourceCompatibility JavaVersion.VERSION_1_8
29+
targetCompatibility JavaVersion.VERSION_1_8
30+
}
2531
}
2632

2733
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -34,6 +40,7 @@ dependencies {
3440
// App dependencies
3541
implementation 'androidx.annotation:annotation:' + rootProject.androidxAnnotationVersion;
3642
implementation 'com.google.guava:guava:' + rootProject.guavaVersion
43+
implementation 'androidx.multidex:multidex:2.0.1'
3744

3845
// Testing-only dependencies
3946
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion

ui/espresso/AccessibilitySample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
google()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:4.0.1'
11+
classpath 'com.android.tools.build:gradle:4.1.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jan 06 11:50:52 PST 2021
1+
#Wed Jan 06 14:30:55 PST 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 commit comments

Comments
 (0)