Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Remove forced junit resolution strategy

Simon Marquis0a3069a0d82d
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<Project> {
configurePrintApksTask(this)
disableUnnecessaryAndroidTests(target)
}
- configurations.configureEach {
- resolutionStrategy {
- force(libs.findLibrary("junit4").get())
- }
- }
dependencies {
add("androidTestImplementation", kotlin("test"))
add("testImplementation", kotlin("test"))