From 999bfe36a127eef09cd770d8e5ada1d7f4eb0359 Mon Sep 17 00:00:00 2001 From: David Ly <22302001+lydavid@users.noreply.github.com> Date: Sun, 18 Aug 2024 21:18:37 -0400 Subject: [PATCH 1/3] chore: sort gradle dependencies automatically --- .github/workflows/sort-dependencies.yml | 29 +++++++++++++++++++++++++ build.gradle.kts | 6 ++++- gradle/libs.versions.toml | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/sort-dependencies.yml diff --git a/.github/workflows/sort-dependencies.yml b/.github/workflows/sort-dependencies.yml new file mode 100644 index 0000000000..34ecba2bfb --- /dev/null +++ b/.github/workflows/sort-dependencies.yml @@ -0,0 +1,29 @@ +name: Sort Dependencies + +on: + push: + workflow_call: + workflow_dispatch: + +jobs: + sort-dependencies: + name: Sort Dependencies + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout + uses: nschloe/action-cached-lfs-checkout@v1 + with: + token: ${{ secrets.PAT }} + + - id: setup + uses: ./.github/actions/setup + + - run: ./gradlew sortDependencies + + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v5.0.1 + with: + commit_message: 'chore: sort gradle dependencies [skip ci]' + commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> diff --git a/build.gradle.kts b/build.gradle.kts index b39772792f..6fbede6759 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import java.io.BufferedReader @@ -19,6 +18,7 @@ plugins { alias(libs.plugins.kotlin.parcelize) apply false alias(libs.plugins.sqldelight) apply false alias(libs.plugins.kotlin.powerAssert) apply false + alias(libs.plugins.sort.dependencies) apply false alias(libs.plugins.aboutlibraries) alias(libs.plugins.dependency.analysis) @@ -33,6 +33,10 @@ buildscript { } } +allprojects { + apply(plugin = "com.squareup.sort-dependencies") +} + subprojects { tasks.withType>().configureEach { compilerOptions { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cc35ca4ad..3737cb8afb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -154,3 +154,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4" +sort-dependencies = "com.squareup.sort-dependencies:0.8" From 75733a6b1cd07b0980b928ce3c6eced6366488a2 Mon Sep 17 00:00:00 2001 From: David Ly <22302001+lydavid@users.noreply.github.com> Date: Sun, 18 Aug 2024 21:26:09 -0400 Subject: [PATCH 2/3] without bom --- data/common/network/build.gradle.kts | 2 +- data/coverart/build.gradle.kts | 2 +- data/musicbrainz/build.gradle.kts | 2 +- data/spotify/build.gradle.kts | 2 +- data/wikimedia/build.gradle.kts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/common/network/build.gradle.kts b/data/common/network/build.gradle.kts index db5cc03c0c..df66a4d739 100644 --- a/data/common/network/build.gradle.kts +++ b/data/common/network/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { dependencies { implementation(projects.core.logging.api) implementation(libs.koin.core) - implementation(project.dependencies.platform(libs.ktor.bom)) +// implementation(project.dependencies.platform(libs.ktor.bom)) implementation(libs.ktor.client.content.negotiation) implementation(libs.ktor.client.core) implementation(libs.ktor.serialization.kotlinx.json) diff --git a/data/coverart/build.gradle.kts b/data/coverart/build.gradle.kts index c23e873e0a..2e2df3649e 100644 --- a/data/coverart/build.gradle.kts +++ b/data/coverart/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { implementation(projects.shared.domain) implementation(projects.core.logging.api) implementation(libs.koin.core) - implementation(project.dependencies.platform(libs.ktor.bom)) +// implementation(project.dependencies.platform(libs.ktor.bom)) implementation(libs.ktor.client.core) implementation(libs.ktor.serialization.kotlinx.json) } diff --git a/data/musicbrainz/build.gradle.kts b/data/musicbrainz/build.gradle.kts index 48fab55bf0..8e3f44addb 100644 --- a/data/musicbrainz/build.gradle.kts +++ b/data/musicbrainz/build.gradle.kts @@ -48,7 +48,7 @@ kotlin { implementation(projects.core.logging.api) implementation(libs.koin.core) implementation(libs.androidx.datastore.preferences.core) - implementation(project.dependencies.platform(libs.ktor.bom)) +// implementation(project.dependencies.platform(libs.ktor.bom)) implementation(libs.ktor.client.auth) implementation(libs.ktor.client.core) implementation(libs.ktor.serialization.kotlinx.json) diff --git a/data/spotify/build.gradle.kts b/data/spotify/build.gradle.kts index 8bb5b4d143..95283ea681 100644 --- a/data/spotify/build.gradle.kts +++ b/data/spotify/build.gradle.kts @@ -43,7 +43,7 @@ kotlin { implementation(libs.androidx.datastore.preferences.core) implementation(libs.koin.core) implementation(libs.kotlinx.coroutines.core) - implementation(project.dependencies.platform(libs.ktor.bom)) +// implementation(project.dependencies.platform(libs.ktor.bom)) implementation(libs.ktor.client.auth) implementation(libs.ktor.client.core) implementation(libs.ktor.serialization.kotlinx.json) diff --git a/data/wikimedia/build.gradle.kts b/data/wikimedia/build.gradle.kts index c23e873e0a..2e2df3649e 100644 --- a/data/wikimedia/build.gradle.kts +++ b/data/wikimedia/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { implementation(projects.shared.domain) implementation(projects.core.logging.api) implementation(libs.koin.core) - implementation(project.dependencies.platform(libs.ktor.bom)) +// implementation(project.dependencies.platform(libs.ktor.bom)) implementation(libs.ktor.client.core) implementation(libs.ktor.serialization.kotlinx.json) } From 254aaf3636dd2b9a0cd339c1f9634eb1009b2ea5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:28:27 +0000 Subject: [PATCH 3/3] chore: sort gradle dependencies [skip ci] --- android/app/build.gradle.kts | 28 +++---- android/feature/nowplaying/build.gradle.kts | 14 ++-- android/feature/spotify/build.gradle.kts | 10 +-- core/logging/implementation/build.gradle.kts | 10 +-- core/preferences/build.gradle.kts | 14 ++-- data/common/network/build.gradle.kts | 33 ++++---- data/coverart/build.gradle.kts | 18 ++-- data/database/build.gradle.kts | 36 ++++---- data/musicbrainz/build.gradle.kts | 41 +++++----- data/repository/build.gradle.kts | 44 +++++----- data/spotify/build.gradle.kts | 24 +++--- data/wikimedia/build.gradle.kts | 18 ++-- desktop/app/build.gradle.kts | 15 ++-- konsist-test/build.gradle.kts | 8 +- shared/build.gradle.kts | 76 +++++++++-------- shared/feature/collections/build.gradle.kts | 42 +++++----- shared/feature/details/build.gradle.kts | 86 ++++++++++---------- shared/feature/graph/build.gradle.kts | 47 +++++------ shared/feature/history/build.gradle.kts | 34 ++++---- shared/feature/images/build.gradle.kts | 36 ++++---- shared/feature/licenses/build.gradle.kts | 20 ++--- shared/feature/search/build.gradle.kts | 23 +++--- shared/feature/settings/build.gradle.kts | 41 +++++----- shared/feature/stats/build.gradle.kts | 29 ++++--- test-data/build.gradle.kts | 14 ++-- ui/common/build.gradle.kts | 58 ++++++------- ui/core/build.gradle.kts | 14 ++-- ui/image/build.gradle.kts | 35 ++++---- ui/test/screenshot/build.gradle.kts | 7 +- 29 files changed, 427 insertions(+), 448 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index b6d344a874..3eb7c170de 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -70,40 +70,40 @@ android { } dependencies { - implementation(projects.android.feature.nowplaying) - implementation(projects.android.feature.spotify) - implementation(projects.core.coroutines) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.data.database) - implementation(projects.shared) - implementation(projects.ui.common) + implementation(platform(libs.firebase.bom)) implementation(libs.androidx.activity.compose) implementation(libs.appauth) implementation(libs.circuit.foundation) - implementation(platform(libs.firebase.bom)) implementation(libs.firebase.analytics) implementation(libs.firebase.crashlytics) implementation(libs.koin.android) implementation(libs.koin.core) implementation(libs.kotlinx.collections.immutable) implementation(libs.timber) + implementation(projects.android.feature.nowplaying) + implementation(projects.android.feature.spotify) + implementation(projects.core.coroutines) + implementation(projects.core.preferences) + implementation(projects.data.database) + implementation(projects.shared) + implementation(projects.shared.domain) + implementation(projects.ui.common) debugImplementation(libs.compose.ui.tooling) debugImplementation(libs.leakcanary.android) - testImplementation(projects.testData) + testImplementation(libs.bundles.kotlinx.coroutines) testImplementation(libs.junit) testImplementation(libs.koin.test) - testImplementation(libs.bundles.kotlinx.coroutines) + testImplementation(projects.testData) - androidTestImplementation(projects.testData) - androidTestImplementation(libs.androidx.test.junit) - androidTestImplementation(libs.androidx.test.espresso.core) androidTestImplementation(libs.androidx.arch.core.testing) + androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(libs.androidx.test.junit) androidTestImplementation(libs.bundles.kotlinx.coroutines) androidTestImplementation(libs.compose.ui.test) androidTestImplementation(libs.koin.test) androidTestImplementation(libs.sqldelight.android.driver) androidTestImplementation(libs.test.parameter.injector) + androidTestImplementation(projects.testData) } diff --git a/android/feature/nowplaying/build.gradle.kts b/android/feature/nowplaying/build.gradle.kts index 5fa7a57151..f899bb7049 100644 --- a/android/feature/nowplaying/build.gradle.kts +++ b/android/feature/nowplaying/build.gradle.kts @@ -10,23 +10,21 @@ android { } dependencies { - implementation(projects.shared.domain) - implementation(projects.ui.common) - testImplementation(projects.ui.test.screenshot) - + implementation(libs.circuit.foundation) implementation(libs.compose.foundation) implementation(libs.compose.material3) implementation(libs.compose.ui) implementation(libs.compose.ui.preview) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) implementation(libs.koin.androidx.compose) - implementation(libs.paging.compose) + implementation(libs.koin.core) implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.shared.domain) + implementation(projects.ui.common) debugImplementation(libs.compose.ui.tooling) testImplementation(libs.bundles.kotlinx.coroutines) testImplementation(libs.test.parameter.injector) + testImplementation(projects.ui.test.screenshot) } diff --git a/android/feature/spotify/build.gradle.kts b/android/feature/spotify/build.gradle.kts index c6c51932c0..32658504dc 100644 --- a/android/feature/spotify/build.gradle.kts +++ b/android/feature/spotify/build.gradle.kts @@ -10,20 +10,20 @@ android { } dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) implementation(libs.androidx.core) implementation(libs.circuit.foundation) - implementation(libs.koin.core) implementation(libs.compose.foundation) implementation(libs.compose.material3) implementation(libs.compose.ui) implementation(libs.compose.ui.preview) - implementation(libs.paging.compose) + implementation(libs.koin.core) implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.shared.domain) + implementation(projects.ui.common) debugImplementation(libs.compose.ui.tooling) - testImplementation(projects.ui.test.screenshot) testImplementation(libs.test.parameter.injector) + testImplementation(projects.ui.test.screenshot) } diff --git a/core/logging/implementation/build.gradle.kts b/core/logging/implementation/build.gradle.kts index 5b2cf8f6a4..0d0ac1af89 100644 --- a/core/logging/implementation/build.gradle.kts +++ b/core/logging/implementation/build.gradle.kts @@ -11,14 +11,14 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.core.logging.api) - implementation(libs.koin.core) - } + implementation(libs.koin.core) + implementation(projects.core.logging.api) + } } val androidMain by getting { dependencies { - implementation(libs.timber) - } + implementation(libs.timber) + } } } } diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts index e6e61a7a8d..ae778baf1c 100644 --- a/core/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -11,11 +11,11 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.coroutines) - implementation(libs.koin.core) - implementation(libs.androidx.datastore.preferences.core) - } + implementation(libs.androidx.datastore.preferences.core) + implementation(libs.koin.core) + implementation(projects.core.coroutines) + implementation(projects.shared.domain) + } } val jvmCommon by creating { dependsOn(commonMain) @@ -26,8 +26,8 @@ kotlin { val androidMain by getting { dependsOn(jvmCommon) dependencies { - implementation(libs.androidx.datastore.preferences.android) - } + implementation(libs.androidx.datastore.preferences.android) + } } } } diff --git a/data/common/network/build.gradle.kts b/data/common/network/build.gradle.kts index df66a4d739..175625b2a7 100644 --- a/data/common/network/build.gradle.kts +++ b/data/common/network/build.gradle.kts @@ -12,38 +12,39 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.core.logging.api) - implementation(libs.koin.core) -// implementation(project.dependencies.platform(libs.ktor.bom)) - implementation(libs.ktor.client.content.negotiation) - implementation(libs.ktor.client.core) - implementation(libs.ktor.serialization.kotlinx.json) - } + implementation(libs.koin.core) + // implementation(project.dependencies.platform(libs.ktor.bom)) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.client.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(projects.core.logging.api) + } } val jvmMain by getting { dependencies { - implementation(libs.bundles.ktor.jvm) - } + implementation(libs.bundles.ktor.jvm) + } } val androidMain by getting { dependencies { - implementation(libs.bundles.ktor.jvm) - } + implementation(libs.bundles.ktor.jvm) + } } val iosMain by getting { dependencies { - implementation(libs.ktor.client.darwin) - } + implementation(libs.ktor.client.darwin) + } } val commonTest by getting { dependencies { - implementation(libs.junit) - } + implementation(libs.junit) + } } } } dependencies { - debugImplementation(libs.chucker) releaseImplementation(libs.chucker.noop) + + debugImplementation(libs.chucker) } diff --git a/data/coverart/build.gradle.kts b/data/coverart/build.gradle.kts index 2e2df3649e..f66774a8b6 100644 --- a/data/coverart/build.gradle.kts +++ b/data/coverart/build.gradle.kts @@ -7,18 +7,18 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.logging.api) - implementation(libs.koin.core) -// implementation(project.dependencies.platform(libs.ktor.bom)) - implementation(libs.ktor.client.core) - implementation(libs.ktor.serialization.kotlinx.json) - } + implementation(libs.koin.core) + // implementation(project.dependencies.platform(libs.ktor.bom)) + implementation(libs.ktor.client.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(projects.core.logging.api) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(libs.kotlin.test) - } + implementation(libs.kotlin.test) + } } } } diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts index d78d499989..b35a7125f9 100644 --- a/data/database/build.gradle.kts +++ b/data/database/build.gradle.kts @@ -9,21 +9,21 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.coroutines) - implementation(projects.data.musicbrainz) - implementation(libs.koin.core) - implementation(libs.kotlinx.collections.immutable) - implementation(libs.paging.common) - implementation(libs.sqldelight.coroutines) - implementation(libs.sqldelight.paging) - implementation(libs.sqldelight.primitive) - } + implementation(libs.koin.core) + implementation(libs.kotlinx.collections.immutable) + implementation(libs.paging.common) + implementation(libs.sqldelight.coroutines) + implementation(libs.sqldelight.paging) + implementation(libs.sqldelight.primitive) + implementation(projects.core.coroutines) + implementation(projects.data.musicbrainz) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(libs.junit) - } + implementation(libs.junit) + } } val jvmCommon by creating { dependsOn(commonMain) @@ -31,19 +31,19 @@ kotlin { val androidMain by getting { dependsOn(jvmCommon) dependencies { - implementation(libs.sqldelight.android.driver) - } + implementation(libs.sqldelight.android.driver) + } } val jvmMain by getting { dependsOn(jvmCommon) dependencies { - implementation(libs.sqldelight.sqlite.driver) - } + implementation(libs.sqldelight.sqlite.driver) + } } val iosMain by getting { dependencies { - implementation(libs.sqldelight.native.driver) - } + implementation(libs.sqldelight.native.driver) + } } } } diff --git a/data/musicbrainz/build.gradle.kts b/data/musicbrainz/build.gradle.kts index 8e3f44addb..8b601f7846 100644 --- a/data/musicbrainz/build.gradle.kts +++ b/data/musicbrainz/build.gradle.kts @@ -44,42 +44,41 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.logging.api) - implementation(libs.koin.core) - implementation(libs.androidx.datastore.preferences.core) -// implementation(project.dependencies.platform(libs.ktor.bom)) - implementation(libs.ktor.client.auth) - implementation(libs.ktor.client.core) - implementation(libs.ktor.serialization.kotlinx.json) - } + implementation(libs.androidx.datastore.preferences.core) + implementation(libs.koin.core) + // implementation(project.dependencies.platform(libs.ktor.bom)) + implementation(libs.ktor.client.auth) + implementation(libs.ktor.client.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(projects.core.logging.api) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(libs.junit) - implementation(libs.koin.test) - } + implementation(libs.junit) + implementation(libs.koin.test) + } } val androidMain by getting { dependencies { - implementation(libs.androidx.activity.compose) - implementation(libs.appauth) - } + implementation(libs.androidx.activity.compose) + implementation(libs.appauth) + } } val jvmMain by getting { dependencies { - implementation(libs.scribejava) - } + implementation(libs.scribejava) + } } val jvmTest by getting { dependencies { - implementation(libs.mockk) - } + implementation(libs.mockk) + } } val iosMain by getting { dependencies { - // TODO: OAuth - } + } } } } diff --git a/data/repository/build.gradle.kts b/data/repository/build.gradle.kts index 113e93be70..52dc89989f 100644 --- a/data/repository/build.gradle.kts +++ b/data/repository/build.gradle.kts @@ -23,37 +23,37 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.data.database) - implementation(projects.data.musicbrainz) - implementation(projects.data.common.network) - implementation(projects.core.logging.api) - implementation(libs.koin.core) - implementation(libs.kotlinx.collections.immutable) - implementation(libs.kotlinx.coroutines.core) - implementation(libs.paging.common) - } + implementation(libs.koin.core) + implementation(libs.kotlinx.collections.immutable) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.paging.common) + implementation(projects.core.logging.api) + implementation(projects.data.common.network) + implementation(projects.data.database) + implementation(projects.data.musicbrainz) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(projects.testData) - implementation(projects.core.coroutines) - implementation(libs.kotlin.test) - implementation(libs.koin.test) - implementation(libs.junit) - implementation(libs.kotlinx.coroutines.test) - implementation(libs.androidx.paging.testing) - } + implementation(libs.androidx.paging.testing) + implementation(libs.junit) + implementation(libs.koin.test) + implementation(libs.kotlin.test) + implementation(libs.kotlinx.coroutines.test) + implementation(projects.core.coroutines) + implementation(projects.testData) + } } val androidUnitTest by getting { dependencies { - implementation(libs.sqldelight.sqlite.driver) - } + implementation(libs.sqldelight.sqlite.driver) + } } val jvmTest by getting { dependencies { - implementation(libs.sqldelight.sqlite.driver) - } + implementation(libs.sqldelight.sqlite.driver) + } } } } diff --git a/data/spotify/build.gradle.kts b/data/spotify/build.gradle.kts index 95283ea681..3c849abb25 100644 --- a/data/spotify/build.gradle.kts +++ b/data/spotify/build.gradle.kts @@ -38,21 +38,21 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.logging.api) - implementation(libs.androidx.datastore.preferences.core) - implementation(libs.koin.core) - implementation(libs.kotlinx.coroutines.core) -// implementation(project.dependencies.platform(libs.ktor.bom)) - implementation(libs.ktor.client.auth) - implementation(libs.ktor.client.core) - implementation(libs.ktor.serialization.kotlinx.json) - } + implementation(libs.androidx.datastore.preferences.core) + implementation(libs.koin.core) + implementation(libs.kotlinx.coroutines.core) + // implementation(project.dependencies.platform(libs.ktor.bom)) + implementation(libs.ktor.client.auth) + implementation(libs.ktor.client.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(projects.core.logging.api) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(libs.junit) - } + implementation(libs.junit) + } } } } diff --git a/data/wikimedia/build.gradle.kts b/data/wikimedia/build.gradle.kts index 2e2df3649e..f66774a8b6 100644 --- a/data/wikimedia/build.gradle.kts +++ b/data/wikimedia/build.gradle.kts @@ -7,18 +7,18 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.core.logging.api) - implementation(libs.koin.core) -// implementation(project.dependencies.platform(libs.ktor.bom)) - implementation(libs.ktor.client.core) - implementation(libs.ktor.serialization.kotlinx.json) - } + implementation(libs.koin.core) + // implementation(project.dependencies.platform(libs.ktor.bom)) + implementation(libs.ktor.client.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(projects.core.logging.api) + implementation(projects.shared.domain) + } } val commonTest by getting { dependencies { - implementation(libs.kotlin.test) - } + implementation(libs.kotlin.test) + } } } } diff --git a/desktop/app/build.gradle.kts b/desktop/app/build.gradle.kts index 3613122d3b..ba344e649c 100644 --- a/desktop/app/build.gradle.kts +++ b/desktop/app/build.gradle.kts @@ -18,20 +18,21 @@ aboutLibraries { } dependencies { - implementation(projects.shared) + linuxAmd64(compose.desktop.linux_x64) - // TODO: eventually, the only dependent project should be shared - // where shared exposes the root entry point - implementation(projects.ui.common) - implementation(projects.core.preferences) + macAarch64(compose.desktop.macos_arm64) - linuxAmd64(compose.desktop.linux_x64) macAmd64(compose.desktop.macos_x64) - macAarch64(compose.desktop.macos_arm64) + windowsAmd64(compose.desktop.windows_x64) implementation(libs.circuit.foundation) implementation(libs.koin.core) + implementation(projects.core.preferences) + implementation(projects.shared) + // TODO: eventually, the only dependent project should be shared + // where shared exposes the root entry point + implementation(projects.ui.common) } // region Work around temporary Compose bugs. diff --git a/konsist-test/build.gradle.kts b/konsist-test/build.gradle.kts index 5fa2554b9f..b5f7d72f9c 100644 --- a/konsist-test/build.gradle.kts +++ b/konsist-test/build.gradle.kts @@ -13,8 +13,8 @@ kotlin { val androidMain by getting val androidUnitTest by getting { dependencies { - implementation(libs.compose.ui.preview) - } + implementation(libs.compose.ui.preview) + } } } } @@ -24,8 +24,8 @@ tasks.withType { } dependencies { - testImplementation(projects.ui.core) + testImplementation(libs.junit.jupiter.engine) // https://github.com/LemonAppDev/konsist/blob/main/samples/starter-projects/konsist-starter-kmp-gradle-kotlin-junit5/konsistTest/build.gradle.kts testImplementation(libs.konsist) - testImplementation(libs.junit.jupiter.engine) + testImplementation(projects.ui.core) } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 8f2eb6d289..c23d3c496f 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -14,48 +14,46 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.core.coroutines) - implementation(projects.core.logging.implementation) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.data.common.network) - implementation(projects.data.coverart) - implementation(projects.data.database) - implementation(projects.data.musicbrainz) - implementation(projects.data.repository) - implementation(projects.data.spotify) - implementation(projects.data.wikimedia) - implementation(projects.shared.feature.collections) - implementation(projects.shared.feature.graph) - implementation(projects.shared.feature.history) - implementation(projects.shared.feature.images) - implementation(projects.shared.feature.search) - implementation(projects.shared.feature.settings) - implementation(projects.shared.feature.licenses) - implementation(projects.shared.feature.details) - implementation(projects.shared.feature.stats) - implementation(projects.ui.common) - implementation(projects.ui.image) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.materialIconsExtended) - implementation(compose.ui) - - implementation(libs.koin.core) - implementation(libs.circuit.foundation) - implementation(libs.circuit.overlay) - implementation(libs.circuitx.gesture.navigation) - implementation(libs.windowSizeClass) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.circuit.overlay) + implementation(libs.circuitx.gesture.navigation) + implementation(libs.koin.core) + implementation(libs.windowSizeClass) + implementation(projects.core.coroutines) + implementation(projects.core.logging.implementation) + implementation(projects.core.preferences) + implementation(projects.data.common.network) + implementation(projects.data.coverart) + implementation(projects.data.database) + implementation(projects.data.musicbrainz) + implementation(projects.data.repository) + implementation(projects.data.spotify) + implementation(projects.data.wikimedia) + implementation(projects.shared.domain) + implementation(projects.shared.feature.collections) + implementation(projects.shared.feature.details) + implementation(projects.shared.feature.graph) + implementation(projects.shared.feature.history) + implementation(projects.shared.feature.images) + implementation(projects.shared.feature.licenses) + implementation(projects.shared.feature.search) + implementation(projects.shared.feature.settings) + implementation(projects.shared.feature.stats) + implementation(projects.ui.common) + implementation(projects.ui.image) + } } val androidMain by getting { dependencies { - implementation(projects.android.feature.nowplaying) - implementation(projects.android.feature.spotify) - implementation(projects.ui.core) - implementation(compose.preview) - } + implementation(compose.preview) + implementation(projects.android.feature.nowplaying) + implementation(projects.android.feature.spotify) + implementation(projects.ui.core) + } } targets.withType().configureEach { diff --git a/shared/feature/collections/build.gradle.kts b/shared/feature/collections/build.gradle.kts index 9e1ba3e858..f468280f84 100644 --- a/shared/feature/collections/build.gradle.kts +++ b/shared/feature/collections/build.gradle.kts @@ -14,35 +14,33 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.materialIconsExtended) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.circuit.overlay) - implementation(libs.circuitx.overlays) - implementation(libs.koin.core) - implementation(libs.paging.common) - implementation(libs.paging.compose) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.circuit.overlay) + implementation(libs.circuitx.overlays) + implementation(libs.koin.core) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.core.preferences) + implementation(projects.shared.domain) + implementation(projects.ui.common) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - } + implementation(compose.preview) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - implementation(libs.test.parameter.injector) - implementation(libs.bundles.kotlinx.coroutines) - } + implementation(libs.bundles.kotlinx.coroutines) + implementation(libs.test.parameter.injector) + implementation(projects.ui.test.screenshot) + } } } } diff --git a/shared/feature/details/build.gradle.kts b/shared/feature/details/build.gradle.kts index 7d650d27e2..2800a85121 100644 --- a/shared/feature/details/build.gradle.kts +++ b/shared/feature/details/build.gradle.kts @@ -14,60 +14,58 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.core.logging.api) - implementation(projects.data.common.network) - implementation(projects.data.spotify) - implementation(projects.data.musicbrainz) - implementation(projects.data.database) - implementation(projects.ui.image) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.materialIconsExtended) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.circuit.overlay) - implementation(libs.circuit.retained) - implementation(libs.circuitx.overlays) - implementation(libs.koin.core) - implementation(libs.paging.common) - implementation(libs.paging.compose) - implementation(libs.kotlinx.collections.immutable) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.circuit.overlay) + implementation(libs.circuit.retained) + implementation(libs.circuitx.overlays) + implementation(libs.koin.core) + implementation(libs.kotlinx.collections.immutable) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.core.logging.api) + implementation(projects.core.preferences) + implementation(projects.data.common.network) + implementation(projects.data.database) + implementation(projects.data.musicbrainz) + implementation(projects.data.spotify) + implementation(projects.shared.domain) + implementation(projects.ui.common) + implementation(projects.ui.image) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - } + implementation(compose.preview) + } } val androidUnitTest by getting { dependencies { - implementation(projects.testData) - implementation(projects.ui.test.screenshot) - implementation(libs.test.parameter.injector) - implementation(libs.bundles.kotlinx.coroutines) - implementation(libs.junit) - implementation(libs.koin.test) - } + implementation(libs.bundles.kotlinx.coroutines) + implementation(libs.junit) + implementation(libs.koin.test) + implementation(libs.test.parameter.injector) + implementation(projects.testData) + implementation(projects.ui.test.screenshot) + } } val androidInstrumentedTest by getting { dependencies { - implementation(projects.testData) - implementation(libs.androidx.test.junit) - implementation(libs.androidx.test.espresso.core) - implementation(libs.androidx.arch.core.testing) - implementation(libs.bundles.kotlinx.coroutines) - implementation(libs.compose.ui.test) - implementation(libs.koin.test) - implementation(libs.sqldelight.android.driver) - implementation(libs.test.parameter.injector) - implementation(libs.circuit.test) - } + implementation(libs.androidx.arch.core.testing) + implementation(libs.androidx.test.espresso.core) + implementation(libs.androidx.test.junit) + implementation(libs.bundles.kotlinx.coroutines) + implementation(libs.circuit.test) + implementation(libs.compose.ui.test) + implementation(libs.koin.test) + implementation(libs.sqldelight.android.driver) + implementation(libs.test.parameter.injector) + implementation(projects.testData) + } } } } diff --git a/shared/feature/graph/build.gradle.kts b/shared/feature/graph/build.gradle.kts index 5952da348f..b98fa9139e 100644 --- a/shared/feature/graph/build.gradle.kts +++ b/shared/feature/graph/build.gradle.kts @@ -13,37 +13,34 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.ui.image) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - implementation(libs.paging.common) - implementation(libs.paging.compose) - implementation(libs.kotlinx.datetime) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(libs.kotlinx.datetime) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.core.preferences) + implementation(projects.shared.domain) + implementation(projects.ui.common) + implementation(projects.ui.image) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - } + implementation(compose.preview) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) -// implementation(libs.junit.jupiter.engine) - implementation(libs.kotlinx.coroutines.test) - implementation(libs.turbine) - implementation(projects.ui.test.screenshot) - // TODO: cannot use junit5 until screenshot base class stops using junit4 - implementation(libs.junit) - } + // TODO: cannot use junit5 until screenshot base class stops using junit4 + implementation(libs.junit) + // implementation(libs.junit.jupiter.engine) + implementation(libs.kotlinx.coroutines.test) + implementation(libs.turbine) + implementation(projects.ui.test.screenshot) + } } } } diff --git a/shared/feature/history/build.gradle.kts b/shared/feature/history/build.gradle.kts index c3084dfa60..d977885792 100644 --- a/shared/feature/history/build.gradle.kts +++ b/shared/feature/history/build.gradle.kts @@ -13,30 +13,28 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.ui.image) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - implementation(libs.paging.common) - implementation(libs.paging.compose) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.core.preferences) + implementation(projects.shared.domain) + implementation(projects.ui.common) + implementation(projects.ui.image) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - } + implementation(compose.preview) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - } + implementation(projects.ui.test.screenshot) + } } } } diff --git a/shared/feature/images/build.gradle.kts b/shared/feature/images/build.gradle.kts index 98f92f406a..8ef135b7b5 100644 --- a/shared/feature/images/build.gradle.kts +++ b/shared/feature/images/build.gradle.kts @@ -13,32 +13,30 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.ui.image) - implementation(projects.ui.common) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.materialIconsExtended) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - implementation(libs.windowSizeClass) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(libs.windowSizeClass) + implementation(projects.shared.domain) + implementation(projects.ui.common) + implementation(projects.ui.image) + } } val androidMain by getting { dependencies { - implementation(projects.test.image) - implementation(compose.preview) - } + implementation(compose.preview) + implementation(projects.test.image) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - implementation(libs.junit) - } + implementation(libs.junit) + implementation(projects.ui.test.screenshot) + } } } } diff --git a/shared/feature/licenses/build.gradle.kts b/shared/feature/licenses/build.gradle.kts index 701876205e..2c65918ef3 100644 --- a/shared/feature/licenses/build.gradle.kts +++ b/shared/feature/licenses/build.gradle.kts @@ -13,17 +13,15 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.aboutlibraries.compose.m3) - implementation(libs.aboutlibraries.core) - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(libs.aboutlibraries.compose.m3) + implementation(libs.aboutlibraries.core) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(projects.ui.common) + } } } } diff --git a/shared/feature/search/build.gradle.kts b/shared/feature/search/build.gradle.kts index e70b7d1cb1..1bafadb096 100644 --- a/shared/feature/search/build.gradle.kts +++ b/shared/feature/search/build.gradle.kts @@ -12,18 +12,16 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - implementation(libs.paging.common) - implementation(libs.paging.compose) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.shared.domain) + implementation(projects.ui.common) + } } val androidMain by getting val jvmMain by getting @@ -32,5 +30,6 @@ kotlin { dependencies { implementation(compose.preview) + debugImplementation(compose.uiTooling) } diff --git a/shared/feature/settings/build.gradle.kts b/shared/feature/settings/build.gradle.kts index c2cd0c071e..4409db2b65 100644 --- a/shared/feature/settings/build.gradle.kts +++ b/shared/feature/settings/build.gradle.kts @@ -25,38 +25,37 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.core.preferences) - implementation(projects.data.musicbrainz) // TODO: remove after extracting MusicBrainzAuthStore - - implementation(compose.foundation) - implementation(compose.materialIconsExtended) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - } + // TODO: remove after extracting MusicBrainzAuthStore + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(projects.core.preferences) + implementation(projects.data.musicbrainz) + implementation(projects.shared.domain) + implementation(projects.ui.common) + } } val androidMain by getting { dependencies { - implementation(libs.appauth) - - implementation(libs.androidx.activity.compose) - } + implementation(libs.androidx.activity.compose) + implementation(libs.appauth) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - implementation(libs.test.parameter.injector) - implementation(libs.bundles.kotlinx.coroutines) - } + implementation(libs.bundles.kotlinx.coroutines) + implementation(libs.test.parameter.injector) + implementation(projects.ui.test.screenshot) + } } } } dependencies { implementation(compose.preview) + debugImplementation(compose.uiTooling) } diff --git a/shared/feature/stats/build.gradle.kts b/shared/feature/stats/build.gradle.kts index dfeedbef4c..9b4f6e6fc6 100644 --- a/shared/feature/stats/build.gradle.kts +++ b/shared/feature/stats/build.gradle.kts @@ -13,29 +13,28 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.ui.common) - implementation(projects.shared.domain) - implementation(projects.data.database) - - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.kotlinx.collections.immutable) - implementation(libs.circuit.foundation) - implementation(libs.koin.core) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.koin.core) + implementation(libs.kotlinx.collections.immutable) + implementation(projects.data.database) + implementation(projects.shared.domain) + implementation(projects.ui.common) + } } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - implementation(libs.test.parameter.injector) - } + implementation(libs.test.parameter.injector) + implementation(projects.ui.test.screenshot) + } } } } dependencies { implementation(compose.preview) + debugImplementation(compose.uiTooling) } diff --git a/test-data/build.gradle.kts b/test-data/build.gradle.kts index 737d3cb785..5627770a9b 100644 --- a/test-data/build.gradle.kts +++ b/test-data/build.gradle.kts @@ -6,13 +6,13 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.data.common.network) - implementation(projects.data.musicbrainz) - implementation(projects.data.coverart) - implementation(projects.data.spotify) - implementation(libs.koin.core) - } + implementation(libs.koin.core) + implementation(projects.data.common.network) + implementation(projects.data.coverart) + implementation(projects.data.musicbrainz) + implementation(projects.data.spotify) + implementation(projects.shared.domain) + } } } } diff --git a/ui/common/build.gradle.kts b/ui/common/build.gradle.kts index e8847ea2d8..3f80e19311 100644 --- a/ui/common/build.gradle.kts +++ b/ui/common/build.gradle.kts @@ -16,28 +16,27 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(projects.shared.domain) - api(projects.ui.core) - implementation(projects.data.coverart) - implementation(projects.data.musicbrainz) - implementation(projects.core.preferences) - implementation(projects.core.logging.api) - implementation(projects.ui.image) + api(projects.shared.domain) + api(projects.ui.core) - implementation(compose.foundation) - implementation(compose.materialIconsExtended) - implementation(compose.material) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.circuit.foundation) - implementation(libs.circuit.overlay) - implementation(libs.circuitx.overlays) - implementation(libs.koin.core) - implementation(libs.lyricist.library) - implementation(libs.paging.common) - implementation(libs.paging.compose) - } + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.circuit.foundation) + implementation(libs.circuit.overlay) + implementation(libs.circuitx.overlays) + implementation(libs.koin.core) + implementation(libs.lyricist.library) + implementation(libs.paging.common) + implementation(libs.paging.compose) + implementation(projects.core.logging.api) + implementation(projects.core.preferences) + implementation(projects.data.coverart) + implementation(projects.data.musicbrainz) + implementation(projects.ui.image) + } } val jvmCommon by creating { dependsOn(commonMain) @@ -45,23 +44,23 @@ kotlin { val androidMain by getting { dependsOn(jvmCommon) dependencies { - implementation(libs.androidx.activity.compose) - } + implementation(libs.androidx.activity.compose) + } } val jvmMain by getting { dependsOn(jvmCommon) } val androidUnitTest by getting { dependencies { - implementation(projects.ui.test.screenshot) - implementation(libs.test.parameter.injector) - implementation(libs.koin.test) - } + implementation(libs.koin.test) + implementation(libs.test.parameter.injector) + implementation(projects.ui.test.screenshot) + } } val commonTest by getting { dependencies { - implementation(libs.kotlin.test) - } + implementation(libs.kotlin.test) + } } } @@ -86,5 +85,6 @@ kotlin { dependencies { implementation(compose.preview) + debugImplementation(compose.uiTooling) } diff --git a/ui/core/build.gradle.kts b/ui/core/build.gradle.kts index bfce62bd11..6f8e75fba2 100644 --- a/ui/core/build.gradle.kts +++ b/ui/core/build.gradle.kts @@ -13,17 +13,17 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api(projects.shared.strings) - implementation(libs.lyricist.library) + api(projects.shared.strings) - implementation(compose.foundation) - implementation(compose.material3) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(libs.lyricist.library) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - } + implementation(compose.preview) + } } } } diff --git a/ui/image/build.gradle.kts b/ui/image/build.gradle.kts index 6b86696e39..d181221842 100644 --- a/ui/image/build.gradle.kts +++ b/ui/image/build.gradle.kts @@ -12,33 +12,32 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(projects.shared.domain) - implementation(projects.ui.core) - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.materialIconsExtended) - implementation(compose.ui) - implementation(libs.koin.core) - - implementation(libs.coil) - implementation(libs.coil.compose) - } + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.materialIconsExtended) + implementation(compose.ui) + implementation(libs.coil) + implementation(libs.coil.compose) + implementation(libs.koin.core) + implementation(projects.shared.domain) + implementation(projects.ui.core) + } } val androidMain by getting { dependencies { - implementation(compose.preview) - implementation(libs.coil.network.okhttp) - } + implementation(compose.preview) + implementation(libs.coil.network.okhttp) + } } val jvmMain by getting { dependencies { - implementation(libs.coil.network.okhttp) - } + implementation(libs.coil.network.okhttp) + } } val iosMain by getting { dependencies { - implementation(libs.coil.network.ktor2) - } + implementation(libs.coil.network.ktor2) + } } } } diff --git a/ui/test/screenshot/build.gradle.kts b/ui/test/screenshot/build.gradle.kts index b316171a2b..96120cbaa7 100644 --- a/ui/test/screenshot/build.gradle.kts +++ b/ui/test/screenshot/build.gradle.kts @@ -9,14 +9,13 @@ android { } dependencies { - implementation(projects.ui.core) - implementation(projects.test.image) - + implementation(libs.bundles.kotlinx.coroutines) implementation(libs.coil.compose) implementation(libs.coil.test) - implementation(libs.bundles.kotlinx.coroutines) implementation(libs.compose.foundation) implementation(libs.compose.material3) implementation(libs.paparazzi) implementation(libs.test.parameter.injector) + implementation(projects.test.image) + implementation(projects.ui.core) }