Skip to content

Commit d454570

Browse files
committed
Remove Java 8 for building the project.
Java 8 is really old and unsupported on macOS ARM64. This commit bumps remaining Java 8 usages to Java 11. Source/target compatibility is still Java 8.
1 parent 134394c commit d454570

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

conventions/src/main/kotlin/ribs.kotlin-android-library-conventions.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
}
2525

2626
kotlin {
27-
jvmToolchain(8)
27+
jvmToolchain(11)
2828
}
2929

3030
android {
@@ -40,6 +40,10 @@ android {
4040
targetCompatibility = JavaVersion.VERSION_1_8
4141
}
4242

43+
kotlinOptions {
44+
jvmTarget = "1.8"
45+
}
46+
4347
buildFeatures {
4448
buildConfig = false
4549
}

conventions/src/main/kotlin/ribs.kotlin-library-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
}
2020

2121
kotlin {
22-
jvmToolchain(8)
22+
jvmToolchain(11)
2323
explicitApi()
2424
}
2525

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ motif = "0.3.4"
4343
percent = "1.0.0"
4444
reactivestreams = "1.0.0"
4545
rxandroid2 = "2.1.1"
46-
rxbinding = "2.0.0"
46+
rxbinding = "2.2.0"
4747
rxjava2 = "2.2.8"
4848
rxkotlin = "2.2.0"
4949
rxrelay2 = "2.1.0"

libraries/rib-debug-utils/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ kotlin {
2828
}
2929
}
3030
explicitApi()
31-
jvmToolchain(8)
31+
jvmToolchain(11)
3232
}
3333

3434
dependencies {

0 commit comments

Comments
 (0)