From 3dfd2d7862e923c7c66659862789888e58954127 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 7 May 2023 02:49:41 +0530
Subject: [PATCH] chore: rework dependency declaration

---
 android/build.gradle.kts            |  1 +
 api/build.gradle.kts                |  1 -
 common/build.gradle.kts             | 14 ++++++++------
 coroutine-utils/build.gradle.kts    |  4 ++--
 database/build.gradle.kts           |  2 --
 metadata-extractor/build.gradle.kts |  7 +++----
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 804a94b0..0842f1d2 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -65,6 +65,7 @@ dependencies {
   implementation(libs.jsoup)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.napier)
   implementation(libs.sqldelight.extensions.coroutines)
   implementation(projects.api)
   implementation(projects.common)
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 81a399a2..072c9819 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -28,6 +28,5 @@ dependencies {
   testImplementation(testFixtures(libs.eithernet))
   testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
   addTestDependencies(project)
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index eff6a1f6..5685c10f 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -30,7 +30,11 @@ androidComponents { beforeVariants { it.enableUnitTest = false } }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(libs.napier)
+  api(projects.core)
+  api(projects.database)
+  api(projects.model)
+
+  compileOnly(libs.androidx.compose.ui.tooling.preview)
 
   implementation(platform(libs.androidx.compose.bom))
   implementation(libs.androidx.browser)
@@ -39,15 +43,13 @@ dependencies {
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.runtime)
   implementation(libs.androidx.compose.ui.text)
-  implementation(libs.androidx.compose.ui.tooling)
-  implementation(libs.androidx.compose.ui.tooling.preview)
   implementation(libs.coil.compose)
   implementation(libs.compose.richtext.markdown)
   implementation(libs.compose.richtext.material3)
   implementation(libs.compose.richtext.ui)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
-  implementation(projects.core)
-  implementation(projects.database)
-  implementation(projects.model)
+  implementation(libs.napier)
+
+  runtimeOnly(libs.androidx.compose.ui.tooling)
 }
diff --git a/coroutine-utils/build.gradle.kts b/coroutine-utils/build.gradle.kts
index e53fc681..5cbd5df9 100644
--- a/coroutine-utils/build.gradle.kts
+++ b/coroutine-utils/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -7,6 +7,6 @@
 plugins { id("dev.msfjarvis.claw.kotlin-jvm") }
 
 dependencies {
+  api(libs.javax.inject)
   api(libs.kotlinx.coroutines.core)
-  implementation(libs.javax.inject)
 }
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 3ef71ced..837a1997 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -33,9 +33,7 @@ dependencies {
   implementation(libs.dagger)
   implementation(libs.sqldelight.androidDriver)
   implementation(libs.sqldelight.primitiveAdapters)
-  implementation(projects.core)
 
-  testImplementation(libs.kotlinx.coroutines.core)
   testImplementation(libs.sqldelight.jvmDriver)
   addTestDependencies(project)
 }
diff --git a/metadata-extractor/build.gradle.kts b/metadata-extractor/build.gradle.kts
index d90f1a43..d9697da5 100644
--- a/metadata-extractor/build.gradle.kts
+++ b/metadata-extractor/build.gradle.kts
@@ -8,11 +8,10 @@ plugins { id("dev.msfjarvis.claw.kotlin-jvm") }
 
 dependencies {
   api(libs.crux)
+  api(libs.javax.inject)
+  api(libs.okhttp.core)
+  api(projects.model)
 
   implementation(platform(libs.okhttp.bom))
-  implementation(libs.javax.inject)
   implementation(libs.jsoup)
-  implementation(libs.kotlinx.coroutines.core)
-  implementation(libs.okhttp.core)
-  implementation(projects.model)
 }