diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 512f206f..17bf544b 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -6,8 +6,6 @@ */ @file:Suppress("UnstableApiUsage") -import dev.msfjarvis.claw.gradle.addTestDependencies - plugins { id("dev.msfjarvis.claw.android-application") id("dev.msfjarvis.claw.rename-artifacts") @@ -73,38 +71,46 @@ dependencies { implementation(platform(libs.okhttp.bom)) implementation(libs.aboutLibraries.m3) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.animation) + implementation(libs.androidx.compose.foundation) implementation(libs.androidx.compose.glance) implementation(libs.androidx.compose.glance.m3) implementation(libs.androidx.compose.material.icons.extended) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material3.window.size) + implementation(libs.androidx.compose.runtime) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.text) + implementation(libs.androidx.compose.ui.util) implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.lifecycle.compose) implementation(libs.androidx.navigation.compose) implementation(libs.androidx.paging.compose) implementation(libs.androidx.profileinstaller) implementation(libs.androidx.work.runtime) - implementation(libs.coil) implementation(libs.copydown) implementation(libs.dagger) - implementation(libs.jsoup) + implementation(libs.eithernet) + implementation(libs.javax.inject) implementation(libs.kotlinx.collections.immutable) implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.core) + implementation(libs.kotlinx.serialization.json) implementation(libs.material3.pulltorefresh) implementation(libs.napier) + implementation(libs.okhttp.core) + implementation(libs.okhttp.loggingInterceptor) + implementation(libs.retrofit) implementation(libs.sqldelight.extensions.coroutines) implementation(libs.swipe) implementation(libs.unfurl) implementation(projects.api) implementation(projects.common) implementation(projects.core) + implementation(projects.database.core) implementation(projects.database.impl) implementation(projects.model) implementation(projects.web) kapt(libs.dagger.compiler) - - testImplementation(libs.kotlinx.coroutines.test) - testImplementation(libs.okhttp.mockwebserver) - addTestDependencies(project) } diff --git a/api/build.gradle.kts b/api/build.gradle.kts index f81d5c35..e7768786 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright © 2021-2023 Harsh Shandilya. + * Copyright © 2021-2024 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. @@ -18,17 +18,18 @@ android { namespace = "dev.msfjarvis.claw.api" } anvil { generateDaggerFactories.set(true) } dependencies { - api(libs.eithernet) + api(libs.dagger) + api(libs.javax.inject) + api(libs.okhttp.core) api(libs.retrofit) api(projects.model) - implementation(libs.dagger) - implementation(libs.javax.inject) + implementation(libs.eithernet) implementation(libs.jsoup) testImplementation(testFixtures(libs.eithernet)) testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.kotlinx.serialization.core) testImplementation(libs.kotlinx.serialization.json) - testImplementation(libs.retrofit.kotlinxSerializationConverter) addTestDependencies(project) } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 883a58e3..2801e4be 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -32,6 +32,9 @@ androidComponents { beforeVariants { (it as HasUnitTestBuilder).enableUnitTest = anvil { generateDaggerFactories.set(true) } dependencies { + api(libs.androidx.compose.ui) + api(libs.dagger) + api(libs.javax.inject) api(projects.core) api(projects.database.core) api(projects.model) @@ -44,12 +47,15 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.runtime) implementation(libs.androidx.compose.ui.text) + implementation(libs.androidx.core) + implementation(libs.coil) 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(libs.kotlinResult) implementation(libs.kotlinResult.coroutines) implementation(libs.napier) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index d1477b84..e449bf83 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -16,15 +16,17 @@ android { namespace = "dev.msfjarvis.claw.core" } anvil { generateDaggerFactories.set(true) } dependencies { + api(libs.dagger) api(libs.javax.inject) api(libs.kotlinx.coroutines.core) api(libs.kotlinx.serialization.json) api(libs.okhttp.loggingInterceptor) + api(libs.napier) + api(libs.okhttp.core) + api(libs.retrofit) implementation(platform(libs.okhttp.bom)) implementation(platform(libs.sentry.bom)) - implementation(libs.dagger) - implementation(libs.napier) - implementation(libs.okhttp.core) + implementation(libs.kotlinx.serialization.core) implementation(libs.retrofit.kotlinxSerializationConverter) } diff --git a/database/impl/build.gradle.kts b/database/impl/build.gradle.kts index 40a532f0..e857f704 100644 --- a/database/impl/build.gradle.kts +++ b/database/impl/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright © 2021-2023 Harsh Shandilya. + * Copyright © 2021-2024 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. @@ -18,6 +18,8 @@ android { namespace = "dev.msfjarvis.claw.database" } anvil { generateDaggerFactories.set(true) } dependencies { + api(libs.dagger) + api(libs.javax.inject) api(projects.database.core) implementation(libs.napier) implementation(libs.dagger) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 97e4d2de..e2b7da8d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,9 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-compose-ui-unit = { module = "androidx.compose.ui:ui-unit" } androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } +androidx-core = "androidx.core:core:1.13.0" androidx-core-splashscreen = "androidx.core:core-splashscreen:1.2.0-alpha01" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } @@ -76,8 +78,10 @@ jsoup = "org.jsoup:jsoup:1.17.2" junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } junit-legacy = "junit:junit:4.13.2" +konvert-annotations = { module = "io.mcarle:konvert-annotations", version.ref = "konvert" } konvert-api = { module = "io.mcarle:konvert-api", version.ref = "konvert" } konvert-processor = { module = "io.mcarle:konvert", version.ref = "konvert" } +kotlinResult = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlinResult" } kotlinResult-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version.ref = "kotlinResult" } kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7" kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } diff --git a/model/build.gradle.kts b/model/build.gradle.kts index da59ce80..36c6dc34 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright © 2021-2023 Harsh Shandilya. + * Copyright © 2021-2024 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. @@ -12,9 +12,9 @@ plugins { } dependencies { + api(projects.database.core) + compileOnly(libs.konvert.annotations) implementation(libs.kotlinx.serialization.core) - implementation(libs.konvert.api) - implementation(projects.database.core) ksp(libs.konvert.processor) } diff --git a/web/build.gradle.kts b/web/build.gradle.kts index afdfec22..aa881b39 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -21,11 +21,14 @@ android { } dependencies { - implementation(projects.core) + api(libs.androidx.compose.runtime) + api(libs.androidx.compose.ui) + api(libs.kotlinx.coroutines.core) + api(projects.core) + implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.compose.material3) - implementation(libs.androidx.compose.ui.util) - implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.foundation) + implementation(libs.androidx.compose.ui.unit) implementation(libs.kotlinx.collections.immutable) }