Clean up version locations and order

1 files changed, 20 insertions, 15 deletions

diff --git a/build.gradle b/build.gradle
index 82cec73ce..9774fc3c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,31 +46,36 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
 
+    // AndroidX
+    annotationVersion = "1.1.0"
+    appcompatVersion = "1.1.0"
+    mediaVersion = "1.1.0"
+    preferenceVersion = "1.1.1"
     workManagerVersion = "2.3.4"
-    espressoVersion = "3.2.0"
-    awaitilityVersion = "3.1.6"
-    commonsioVersion = "2.5"
+    googleMaterialVersion = "1.1.0"
+
+    // Third-party
     commonslangVersion = "3.6"
-    eventbusVersion = "3.2.0"
-    glideVersion = "4.8.0"
-    glideOkhttpIntegrationVersion = "4.8.0"
-    iconifyVersion = "2.2.2"
+    commonsioVersion = "2.5"
     jsoupVersion = "1.11.2"
+    glideVersion = "4.8.0"
     okhttpVersion = "3.12.10"
     okioVersion = "1.17.5"
-    recyclerviewFlexibledividerVersion = "1.4.0"
-    robotiumSoloVersion = "5.6.3"
+    eventbusVersion = "3.2.0"
     rxAndroidVersion = "2.1.1"
     rxJavaVersion = "2.2.2"
-    rxJavaRulesVersion = "1.3.3.0"
-    triangleLabelViewVersion = "1.1.2"
-
-    exoPlayerVersion = "2.10.8"
+    iconifyVersion = "2.2.2"
     audioPlayerVersion = "v1.0.17"
 
-    castCompanionLibVer = "2.9.1"
-    playServicesVersion = "8.4.0"
+    // Google Play build
     wearableSupportVersion = "2.6.0"
+
+    //Tests
+    awaitilityVersion = "3.1.6"
+    robotiumSoloVersion = "5.6.3"
+    espressoVersion = "3.2.0"
+    runnerVersion = "1.2.0"
+    rulesVersion = "1.2.0"
 }
 
 wrapper {