Merge pull request #183 from Pocket/renovate/opt-in-kotlin-test

chore(deps): move kotlin test to version catalog
Pocket · Feb 5, 2025 · 7737f44 · 7737f44
2 parents 075791a + 12b0133
commit 7737f44
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/Pocket/build.gradle.kts b/Pocket/build.gradle.kts
@@ -313,15 +313,15 @@ dependencies {
 
     testImplementation(Deps.Mockito.core)
     testImplementation(Deps.AssertJ.core)
-    testImplementation(Deps.Jetbrains.Kotlin.jUnit)
+    testImplementation(libs.kotlin.junit)
     testImplementation(Deps.MockK.mockk)
     testImplementation(platform(libs.kotlinx.coroutines.bom))
     testImplementation(libs.kotlinx.coroutines.test)
-    testImplementation(Deps.Jetbrains.Kotlin.test)
+    testImplementation(libs.kotlin.test)
     testImplementation(libs.turbine)
 
     androidTestImplementation(Deps.AndroidX.Test.rules)
-    androidTestImplementation(Deps.Jetbrains.Kotlin.jUnit)
+    androidTestImplementation(libs.kotlin.junit)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test)
     debugImplementation(libs.androidx.compose.ui.test.manifest)

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -3,14 +3,7 @@
  *
  * Deprecated: We're gradually migrating to version catalog
  */
-@Suppress("MemberNameEqualsClassName")
 object Deps {
-    object Jetbrains {
-        object Kotlin {
-            const val jUnit = "org.jetbrains.kotlin:kotlin-test-junit"
-            const val test = "org.jetbrains.kotlin:kotlin-test-common"
-        }
-    }
     object AndroidX {
         object ViewPager2 {
             private const val VERSION = "1.0.0"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,6 +44,8 @@ dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref
 firebase-bom = { module = "com.google.firebase:firebase-bom", version = "33.8.0" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
 google-play-billing = { module = "com.android.billingclient:billing-ktx", version = "7.1.1" }
+kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-common" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" }
 kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.10.1" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" }

diff --git a/sync-pocket-android/build.gradle.kts b/sync-pocket-android/build.gradle.kts
@@ -24,5 +24,5 @@ dependencies {
     testImplementation(Deps.Mockito.core)
     testImplementation(libs.robolectric)
     testImplementation(Deps.Commons.IO.commonsIo)
-    testImplementation(Deps.Jetbrains.Kotlin.jUnit)
+    testImplementation(libs.kotlin.junit)
 }
diff --git a/sync-pocket/build.gradle.kts b/sync-pocket/build.gradle.kts
@@ -28,8 +28,8 @@ dependencies {
     implementation(libs.okhttp.urlconnection)
     implementation(libs.okio)
 
-    testImplementation(Deps.Jetbrains.Kotlin.test)
-    testImplementation(Deps.Jetbrains.Kotlin.jUnit)
+    testImplementation(libs.kotlin.test)
+    testImplementation(libs.kotlin.junit)
     testImplementation(Deps.Mockito.Kotlin.mockitoKotlin)
     testImplementation(Deps.Commons.Codec.commonsCodec)
     testImplementation(libs.okhttp.mockwebserver)