Skip to content

Commit bd8af24

Browse files
authored
feat: Build the extension and the plugin with Java 11 (#66) (#67)
1 parent 9fdf04a commit bd8af24

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
java {
1919
toolchain {
20-
languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmToolchain.get()))
20+
languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmToolchainMin.get()))
2121
}
2222
}
2323

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ gradlePluginPublish = "1.2.1"
1111
guava = "33.2.0-jre"
1212
junit4 = "4.13.2"
1313
junit5 = "5.10.2"
14+
jvmToolchainMin = "11"
1415
jvmToolchain = "17"
1516
kotlin = "1.9.24"
1617
kover = "0.8.0"
1718
robolectric = "4.12.1"
18-
robolectricAndroidAll = "14-robolectric-10818077"
19+
robolectricAndroidAll = "13-robolectric-9030017"
1920
robolectricExtensionGradlePlugin = "0.6.1"
2021
# Use when bom also added to the dependencies
2122
sources = "sources"
2223

2324
[libraries]
2425
androidGradle = { module = "com.android.tools.build:gradle", version.ref = "androidGradle" }
26+
androidGradleJdk11 = { module = "com.android.tools.build:gradle", version.require = "7.0.4" }
2527
androidxTestExtJunit = { module = "androidx.test.ext:junit", version.ref = "androidxTestExtJunit" }
2628
detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
2729
detektRulesLibraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" }

robolectric-extension-gradle-plugin/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildConfig {
1717
}
1818

1919
kotlin {
20-
jvmToolchain(libs.versions.jvmToolchain.get().toInteger())
20+
jvmToolchain(libs.versions.jvmToolchainMin.get().toInteger())
2121
}
2222

2323
detekt {
@@ -33,12 +33,12 @@ dependencies {
3333
detektPlugins(libs.detektFormatting)
3434
detektPlugins(libs.detektRulesLibraries)
3535
compileOnly(gradleApi())
36-
compileOnly(libs.androidGradle)
36+
compileOnly(libs.androidGradleJdk11)
3737
testImplementation(gradleTestKit())
3838
testImplementation(platform(libs.junit5Bom))
3939
testImplementation(libs.junit5JupiterApi)
4040
testImplementation(libs.kotlinTestJUnit5)
41-
testImplementation(libs.androidGradle)
41+
testImplementation(libs.androidGradleJdk11)
4242
testRuntimeOnly(libs.junit5JupiterEngine)
4343
}
4444

robolectric-extension-gradle-plugin/src/main/kotlin/tech/apter/robolectric/junit/jupiter/gradle/plugin/RobolectricJUnitJupiterGradlePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class RobolectricJUnitJupiterGradlePlugin : Plugin<Project> {
5252
}
5353

5454
private fun Project.enableIncludeAndroidResources() {
55-
val androidExtension = extensions.findByName("android") as? CommonExtension<*, *, *, *, *, *>
55+
val androidExtension = extensions.findByName("android") as? CommonExtension<*, *, *, *>
5656
@Suppress("UnstableApiUsage")
5757
androidExtension?.testOptions?.unitTests?.isIncludeAndroidResources = true
5858
}

robolectric-extension/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ configurations.configureEach { configuration ->
1717
}
1818

1919
kotlin {
20-
jvmToolchain(libs.versions.jvmToolchain.get().toInteger())
20+
jvmToolchain(libs.versions.jvmToolchainMin.get().toInteger())
2121
}
2222

2323
robolectricJUnitJupiter {

robolectric-extension/src/test/kotlin/tech/apter/junit/jupiter/robolectric/internal/JUnit5RobolectricSandboxBuilderTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class JUnit5RobolectricSandboxBuilderTest {
2222
fun `Given the same arguments when call build twice then should return two different sandboxes with the same classloader `() {
2323
// Given
2424
val instrumentationConfiguration = createInstrumentationConfiguration()
25-
val runtimeSdk: Sdk = TestUtil.sdkCollection.getSdk(34)
26-
val compileSdk: Sdk = TestUtil.sdkCollection.getSdk(34)
25+
val runtimeSdk: Sdk = TestUtil.sdkCollection.getSdk(33)
26+
val compileSdk: Sdk = TestUtil.sdkCollection.getSdk(33)
2727
val resourcesMode: ResourcesMode = ResourcesMode.BINARY
2828
val sqLiteMode: SQLiteMode.Mode = SQLiteMode.Mode.NATIVE
2929

@@ -45,11 +45,11 @@ class JUnit5RobolectricSandboxBuilderTest {
4545
fun `Given different arguments when call build twice then should return two different sandboxes with different classloaders`() {
4646
// Given
4747
val instrumentationConfiguration1 = createInstrumentationConfiguration()
48-
val runtimeSdk1: Sdk = TestUtil.sdkCollection.getSdk(34)
49-
val compileSdk1: Sdk = TestUtil.sdkCollection.getSdk(34)
48+
val runtimeSdk1: Sdk = TestUtil.sdkCollection.getSdk(33)
49+
val compileSdk1: Sdk = TestUtil.sdkCollection.getSdk(33)
5050
val instrumentationConfiguration2 = createInstrumentationConfiguration()
51-
val runtimeSdk2: Sdk = TestUtil.sdkCollection.getSdk(33)
52-
val compileSdk2: Sdk = TestUtil.sdkCollection.getSdk(33)
51+
val runtimeSdk2: Sdk = TestUtil.sdkCollection.getSdk(32)
52+
val compileSdk2: Sdk = TestUtil.sdkCollection.getSdk(32)
5353
val resourcesMode: ResourcesMode = ResourcesMode.BINARY
5454
val sqLiteMode: SQLiteMode.Mode = SQLiteMode.Mode.NATIVE
5555

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
sdk=34
1+
sdk=33
2+
packageName=tech.apter.junit.jupiter.robolectric

0 commit comments

Comments
 (0)