From d332f7b70d07d1f86d7571671bf1a1284080e0c4 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 18 Jun 2023 11:23:17 +0200 Subject: [PATCH 1/2] Remove forced objenesis resolution strategy The linked issue is marked as resolved, and not able to reproduce the mentioned compilation error. --- app/build.gradle.kts | 2 -- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0c6e3eeb9..3783928f5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -126,7 +126,5 @@ dependencies { configurations.configureEach { resolutionStrategy { force(libs.junit4) - // Temporary workaround for https://issuetracker.google.com/174733673 - force("org.objenesis:objenesis:2.6") } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 287b09cf5..ca955d754 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -49,8 +49,6 @@ class AndroidLibraryConventionPlugin : Plugin { configurations.configureEach { resolutionStrategy { force(libs.findLibrary("junit4").get()) - // Temporary workaround for https://issuetracker.google.com/174733673 - force("org.objenesis:objenesis:2.6") } } dependencies { From 0a3069a0d82de1fde29ef3f8ee5726babdd11a5a Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 18 Jun 2023 11:42:12 +0200 Subject: [PATCH 2/2] Remove forced junit resolution strategy By looking at the Gradle scan's dependency tab, junit 4.12 is already replaced by 4.13.2. There is no need to manually force this at the configuration level. --- app/build.gradle.kts | 7 ------- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 6 ------ 2 files changed, 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3783928f5..1d8383b00 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -121,10 +121,3 @@ dependencies { implementation(libs.androidx.profileinstaller) implementation(libs.coil.kt) } - -// androidx.test is forcing JUnit, 4.12. This forces it to use 4.13 -configurations.configureEach { - resolutionStrategy { - force(libs.junit4) - } -} diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index ca955d754..864034561 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -21,7 +21,6 @@ import com.google.samples.apps.nowinandroid.configureGradleManagedDevices import com.google.samples.apps.nowinandroid.configureKotlinAndroid import com.google.samples.apps.nowinandroid.configurePrintApksTask import com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTests -import com.google.samples.apps.nowinandroid.libs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure @@ -46,11 +45,6 @@ class AndroidLibraryConventionPlugin : Plugin { configurePrintApksTask(this) disableUnnecessaryAndroidTests(target) } - configurations.configureEach { - resolutionStrategy { - force(libs.findLibrary("junit4").get()) - } - } dependencies { add("androidTestImplementation", kotlin("test")) add("testImplementation", kotlin("test"))