From 23b2e635bb25b6424e1d1f28ee4827f800facbb6 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 6 Jun 2021 16:37:09 +0530
Subject: [PATCH] all: tweak dependency namespacing

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 android/build.gradle.kts  |  7 ++++---
 api/build.gradle.kts      |  8 ++++----
 database/build.gradle.kts |  8 ++------
 gradle/libs.versions.toml | 17 ++++++++++-------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 877986d1..c54da45d 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
 dependencies {
   implementation(projects.api)
   implementation(projects.common)
-  implementation("androidx.activity:activity-compose:1.3.0-beta01")
-  implementation("androidx.appcompat:appcompat:1.4.0-alpha02")
-  implementation("androidx.paging:paging-compose:1.0.0-alpha10")
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.paging.compose)
+  implementation(libs.retrofit.moshiConverter)
 }
 
 android {
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 5e2bd406..529c7d08 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 }
 
 dependencies {
-  api(libs.thirdparty.retrofit.lib)
-  ksp(libs.thirdparty.moshix.ksp)
-  implementation(libs.thirdparty.moshi.lib)
-  implementation(libs.thirdparty.retrofit.moshiConverter) { exclude(group = "com.squareup.moshi") }
+  api(libs.retrofit.lib)
+  ksp(libs.moshix.ksp)
+  implementation(libs.moshi.lib)
+  implementation(libs.retrofit.moshiConverter) { exclude(group = "com.squareup.moshi") }
   testImplementation(libs.kotlin.coroutines.core)
   testImplementation(libs.testing.kotlintest.junit)
   testImplementation(libs.testing.mockWebServer)
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index ac93d250..d70e335e 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -27,13 +27,9 @@ kotlin {
     val androidAndroidTestRelease by getting
     val commonMain by getting
     val commonTest by getting
-    val androidMain by getting {
-      dependencies { implementation(libs.thirdparty.sqldelight.androidDriver) }
-    }
+    val androidMain by getting { dependencies { implementation(libs.sqldelight.androidDriver) } }
     val androidTest by getting { dependsOn(androidAndroidTestRelease) }
-    val desktopMain by getting {
-      dependencies { implementation(libs.thirdparty.sqldelight.jvmDriver) }
-    }
+    val desktopMain by getting { dependencies { implementation(libs.sqldelight.jvmDriver) } }
     val desktopTest by getting {
       dependencies {
         implementation(libs.kotlin.coroutines.core)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8907e2a6..abcde31a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,17 +11,20 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
 
+androidx-activity-compose = "androidx.activity:activity-compose:1.3.0-beta01"
+androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-alpha02"
 androidx-browser = "androidx.browser:browser:1.3.0"
+androidx-paging-compose = "androidx.paging:paging-compose:1.0.0-alpha10"
 
-thirdparty-moshi-lib = "com.squareup.moshi:moshi:1.12.0"
-thirdparty-moshix-ksp = { module = "dev.zacsweers.moshix:moshi-ksp", version.ref = "moshix" }
-thirdparty-moshix-metadatareflect = { module = "dev.zacsweers.moshix:moshi-metadata-reflect", version.ref = "moshix" }
+moshi-lib = "com.squareup.moshi:moshi:1.12.0"
+moshix-ksp = { module = "dev.zacsweers.moshix:moshi-ksp", version.ref = "moshix" }
+moshix-metadatareflect = { module = "dev.zacsweers.moshix:moshi-metadata-reflect", version.ref = "moshix" }
 
-thirdparty-retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
-thirdparty-retrofit-moshiConverter = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
+retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+retrofit-moshiConverter = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
 
-thirdparty-sqldelight-jvmDriver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
-thirdparty-sqldelight-androidDriver = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
+sqldelight-jvmDriver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
+sqldelight-androidDriver = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
 
 testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2"