From 9eb32d2d85db939555f3815cbd9034f3a7df433b Mon Sep 17 00:00:00 2001 From: Zephyron Date: Mon, 3 Feb 2025 16:11:47 +1000 Subject: [PATCH] android: Reorganize and categorize gradle dependencies Improve organization of app dependencies in build.gradle.kts by grouping them into logical categories: - AndroidX Core & UI components - AndroidX Navigation - AndroidX Lifecycle - AndroidX Other components - Kotlin dependencies - Third party libraries This change makes the dependencies section more maintainable and easier to understand by providing clear visual separation between different types of dependencies. No actual dependency versions were changed. Also fixes minor formatting in runGitCommand function. --- src/android/app/build.gradle.kts | 41 ++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index b821e5a0e..df0429489 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -220,25 +220,38 @@ play { } dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0") + // AndroidX Core & UI implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.recyclerview:recyclerview:1.3.1") - implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.fragment:fragment-ktx:1.6.1") - implementation("androidx.documentfile:documentfile:1.0.1") - implementation("com.google.android.material:material:1.9.0") - implementation("androidx.preference:preference-ktx:1.2.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") - implementation("io.coil-kt:coil:2.2.2") implementation("androidx.core:core-splashscreen:1.0.1") - implementation("androidx.window:window:1.2.0-beta03") + implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.recyclerview:recyclerview:1.3.1") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + implementation("androidx.window:window:1.2.0-beta03") + implementation("com.google.android.material:material:1.9.0") + + // AndroidX Navigation implementation("androidx.navigation:navigation-fragment-ktx:2.7.4") implementation("androidx.navigation:navigation-ui-ktx:2.7.4") - implementation("info.debatty:java-string-similarity:2.0.0") + + // AndroidX Lifecycle + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") + + // AndroidX Other + implementation("androidx.documentfile:documentfile:1.0.1") + implementation("androidx.fragment:fragment-ktx:1.6.2") + implementation("androidx.preference:preference-ktx:1.2.1") + + // Kotlin + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") + + // Third Party Libraries + implementation("io.coil-kt:coil:2.2.2") + implementation("info.debatty:java-string-similarity:2.0.0") + +]] } fun runGitCommand(command: List): String { @@ -246,7 +259,9 @@ fun runGitCommand(command: List): String { ProcessBuilder(command) .directory(project.rootDir) .redirectOutput(ProcessBuilder.Redirect.PIPE) - .redirectError(ProcessBuilder.Redirect.PIPE) + + .redirectError(ProcessBuilder.Redirect.PIPE) + .start().inputStream.bufferedReader().use { it.readText() } .trim() } catch (e: Exception) {