Merge branch 'github/main'

app-nia-catalog/build.gradle.kts

@@ -36,8 +36,8 @@ android {
 }
 
 dependencies {
-    implementation(project(":core-ui"))
-    implementation(project(":core-designsystem"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:designsystem"))
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.accompanist.flowlayout)

app/build.gradle.kts

@@ -93,22 +93,22 @@ android {
 }
 
 dependencies {
-    implementation(project(":feature-author"))
-    implementation(project(":feature-interests"))
-    implementation(project(":feature-foryou"))
-    implementation(project(":feature-bookmarks"))
-    implementation(project(":feature-topic"))
+    implementation(project(":feature:author"))
+    implementation(project(":feature:interests"))
+    implementation(project(":feature:foryou"))
+    implementation(project(":feature:bookmarks"))
+    implementation(project(":feature:topic"))
 
-    implementation(project(":core-ui"))
-    implementation(project(":core-designsystem"))
-    implementation(project(":core-navigation"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:designsystem"))
+    implementation(project(":core:navigation"))
 
     implementation(project(":sync"))
 
-    androidTestImplementation(project(":core-testing"))
-    androidTestImplementation(project(":core-datastore-test"))
-    androidTestImplementation(project(":core-data-test"))
-    androidTestImplementation(project(":core-network"))
+    androidTestImplementation(project(":core:testing"))
+    androidTestImplementation(project(":core:datastore-test"))
+    androidTestImplementation(project(":core:data-test"))
+    androidTestImplementation(project(":core:network"))
     androidTestImplementation(libs.androidx.navigation.testing)
     debugImplementation(libs.androidx.compose.ui.testManifest)
 

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -40,15 +40,15 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
             dependencies {
-                add("implementation", project(":core-model"))
-                add("implementation", project(":core-ui"))
-                add("implementation", project(":core-designsystem"))
-                add("implementation", project(":core-data"))
-                add("implementation", project(":core-common"))
-                add("implementation", project(":core-navigation"))
+                add("implementation", project(":core:model"))
+                add("implementation", project(":core:ui"))
+                add("implementation", project(":core:designsystem"))
+                add("implementation", project(":core:data"))
+                add("implementation", project(":core:common"))
+                add("implementation", project(":core:navigation"))
 
-                add("testImplementation", project(":core-testing"))
-                add("androidTestImplementation", project(":core-testing"))
+                add("testImplementation", project(":core:testing"))
+                add("androidTestImplementation", project(":core:testing"))
 
                 add("implementation", libs.findLibrary("coil.kt").get())
                 add("implementation", libs.findLibrary("coil.kt.compose").get())

core/common/build.gradle.kts

@@ -25,5 +25,5 @@ dependencies {
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
 
-    testImplementation(project(":core-testing"))
+    testImplementation(project(":core:testing"))
 }

core/data-test/build.gradle.kts

@@ -21,8 +21,8 @@ plugins {
 }
 
 dependencies {
-    api(project(":core-data"))
-    implementation(project(":core-testing"))
+    api(project(":core:data"))
+    implementation(project(":core:testing"))
 
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)

core/data/build.gradle.kts

@@ -23,14 +23,14 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":core-common"))
-    implementation(project(":core-model"))
-    implementation(project(":core-database"))
-    implementation(project(":core-datastore"))
-    implementation(project(":core-network"))
+    implementation(project(":core:common"))
+    implementation(project(":core:model"))
+    implementation(project(":core:database"))
+    implementation(project(":core:datastore"))
+    implementation(project(":core:network"))
 
-    testImplementation(project(":core-testing"))
-    testImplementation(project(":core-datastore-test"))
+    testImplementation(project(":core:testing"))
+    testImplementation(project(":core:datastore-test"))
 
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.coroutines.android)

core/database/build.gradle.kts

@@ -38,7 +38,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":core-model"))
+    implementation(project(":core:model"))
 
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)
@@ -50,5 +50,5 @@ dependencies {
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
 
-    androidTestImplementation(project(":core-testing"))
+    androidTestImplementation(project(":core:testing"))
 }

core/datastore-test/build.gradle.kts

@@ -21,8 +21,8 @@ plugins {
 }
 
 dependencies {
-    api(project(":core-datastore"))
-    implementation(project(":core-testing"))
+    api(project(":core:datastore"))
+    implementation(project(":core:testing"))
 
     api(libs.androidx.dataStore.core)
 

core/datastore/build.gradle.kts

@@ -56,10 +56,10 @@ protobuf {
 }
 
 dependencies {
-    implementation(project(":core-common"))
-    implementation(project(":core-model"))
+    implementation(project(":core:common"))
+    implementation(project(":core:model"))
 
-    testImplementation(project(":core-testing"))
+    testImplementation(project(":core:testing"))
 
     implementation(libs.kotlinx.coroutines.android)