Skip to content

chore: sort gradle dependencies automatically #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lydavid wants to merge 3 commits into
base: beta
Choose a base branch
from
Draft

chore: sort gradle dependencies automatically #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
999bfe3
chore: sort gradle dependencies automatically
lydavid Aug 19, 2024
75733a6
without bom
lydavid Aug 19, 2024
254aaf3
chore: sort gradle dependencies [skip ci]
github-actions[bot] Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/sort-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
28 changes: 14 additions & 14 deletions android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
14 changes: 6 additions & 8 deletions android/feature/nowplaying/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
10 changes: 5 additions & 5 deletions android/feature/spotify/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
6 changes: 5 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import java.io.BufferedReader

Expand All @@ -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)
Expand All @@ -33,6 +33,10 @@ buildscript {
}
}

allprojects {
apply(plugin = "com.squareup.sort-dependencies")
}

subprojects {
tasks.withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions {
Expand Down
10 changes: 5 additions & 5 deletions core/logging/implementation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
}
14 changes: 7 additions & 7 deletions core/preferences/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -26,8 +26,8 @@ kotlin {
val androidMain by getting {
dependsOn(jvmCommon)
dependencies {
implementation(libs.androidx.datastore.preferences.android)
}
implementation(libs.androidx.datastore.preferences.android)
}
}
}
}
33 changes: 17 additions & 16 deletions data/common/network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
18 changes: 9 additions & 9 deletions data/coverart/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
}
36 changes: 18 additions & 18 deletions data/database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@ 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)
}
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)
}
}
}
}
Expand Down
Loading