diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f8cb994f5..b6690897f 100755 --- a/app/build.gradle.kts +++ b/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) diff --git a/libraries/base-ui/build.gradle.kts b/libraries/base-ui/build.gradle.kts index 267a3255a..0051b525e 100644 --- a/libraries/base-ui/build.gradle.kts +++ b/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) diff --git a/libraries/compose-extensions/build.gradle.kts b/libraries/compose-extensions/build.gradle.kts index 5c4c62382..f892f92ed 100644 --- a/libraries/compose-extensions/build.gradle.kts +++ b/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) diff --git a/libraries/gemoji/build.gradle.kts b/libraries/gemoji/build.gradle.kts index bfc182a52..9457d2fd1 100644 --- a/libraries/gemoji/build.gradle.kts +++ b/libraries/gemoji/build.gradle.kts @@ -35,7 +35,6 @@ 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) @@ -43,6 +42,7 @@ dependencies { implementation(libs.sqldelight.coroutines) implementation(libs.sqldelight.driver.android) implementation(libs.sqldelight.runtime) + implementation(projects.libraries.util) compileOnly(libs.misc.jsr250) diff --git a/libraries/util/build.gradle.kts b/libraries/util/build.gradle.kts index e998030cc..4ec37c717 100644 --- a/libraries/util/build.gradle.kts +++ b/libraries/util/build.gradle.kts @@ -34,7 +34,6 @@ redacted { } dependencies { - api(project(":libraries:appconfig")) api(libs.androidx.annotations) api(libs.androidx.coreKtx) api(libs.apollo.api) @@ -42,6 +41,7 @@ dependencies { api(libs.kotlin.datetime) api(libs.moshi.core) api(libs.okhttp.core) + api(projects.libraries.appconfig) implementation(libs.androidx.annotations) implementation(libs.androidx.core) diff --git a/service-api/build.gradle.kts b/service-api/build.gradle.kts index 3a823beb4..b0fa662e4 100644 --- a/service-api/build.gradle.kts +++ b/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) diff --git a/services/designernews/build.gradle.kts b/services/designernews/build.gradle.kts index 290efe9cc..6b8f291ba 100644 --- a/services/designernews/build.gradle.kts +++ b/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) } diff --git a/services/dribbble/build.gradle.kts b/services/dribbble/build.gradle.kts index af32d8873..2b3eb4e7e 100644 --- a/services/dribbble/build.gradle.kts +++ b/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) } diff --git a/services/github/build.gradle.kts b/services/github/build.gradle.kts index a9cd644a2..9e749e5b1 100644 --- a/services/github/build.gradle.kts +++ b/services/github/build.gradle.kts @@ -51,7 +51,6 @@ slack { } dependencies { - api(project(":service-api")) api(libs.apollo.runtime) api(libs.dagger.runtime) api(libs.kotlin.datetime) @@ -59,10 +58,8 @@ dependencies { 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) @@ -70,6 +67,9 @@ dependencies { 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) } diff --git a/services/hackernews/build.gradle.kts b/services/hackernews/build.gradle.kts index 654a42e49..a8a5d9f8b 100644 --- a/services/hackernews/build.gradle.kts +++ b/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) } diff --git a/services/imgur/build.gradle.kts b/services/imgur/build.gradle.kts index c86f9a17a..05f86a051 100644 --- a/services/imgur/build.gradle.kts +++ b/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) } diff --git a/services/medium/build.gradle.kts b/services/medium/build.gradle.kts index 89da4d7ec..9d653c712 100644 --- a/services/medium/build.gradle.kts +++ b/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) } diff --git a/services/newsapi/build.gradle.kts b/services/newsapi/build.gradle.kts index 0a48e0194..647a4b7f1 100644 --- a/services/newsapi/build.gradle.kts +++ b/services/newsapi/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) @@ -43,7 +43,7 @@ dependencies { implementation(libs.okhttp.core) implementation(libs.misc.moshiLazyAdapters) - api(project(":service-api")) + api(projects.serviceApi) api(libs.androidx.annotations) api(libs.dagger.runtime) } diff --git a/services/producthunt/build.gradle.kts b/services/producthunt/build.gradle.kts index d0b1b6add..91c346e8e 100644 --- a/services/producthunt/build.gradle.kts +++ b/services/producthunt/build.gradle.kts @@ -55,7 +55,6 @@ slack { } dependencies { - api(project(":service-api")) api(libs.apollo.runtime) api(libs.dagger.runtime) api(libs.kotlin.datetime) @@ -63,11 +62,12 @@ dependencies { 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) } diff --git a/services/reddit/build.gradle.kts b/services/reddit/build.gradle.kts index b4915015e..d1725804f 100644 --- a/services/reddit/build.gradle.kts +++ b/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) } diff --git a/services/slashdot/build.gradle.kts b/services/slashdot/build.gradle.kts index 796726084..dd1ba680d 100644 --- a/services/slashdot/build.gradle.kts +++ b/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) diff --git a/services/unsplash/build.gradle.kts b/services/unsplash/build.gradle.kts index 7b9ff8f1d..c4247cc08 100644 --- a/services/unsplash/build.gradle.kts +++ b/services/unsplash/build.gradle.kts @@ -40,7 +40,6 @@ slack { } dependencies { - api(project(":service-api")) api(libs.androidx.annotations) api(libs.dagger.runtime) api(libs.kotlin.datetime) @@ -48,11 +47,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) } diff --git a/services/uplabs/build.gradle.kts b/services/uplabs/build.gradle.kts index 9f5aecf69..4646bd196 100644 --- a/services/uplabs/build.gradle.kts +++ b/services/uplabs/build.gradle.kts @@ -35,17 +35,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:util")) implementation(libs.kotlin.datetime) implementation(libs.okhttp.core) implementation(libs.retrofit.moshi) implementation(projects.libraries.retrofitconverters) + implementation(projects.libraries.util) }