From 080a5b7b4e4a5cf0ff109fc442e70845bb4fccb5 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Tue, 31 May 2022 00:10:43 +0200
Subject: [PATCH] [android] Sorted dependencies

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 android/build.gradle      | 33 +++++++++++++--------------------
 android/gradle.properties |  3 ---
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 5cad01ff68..9f53aecf53 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -67,9 +67,6 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish-gradle-plugin'
 
 dependencies {
-
-  implementation 'androidx.multidex:multidex:' + propMultiDexVersion
-
   // Google Mobile Services
   if (googleMobileServicesEnabled) {
     implementation 'com.google.android.gms:play-services-location:19.0.1'
@@ -81,29 +78,25 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.6'
   }
 
-  // 3-party
-  implementation 'com.google.code.gson:gson:2.9.0'
-  // Sticky recycler view headers
-  implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
-  // Glide
-  implementation 'com.github.bumptech.glide:glide:4.13.2'
-  // Java concurrency annotations
-  implementation 'net.jcip:jcip-annotations:1.0'
-
+  implementation 'androidx.appcompat:appcompat:1.4.1'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+  implementation 'androidx.fragment:fragment:1.4.1'
+  implementation 'androidx.multidex:multidex:2.0.1'
+  implementation 'androidx.preference:preference:1.2.0'
+  implementation 'androidx.recyclerview:recyclerview:1.2.1'
   implementation 'androidx.work:work-runtime:2.7.1'
+  implementation 'com.github.bumptech.glide:glide:4.13.2'
+  implementation 'com.google.android.material:material:1.7.0-alpha01'
+  implementation 'com.google.code.gson:gson:2.9.0'
+  implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
   implementation 'com.trafi:anchor-bottom-sheet-behavior:0.14-alpha'
   implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
-  implementation 'com.google.android.material:material:1.7.0-alpha01'
-  implementation 'androidx.appcompat:appcompat:1.4.1'
-  implementation 'androidx.preference:preference:1.2.0'
-  implementation 'androidx.fragment:fragment:1.4.1'
-  implementation 'androidx.recyclerview:recyclerview:1.2.1'
+  implementation 'net.jcip:jcip-annotations:1.0'
 
   // Test Dependencies
-  testImplementation "junit:junit:$jUnitVersion"
-  testImplementation "org.mockito:mockito-core:$mockitoVersion"
-  testImplementation "org.mockito:mockito-inline:$mockitoVersion"
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'org.mockito:mockito-core:4.5.1'
+  testImplementation 'org.mockito:mockito-inline:4.5.1'
 }
 
 def run(cmd) {
diff --git a/android/gradle.properties b/android/gradle.properties
index 0165d09b1e..f0911ada49 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -2,9 +2,6 @@ propMinSdkVersion=21
 propTargetSdkVersion=31
 propCompileSdkVersion=31
 propBuildToolsVersion=32.0.0
-propMultiDexVersion=2.0.1
-jUnitVersion=4.13.2
-mockitoVersion=4.5.1
 
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1024m -Xms256m