Merge pull request #624 from SimonMarquis/gradle-sort

Sort and group Gradle dependencies

Author: mmoczkowski

app-nia-catalog/build.gradle.kts

@@ -65,9 +65,8 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:ui"))
     implementation(project(":core:designsystem"))
-
-    implementation(libs.androidx.activity.compose)
+    implementation(project(":core:ui"))
     implementation(libs.accompanist.flowlayout)
+    implementation(libs.androidx.activity.compose)
 }

benchmarks/build.gradle.kts

@@ -68,13 +68,13 @@ android {
 }
 
 dependencies {
+    implementation(libs.androidx.benchmark.macro)
     implementation(libs.androidx.test.core)
     implementation(libs.androidx.test.espresso.core)
     implementation(libs.androidx.test.ext)
-    implementation(libs.androidx.test.runner)
     implementation(libs.androidx.test.rules)
+    implementation(libs.androidx.test.runner)
     implementation(libs.androidx.test.uiautomator)
-    implementation(libs.androidx.benchmark.macro)
 }
 
 androidComponents {

build-logic/convention/build.gradle.kts

@@ -27,9 +27,9 @@ java {
 
 dependencies {
     compileOnly(libs.android.gradlePlugin)
-    compileOnly(libs.kotlin.gradlePlugin)
-    compileOnly(libs.firebase.performance.gradle)
     compileOnly(libs.firebase.crashlytics.gradle)
+    compileOnly(libs.firebase.performance.gradle)
+    compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
 }
 

core/analytics/build.gradle.kts

@@ -24,10 +24,9 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlinx.coroutines.android)
+    implementation(platform(libs.firebase.bom))
     implementation(libs.androidx.compose.runtime)
     implementation(libs.androidx.core.ktx)
-
-    implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
+    implementation(libs.kotlinx.coroutines.android)
 }

core/data/build.gradle.kts

@@ -30,19 +30,17 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:analytics"))
     implementation(project(":core:common"))
-    implementation(project(":core:model"))
     implementation(project(":core:database"))
     implementation(project(":core:datastore"))
+    implementation(project(":core:model"))
     implementation(project(":core:network"))
-    implementation(project(":core:analytics"))
-
-    testImplementation(project(":core:testing"))
-    testImplementation(project(":core:datastore-test"))
-
     implementation(libs.androidx.core.ktx)
-
-    implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.serialization.json)
+
+    testImplementation(project(":core:datastore-test"))
+    testImplementation(project(":core:testing"))
 }

core/datastore-test/build.gradle.kts

@@ -24,8 +24,8 @@ android {
 
 dependencies {
     api(project(":core:datastore"))
+    api(libs.androidx.dataStore.core)
+
     implementation(project(":core:common"))
     implementation(project(":core:testing"))
-
-    api(libs.androidx.dataStore.core)
 }

core/datastore/build.gradle.kts

@@ -57,12 +57,10 @@ protobuf {
 dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:model"))
-
-    testImplementation(project(":core:testing"))
-    testImplementation(project(":core:datastore-test"))
-
-    implementation(libs.kotlinx.coroutines.android)
-
     implementation(libs.androidx.dataStore.core)
+    implementation(libs.kotlinx.coroutines.android)
     implementation(libs.protobuf.kotlin.lite)
+
+    testImplementation(project(":core:datastore-test"))
+    testImplementation(project(":core:testing"))
 }

core/designsystem/build.gradle.kts

@@ -30,16 +30,20 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.coil.kt.compose)
+    lintPublish(project(":lint"))
+
     api(libs.androidx.compose.foundation)
     api(libs.androidx.compose.foundation.layout)
     api(libs.androidx.compose.material.iconsExtended)
     api(libs.androidx.compose.material3)
-    debugApi(libs.androidx.compose.ui.tooling)
+    api(libs.androidx.compose.runtime)
     api(libs.androidx.compose.ui.tooling.preview)
     api(libs.androidx.compose.ui.util)
-    api(libs.androidx.compose.runtime)
-    lintPublish(project(":lint"))
+
+    debugApi(libs.androidx.compose.ui.tooling)
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.coil.kt.compose)
+
     androidTestImplementation(project(":core:testing"))
 }

core/domain/build.gradle.kts

@@ -24,15 +24,13 @@ android {
 }
 
 dependencies {
-
     implementation(project(":core:data"))
     implementation(project(":core:model"))
-
-    testImplementation(project(":core:testing"))
-
+    implementation(libs.hilt.android)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.datetime)
 
-    implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
+
+    testImplementation(project(":core:testing"))
 }

core/network/build.gradle.kts

@@ -41,17 +41,14 @@ secrets {
 dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:model"))
-
-    testImplementation(project(":core:testing"))
-
+    implementation(libs.coil.kt)
+    implementation(libs.coil.kt.svg)
     implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.datetime)
-
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.okhttp.logging)
     implementation(libs.retrofit.core)
     implementation(libs.retrofit.kotlin.serialization)
 
-    implementation(libs.coil.kt)
-    implementation(libs.coil.kt.svg)
+    testImplementation(project(":core:testing"))
 }