Updated dependencies, extracted versions

2022-04-03 19:44:04 +01:00 · 2022-04-03 19:44:04 +01:00 · e4a4b7eeb1
commit e4a4b7eeb1
--- a/app/build.gradle
+++ b/app/build.gradle
@ -19,6 +19,9 @@ android {
        resConfigs "en,ru"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary true
+        }

        kapt {
            arguments {
@ -39,11 +42,11 @@ android {
        }
    }
    buildFeatures {
+        compose true
        viewBinding true
    }
-    testOptions {
-        animationsDisabled true
-        unitTests.includeAndroidResources true
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
@ -52,40 +55,61 @@ android {
    kotlinOptions {
        jvmTarget = JavaVersion.VERSION_11.toString()
    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
+    testOptions {
+        animationsDisabled true
+        unitTests.includeAndroidResources true
+    }
 }

 dependencies {
    implementation project(":base")
-    implementation "androidx.core:core-splashscreen:1.0.0-beta02"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-    implementation "androidx.navigation:navigation-runtime-ktx:2.4.1"
-    implementation "androidx.navigation:navigation-fragment-ktx:2.4.1"
-    implementation "androidx.navigation:navigation-ui-ktx:2.4.1"
-    implementation "androidx.room:room-runtime:2.4.2"
-    implementation "androidx.room:room-ktx:2.4.2"
-    kapt "androidx.room:room-compiler:2.4.2"
+    implementation "androidx.core:core-ktx:$core_ktx_version"
+    implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation "com.google.android.material:material:$material_version"
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
+    implementation "org.osmdroid:osmdroid-android:$osmdroid_version"

-    implementation "com.google.android.material:material:1.5.0"
-    implementation "com.google.dagger:hilt-android:2.41"
-    kapt "com.google.dagger:hilt-compiler:2.41"
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.compose.animation:animation:$compose_version"
+    implementation "androidx.compose.foundation:foundation:$compose_version"
+    implementation "androidx.activity:activity-compose:$activity_compose_version"
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    implementation "com.google.android.material:compose-theme-adapter:$material_adapter_version"

-    implementation "org.osmdroid:osmdroid-android:6.1.11"
-
-    debugImplementation "androidx.fragment:fragment-testing:1.4.1"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1"
-    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:4.4.0"
-    testImplementation "org.robolectric:robolectric:4.7.3"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test.ext:truth:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "org.mockito:mockito-android:4.4.0"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    debugImplementation "androidx.fragment:fragment-testing:$fragment_test_version"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "org.robolectric:robolectric:$robolectric_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
+    androidTestImplementation "androidx.test:core:$androidx_test_version"
+    androidTestImplementation "androidx.test:runner:$androidx_test_version"
+    androidTestImplementation "androidx.test:rules:$androidx_test_version"
+    androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
+    androidTestImplementation "androidx.test.ext:truth:$androidx_test_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
 }
--- a/base/build.gradle
+++ b/base/build.gradle
@ -12,10 +12,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }

 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
-    implementation "org.json:json:20220320"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_test_version"
+    implementation "org.json:json:$json_version"

-    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:4.4.0"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
 }
--- a/build.gradle
+++ b/build.gradle
@ -1,14 +1,42 @@
 buildscript {
+    ext {
+        hilt_version = '2.41'
+        safe_args_version = '2.4.1'
+        application_version = '7.1.2'
+        library_version = '7.1.2'
+        kotlin_android_version = '1.6.10'
+        core_ktx_version = '1.7.0'
+        core_splashscreen_version = '1.0.0-beta02'
+        constraint_version = '2.1.3'
+        lifecycle_version = '2.4.1'
+        navigation_version = '2.4.1'
+        room_version = '2.4.2'
+        material_version = '1.5.0'
+        osmdroid_version = '6.1.11'
+        json_version = '20220320'
+        compose_version = '1.1.1'
+        activity_compose_version = '1.4.0'
+        material_adapter_version = '1.1.6'
+        fragment_test_version = '1.4.1'
+        leakcanary_version = '2.8.1'
+        junit_version = '4.13.2'
+        mockito_version = '4.4.0'
+        robolectric_version = '4.7.3'
+        coroutines_test_version = '1.6.0'
+        androidx_test_version = '1.4.0'
+        androidx_junit_version = '1.1.3'
+        espresso_version = '3.4.0'
+    }
    dependencies {
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.41"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$safe_args_version"
    }
 }

 plugins {
-    id "com.android.application" version "7.1.2" apply false
-    id "com.android.library" version "7.1.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.6.10" apply false
+    id "com.android.application" version "$application_version" apply false
+    id "com.android.library" version "$library_version" apply false
+    id "org.jetbrains.kotlin.android" version "$kotlin_android_version" apply false
 }

 task clean(type: Delete) {