Fully switch to project accessors

app/build.gradle.kts

@@ -471,26 +471,6 @@ baselineProfile {
 dependencies {
   ksp(libs.circuit.codegen)
 
-  implementation(project(":libraries:appconfig"))
-  implementation(project(":libraries:base-ui"))
-  implementation(project(":libraries:compose-extensions"))
-  implementation(project(":libraries:compose-extensions:pull-refresh"))
-  implementation(project(":libraries:flowbinding"))
-  implementation(project(":libraries:gemoji"))
-  implementation(project(":libraries:kotlinutil"))
-  implementation(project(":libraries:summarizer"))
-  implementation(project(":libraries:util"))
-  implementation(project(":service-api"))
-  implementation(project(":service-db"))
-  implementation(project(":services:designernews"))
-  implementation(project(":services:dribbble"))
-  implementation(project(":services:github"))
-  implementation(project(":services:hackernews"))
-  implementation(project(":services:producthunt"))
-  implementation(project(":services:reddit"))
-  implementation(project(":services:slashdot"))
-  implementation(project(":services:unsplash"))
-  implementation(project(":services:uplabs"))
   implementation(libs.androidx.activity)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.annotations)
@@ -566,10 +546,30 @@ dependencies {
   implementation(libs.sqldelight.runtime)
   implementation(libs.telephoto.zoomableImageCoil)
   implementation(libs.xmlutil.serialization)
+  implementation(projects.libraries.appconfig)
   implementation(projects.libraries.auth)
+  implementation(projects.libraries.baseUi)
+  implementation(projects.libraries.composeExtensions)
+  implementation(projects.libraries.composeExtensions.pullRefresh)
   implementation(projects.libraries.di)
   implementation(projects.libraries.di.android)
+  implementation(projects.libraries.flowbinding)
+  implementation(projects.libraries.gemoji)
   implementation(projects.libraries.gemoji.db)
+  implementation(projects.libraries.kotlinutil)
+  implementation(projects.libraries.summarizer)
+  implementation(projects.libraries.util)
+  implementation(projects.serviceApi)
+  implementation(projects.serviceDb)
+  implementation(projects.services.designernews)
+  implementation(projects.services.dribbble)
+  implementation(projects.services.github)
+  implementation(projects.services.hackernews)
+  implementation(projects.services.producthunt)
+  implementation(projects.services.reddit)
+  implementation(projects.services.slashdot)
+  implementation(projects.services.unsplash)
+  implementation(projects.services.uplabs)
 
   releaseImplementation(libs.misc.bugsnag)
   releaseImplementation(libs.misc.leakCanaryObjectWatcherAndroid)
@@ -586,8 +586,8 @@ dependencies {
   debugImplementation(libs.retrofit.moshi)
   debugImplementation(projects.libraries.retrofitconverters)
 
-  kaptDebug(project(":libraries:tooling:spi-multibinds-validator"))
-  kaptDebug(project(":libraries:tooling:spi-visualizer"))
+  kaptDebug(projects.libraries.tooling.spiMultibindsValidator)
+  kaptDebug(projects.libraries.tooling.spiVisualizer)
 
   testImplementation(libs.misc.debug.flipper)
   testImplementation(libs.misc.debug.flipperNetwork)

libraries/base-ui/build.gradle.kts

@@ -33,9 +33,6 @@ slack {
 }
 
 dependencies {
-  api(project(":libraries:appconfig"))
-  api(project(":libraries:di"))
-  api(project(":libraries:util"))
   api(libs.androidx.annotations)
   api(libs.androidx.compose.runtime)
   api(libs.androidx.compose.ui)
@@ -46,6 +43,9 @@ dependencies {
   api(libs.circuit.runtime)
   api(libs.kotlin.coroutines)
   api(libs.kotlin.datetime)
+  api(projects.libraries.appconfig)
+  api(projects.libraries.di)
+  api(projects.libraries.util)
 
   implementation(libs.androidx.activity)
   implementation(libs.androidx.activity.compose)

libraries/compose-extensions/build.gradle.kts

@@ -25,13 +25,13 @@ android { namespace = "dev.zacsweers.catchup.compose" }
 slack { features { compose() } }
 
 dependencies {
-  api(project(":libraries:base-ui"))
   api(libs.androidx.compose.accompanist.systemUi)
   api(libs.androidx.compose.foundation)
   api(libs.androidx.compose.runtime)
   api(libs.androidx.compose.ui)
   api(libs.androidx.compose.uiTooling)
   api(libs.kotlin.coroutines)
+  api(projects.libraries.baseUi)
 
   implementation(libs.androidx.compose.googleFonts)
   implementation(libs.androidx.compose.material.material3)

libraries/gemoji/build.gradle.kts

@@ -35,14 +35,14 @@ dependencies {
   api(projects.libraries.di)
   api(projects.libraries.gemoji.db)
 
-  implementation(project(":libraries:util"))
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.sqlite)
   implementation(libs.kotlin.coroutines)
   implementation(libs.misc.timber)
   implementation(libs.sqldelight.coroutines)
   implementation(libs.sqldelight.driver.android)
   implementation(libs.sqldelight.runtime)
+  implementation(projects.libraries.util)
 
   compileOnly(libs.misc.jsr250)
 

libraries/util/build.gradle.kts

@@ -34,14 +34,14 @@ redacted {
 }
 
 dependencies {
-  api(project(":libraries:appconfig"))
   api(libs.androidx.annotations)
   api(libs.androidx.coreKtx)
   api(libs.apollo.api)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.moshi.core)
   api(libs.okhttp.core)
+  api(projects.libraries.appconfig)
 
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.core)

service-api/build.gradle.kts

@@ -30,15 +30,15 @@ slack {
 }
 
 dependencies {
-  api(project(":libraries:appconfig"))
-  api(project(":libraries:gemoji"))
-  api(project(":libraries:retrofitconverters"))
   api(libs.androidx.annotations)
   api(libs.androidx.compose.runtime)
   api(libs.androidx.compose.ui)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
+  api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.libraries.gemoji)
+  api(projects.libraries.retrofitconverters)
 
   implementation(libs.androidx.annotations)
   implementation(libs.kotlin.coroutinesAndroid)

services/designernews/build.gradle.kts

@@ -35,7 +35,6 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.misc.moshiLazyAdapters)
@@ -44,10 +43,11 @@ dependencies {
   api(libs.retrofit.core)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:util"))
   implementation(libs.kotlin.datetime)
   implementation(libs.okhttp.core)
   implementation(libs.retrofit.moshi)
   implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 }

services/dribbble/build.gradle.kts

@@ -34,17 +34,17 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.okhttp.core)
   api(libs.retrofit.core)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:retrofitconverters"))
-  implementation(project(":libraries:util"))
   implementation(libs.kotlin.datetime)
   implementation(libs.misc.jsoup)
   implementation(libs.okhttp.core)
+  implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 }

services/github/build.gradle.kts

@@ -51,25 +51,25 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.apollo.runtime)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.okhttp.core)
   api(libs.retrofit.core)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:gemoji"))
-  implementation(project(":libraries:retrofitconverters"))
-  implementation(project(":libraries:util"))
   implementation(libs.apollo.httpcache)
   // Apollo
   implementation(libs.apollo.runtime)
   implementation(libs.kotlin.datetime)
   implementation(libs.misc.jsoup)
   implementation(libs.misc.timber)
   implementation(libs.okhttp.core)
+  implementation(projects.libraries.gemoji)
+  implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 
   compileOnly(libs.misc.javaxInject)
 }

services/hackernews/build.gradle.kts

@@ -66,18 +66,18 @@ noArg {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:base-ui"))
-  implementation(project(":libraries:util"))
   implementation(libs.androidx.annotations)
   implementation(libs.firebase.database)
   implementation(libs.kotlin.coroutines)
   implementation(libs.kotlin.datetime)
   implementation(libs.okhttp.core)
+  implementation(projects.libraries.baseUi)
   implementation(projects.libraries.kotlinutil)
+  implementation(projects.libraries.util)
 }

services/imgur/build.gradle.kts

@@ -35,14 +35,14 @@ slack {
 }
 
 dependencies {
-  implementation(project(":libraries:util"))
+  implementation(projects.libraries.util)
   implementation(libs.moshi.core)
   implementation(libs.retrofit.core)
   implementation(libs.retrofit.moshi)
   implementation(libs.okhttp.core)
   implementation(libs.misc.moshiLazyAdapters)
 
-  api(project(":service-api"))
+  api(projects.serviceApi)
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
 }

services/medium/build.gradle.kts

@@ -35,7 +35,7 @@ slack {
 }
 
 dependencies {
-  implementation(project(":libraries:util"))
+  implementation(projects.libraries.util)
   implementation(libs.misc.okio)
   implementation(libs.moshi.core)
   implementation(libs.retrofit.core)
@@ -44,7 +44,7 @@ dependencies {
   implementation(libs.misc.moshiLazyAdapters)
   implementation(libs.kotlin.datetime)
 
-  api(project(":service-api"))
+  api(projects.serviceApi)
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
 }

services/newsapi/build.gradle.kts

@@ -35,15 +35,15 @@ slack {
 }
 
 dependencies {
-  implementation(project(":libraries:util"))
+  implementation(projects.libraries.util)
   implementation(libs.misc.okio)
   implementation(libs.moshi.core)
   implementation(libs.retrofit.core)
   implementation(libs.retrofit.moshi)
   implementation(libs.okhttp.core)
   implementation(libs.misc.moshiLazyAdapters)
 
-  api(project(":service-api"))
+  api(projects.serviceApi)
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
 }

services/producthunt/build.gradle.kts

@@ -55,19 +55,19 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.apollo.runtime)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.moshi.core)
   api(libs.okhttp.core)
   api(projects.libraries.auth)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:util"))
   implementation(libs.androidx.datastore.preferences)
   implementation(libs.apollo.httpcache)
   implementation(libs.kotlin.datetime)
   implementation(libs.misc.okio)
   implementation(libs.okhttp.core)
+  implementation(projects.libraries.util)
 }

services/reddit/build.gradle.kts

@@ -35,7 +35,6 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
@@ -44,11 +43,12 @@ dependencies {
   api(libs.retrofit.core)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:util"))
   implementation(libs.androidx.annotations)
   implementation(libs.kotlin.datetime)
   implementation(libs.okhttp.core)
   implementation(libs.retrofit.moshi)
   implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 }

services/slashdot/build.gradle.kts

@@ -29,7 +29,6 @@ android {
 slack { features { dagger() } }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.kotlinx.serialization.core)
@@ -38,13 +37,14 @@ dependencies {
   api(libs.xmlutil.serialization)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:util"))
   implementation(libs.kotlin.datetime)
   implementation(libs.okhttp.core)
   implementation(libs.retrofit.kotlinxSerialization)
   implementation(libs.tikxml.htmlEscape)
   implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 
   testImplementation(libs.test.junit)
   testImplementation(libs.test.truth)

services/unsplash/build.gradle.kts

@@ -40,19 +40,19 @@ slack {
 }
 
 dependencies {
-  api(project(":service-api"))
   api(libs.androidx.annotations)
   api(libs.dagger.runtime)
   api(libs.kotlin.datetime)
   api(libs.okhttp.core)
   api(libs.retrofit.core)
   api(projects.libraries.appconfig)
   api(projects.libraries.di)
+  api(projects.serviceApi)
 
-  implementation(project(":libraries:util"))
   implementation(libs.androidx.annotations)
   implementation(libs.kotlin.datetime)
   implementation(libs.okhttp.core)
   implementation(libs.retrofit.moshi)
   implementation(projects.libraries.retrofitconverters)
+  implementation(projects.libraries.util)
 }