Skip to content

Commit cf08e6f

Browse files
committed
Update Kotlin stdlib to JDK 8
1 parent 9ad8c46 commit cf08e6f

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ext {
1212
androidGradlePlugin: "com.android.tools.build:gradle:4.1.2",
1313

1414
// Dependencies
15-
kotlinStdlibJdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${projectVersion.kotlin}",
15+
kotlinStdlibJdk8 : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${projectVersion.kotlin}",
1616
appCompat : "androidx.appcompat:appcompat:1.2.0",
1717

1818
// Test dependencies

plugin/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,12 @@ test {
8585
dependencies {
8686
compileOnly gradleApi()
8787
implementation projectDependency.androidGradlePlugin
88-
implementation projectDependency.kotlinStdlibJdk7
88+
implementation projectDependency.kotlinStdlibJdk8
8989

90-
testImplementation projectDependency.kotlinStdlibJdk7
90+
testImplementation projectDependency.kotlinStdlibJdk8
9191
testImplementation projectDependency.kotlinTest
9292
testImplementation gradleTestKit()
9393
testImplementation projectDependency.junit
9494
testImplementation projectDependency.truth
9595
testImplementation projectDependency.commonsCsv
9696
}
97-
98-
// apply from: rootProject.file('publish.gradle')

plugin/src/test/test-fixtures/multi-module/app/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,21 @@ android {
3030
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3131
}
3232
}
33+
34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
39+
kotlinOptions {
40+
jvmTarget = "1.8"
41+
}
3342
}
3443

3544
dependencies {
3645
implementation project(":library_android")
3746

38-
implementation projectDependency.kotlinStdlibJdk7
47+
implementation projectDependency.kotlinStdlibJdk8
3948
implementation projectDependency.appCompat
4049

4150
testImplementation projectDependency.junit

plugin/src/test/test-fixtures/multi-module/library_android/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,19 @@ android {
3535
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3636
}
3737
}
38+
39+
compileOptions {
40+
sourceCompatibility JavaVersion.VERSION_1_8
41+
targetCompatibility JavaVersion.VERSION_1_8
42+
}
43+
44+
kotlinOptions {
45+
jvmTarget = "1.8"
46+
}
3847
}
3948

4049
dependencies {
41-
implementation projectDependency.kotlinStdlibJdk7
50+
implementation projectDependency.kotlinStdlibJdk8
4251
implementation projectDependency.appCompat
4352

4453
testImplementation projectDependency.junit

0 commit comments

Comments
 (0)