From bf80ae3cfd7de0a31e074dcdfdf1d72db6aaa1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Dan=C3=AD=C4=8Dek?= Date: Wed, 8 Nov 2023 12:30:41 +0100 Subject: [PATCH] Cleanup pt2 --- buildSrc/src/main/java/BuildValues.kt | 10 ++--- buildSrc/src/main/java/Dependencies.kt | 53 +++++++++++++------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/buildSrc/src/main/java/BuildValues.kt b/buildSrc/src/main/java/BuildValues.kt index 21a910a..5da619b 100644 --- a/buildSrc/src/main/java/BuildValues.kt +++ b/buildSrc/src/main/java/BuildValues.kt @@ -4,11 +4,11 @@ import org.gradle.api.JavaVersion * Created by MD on 18.10.23. */ object BuildValues { - val minSdk = 23 - val targetSdk = 33 - val compileSdk = 33 + const val minSdk = 23 + const val targetSdk = 33 + const val compileSdk = 33 val javaVersion : JavaVersion = JavaVersion.VERSION_1_8 - val jvmTarget = "1.8" - val kotlinCompilerExtensionVersion = "1.2.0" + const val jvmTarget = "1.8" + const val kotlinCompilerExtensionVersion = "1.2.0" } \ No newline at end of file diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 45a922f..a1eae66 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -2,54 +2,55 @@ * Created by MD on 18.10.23. */ object Versions { - val composeVersion = "1.1.1" - val koinVersion = "3.4.0" - val roomVersion = "2.5.1" + const val composeVersion = "1.1.1" + const val koinVersion = "3.4.0" + const val roomVersion = "2.5.1" } object Dependencies { - val core_ktx = "androidx.core:core-ktx:1.10.0" - val activity_compose = "androidx.activity:activity-compose:1.7.1" + const val core_ktx = "androidx.core:core-ktx:1.10.0" + const val activity_compose = "androidx.activity:activity-compose:1.7.1" - val lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" + const val lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1" /** * LIFECYCLE AWARE FLOW COLLECTION (for lifecycle aware viewstate collection in compose) */ - val lifecycle_runtime_compose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" + const val lifecycle_runtime_compose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" // COMPOSE - val compose_ui = "androidx.compose.ui:ui:${Versions.composeVersion}" + const val compose_ui = "androidx.compose.ui:ui:${Versions.composeVersion}" // val compose_ui_tooling_preview = "androidx.compose.ui:ui-tooling-preview:${Versions.composeVersion}" - val compose_ui_tooling_preview = "androidx.compose.ui:ui-tooling-preview:1.4.2" - val compose_material = "androidx.compose.material:material:${Versions.composeVersion}" - val compose_ui_tooling = "androidx.compose.ui:ui-tooling:${Versions.composeVersion}" - val compose_ui_test_manifest = "androidx.compose.ui:ui-test-manifest:${Versions.composeVersion}" - val compose_navigation = "androidx.navigation:navigation-compose:2.5.3" - val compose_ui_test_junit = "androidx.compose.ui:ui-test-junit4:${Versions.composeVersion}" + + const val compose_ui_tooling_preview = "androidx.compose.ui:ui-tooling-preview:1.4.2" + const val compose_material = "androidx.compose.material:material:${Versions.composeVersion}" + const val compose_ui_tooling = "androidx.compose.ui:ui-tooling:${Versions.composeVersion}" + const val compose_ui_test_manifest = "androidx.compose.ui:ui-test-manifest:${Versions.composeVersion}" + const val compose_navigation = "androidx.navigation:navigation-compose:2.5.3" + const val compose_ui_test_junit = "androidx.compose.ui:ui-test-junit4:${Versions.composeVersion}" /** * IMMUTABLE COLLECTIONS FOR KOTLIN (for composable methods stability) */ - val collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" + const val collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" // KOIN - val koin_core = "io.insert-koin:koin-core:${Versions.koinVersion}" - val koin_navigation = "io.insert-koin:koin-androidx-navigation:${Versions.koinVersion}" - val koin_compose = "io.insert-koin:koin-androidx-compose:${Versions.koinVersion}" - val koin_junit = "io.insert-koin:koin-test-junit4:${Versions.koinVersion}" + const val koin_core = "io.insert-koin:koin-core:${Versions.koinVersion}" + const val koin_navigation = "io.insert-koin:koin-androidx-navigation:${Versions.koinVersion}" + const val koin_compose = "io.insert-koin:koin-androidx-compose:${Versions.koinVersion}" + const val koin_junit = "io.insert-koin:koin-test-junit4:${Versions.koinVersion}" // ROOM - val room_runtime = "androidx.room:room-runtime:${Versions.roomVersion}" - val room_compiler = "androidx.room:room-compiler:${Versions.roomVersion}" - val room_room = "androidx.room:room-ktx:${Versions.roomVersion}" + const val room_runtime = "androidx.room:room-runtime:${Versions.roomVersion}" + const val room_compiler = "androidx.room:room-compiler:${Versions.roomVersion}" + const val room_room = "androidx.room:room-ktx:${Versions.roomVersion}" /** * DESUGARING (e.g. for LocalDate manipulation on API < 26) */ - val desugar = "com.android.tools:desugar_jdk_libs:1.2.2" + const val desugar = "com.android.tools:desugar_jdk_libs:1.2.2" // TESTS - val test_junit = "junit:junit:4.13.2" - val test_ext_junit = "androidx.test.ext:junit:1.1.5" - val test_espresso = "androidx.test.espresso:espresso-core:3.5.1" + const val test_junit = "junit:junit:4.13.2" + const val test_ext_junit = "androidx.test.ext:junit:1.1.5" + const val test_espresso = "androidx.test.espresso:espresso-core:3.5.1" } \ No newline at end of file