Merge pull request #86 from azrael8576/chore/cleanup-dependencies

chore: Use typesafe project accessors for project modules
azrael8576 · Jan 26, 2024 · 65835d8 · 65835d8
2 parents d694f08 + f65f9d1
commit 65835d8
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 41 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -66,27 +66,28 @@ android {
 }
 
 dependencies {
-    implementation(project(":feature:home"))
-    implementation(project(":feature:photo"))
-    implementation(project(":feature:video"))
-    implementation(project(":feature:contactme"))
-
-    implementation(project(":core:designsystem"))
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:datastore"))
-
-    androidTestImplementation(project(":core:designsystem"))
-    androidTestImplementation(project(":core:datastore-test"))
-    androidTestImplementation(project(":core:testing"))
+    implementation(projects.feature.home)
+    implementation(projects.feature.photo)
+    implementation(projects.feature.video)
+    implementation(projects.feature.contactme)
+
+    implementation(projects.core.designsystem)
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.datastore)
+
+
+    androidTestImplementation(projects.core.designsystem)
+    androidTestImplementation(projects.core.datastoreTest)
+    androidTestImplementation(projects.core.testing)
     androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.accompanist.testharness)
-    testImplementation(project(":core:datastore-test"))
-    testImplementation(project(":core:testing"))
+    testImplementation(projects.core.datastoreTest)
+    testImplementation(projects.core.testing)
     testImplementation(libs.androidx.navigation.testing)
     testImplementation(libs.accompanist.testharness)
-    debugImplementation(project(":ui-test-hilt-manifest"))
+    debugImplementation(projects.uiTestHiltManifest)
     debugImplementation(libs.androidx.compose.ui.testManifest)
 
     implementation(libs.androidx.core.ktx)

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -13,7 +13,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:model"))
+    implementation(projects.core.model)
 
     // LifeCycle
     implementation(libs.androidx.lifecycle.runtimeCompose)

diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -15,10 +15,10 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:network"))
-    implementation(project(":core:model"))
-    implementation(project(":core:datastore"))
+    implementation(projects.core.common)
+    implementation(projects.core.network)
+    implementation(projects.core.model)
+    implementation(projects.core.datastore)
 
     implementation(libs.kotlinx.serialization.json)
 }
diff --git a/core/datastore-test/build.gradle.kts b/core/datastore-test/build.gradle.kts
@@ -9,10 +9,10 @@ android {
 }
 
 dependencies {
-    api(project(":core:datastore"))
-    implementation(project(":core:testing"))
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    api(projects.core.datastore)
+    implementation(projects.core.testing)
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 
     // DataStore
     implementation(libs.androidx.datastore)

diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -45,8 +45,8 @@ androidComponents.beforeVariants {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:model"))
+    implementation(projects.core.common)
+    implementation(projects.core.model)
 
     // DataStore
     implementation(libs.androidx.datastore)

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -13,7 +13,7 @@ android {
 }
 
 dependencies {
-    androidTestImplementation(project(":core:testing"))
+    androidTestImplementation(projects.core.testing)
 
     // Write trace events to the system trace buffer.
     api(libs.androidx.tracing.ktx)

diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:network"))
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.network)
 }
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -24,7 +24,7 @@ secrets {
 }
 
 dependencies {
-    implementation(project(":core:common"))
+    implementation(projects.core.common)
 
     // Okhttp Interceptor
     implementation(libs.okhttp.logging)

diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -10,12 +10,12 @@ android {
 
 
 dependencies {
-    implementation(project(":core:common"))
-    implementation(project(":core:data"))
-    implementation(project(":core:model"))
-    implementation(project(":core:domain"))
-    implementation(project(":core:network"))
-    implementation(project(":core:designsystem"))
+    implementation(projects.core.common)
+    implementation(projects.core.data)
+    implementation(projects.core.model)
+    implementation(projects.core.domain)
+    implementation(projects.core.network)
+    implementation(projects.core.designsystem)
 
     api(libs.junit4)
     api(libs.androidx.activity.compose)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,8 +14,9 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-
 rootProject.name = "picquest"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include(":app")
 
 include(":core:designsystem")