Move version numbers to build.gradle

Moved for AS to be able to update the variables.
orgzly · Apr 4, 2020 · 3963f8e · 3963f8e
1 parent f55d8f6
commit 3963f8e
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 91 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -114,70 +114,70 @@ android {
 dependencies {
     implementation orgJavaLocation()
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
 
-    implementation "org.jetbrains:annotations:$jetbrains_annotations_version"
+    implementation "org.jetbrains:annotations:$versions.jetbrains_annotations"
 
-    implementation "androidx.multidex:multidex:$android_multidex_version"
+    implementation "androidx.multidex:multidex:$versions.android_multidex"
 
-    implementation "androidx.appcompat:appcompat:$android_appcompat_version"
+    implementation "androidx.appcompat:appcompat:$versions.android_appcompat"
 
     // UI
-    implementation "androidx.cardview:cardview:$android_cardview_version"
-    implementation "androidx.recyclerview:recyclerview:$android_recyclerview_version"
-    implementation "androidx.viewpager:viewpager:$android_viewpager_version"
-    implementation "androidx.constraintlayout:constraintlayout:$android_constraint_layout_version"
-    implementation "androidx.preference:preference:$android_preference_version"
-    implementation "com.google.android.material:material:$android_material_version"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:$android_swiperefreshlayout_version"
+    implementation "androidx.cardview:cardview:$versions.android_cardview"
+    implementation "androidx.recyclerview:recyclerview:$versions.android_recyclerview"
+    implementation "androidx.viewpager:viewpager:$versions.android_viewpager"
+    implementation "androidx.constraintlayout:constraintlayout:$versions.android_constraint_layout"
+    implementation "androidx.preference:preference:$versions.android_preference"
+    implementation "com.google.android.material:material:$versions.android_material"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:$versions.android_swiperefreshlayout"
 
     // Room
-    implementation "androidx.room:room-runtime:$android_room_version"
-    testImplementation "androidx.room:room-testing:$android_room_version"
-    kapt "androidx.room:room-compiler:$android_room_version"
+    implementation "androidx.room:room-runtime:$versions.android_room"
+    testImplementation "androidx.room:room-testing:$versions.android_room"
+    kapt "androidx.room:room-compiler:$versions.android_room"
 
     // Lifecycle
-    implementation "androidx.lifecycle:lifecycle-extensions:$android_lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-extensions:$versions.android_lifecycle"
 
-    androidTestImplementation "androidx.annotation:annotation:$android_annotation_version"
+    androidTestImplementation "androidx.annotation:annotation:$versions.android_annotation"
 
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "junit:junit:$versions.junit"
 
     // AndroidX Test
-    androidTestImplementation "androidx.test.espresso:espresso-core:$android_test_espresso_version"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib:$android_test_espresso_version"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:$android_test_espresso_version"
-    androidTestImplementation "androidx.test:runner:$android_test_version"
-    androidTestImplementation "androidx.test:rules:$android_test_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$versions.android_test_espresso"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$versions.android_test_espresso"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$versions.android_test_espresso"
+    androidTestImplementation "androidx.test:runner:$versions.android_test"
+    androidTestImplementation "androidx.test:rules:$versions.android_test"
 
     // For ANDROIDX_TEST_ORCHESTRATOR
     // androidTestUtil "androidx.test:orchestrator:$android_test_version"
 
-    androidTestImplementation "androidx.test.uiautomator:uiautomator:$android_test_uiautomator_version"
+    androidTestImplementation "androidx.test.uiautomator:uiautomator:$versions.android_test_uiautomator"
 
-    androidTestImplementation "de.sven-jacobs:loremipsum:$loremipsum_version"
+    androidTestImplementation "de.sven-jacobs:loremipsum:$versions.loremipsum"
 
     // Dagger
-    implementation "com.google.dagger:dagger:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    implementation "com.google.dagger:dagger:$versions.dagger"
+    kapt "com.google.dagger:dagger-compiler:$versions.dagger"
 
-    implementation "com.google.code.gson:gson:$gson_version"
+    implementation "com.google.code.gson:gson:$versions.gson"
 
-    implementation "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version"
+    implementation "com.dropbox.core:dropbox-core-sdk:$versions.dropbox_core_sdk"
 
-    implementation "com.googlecode.juniversalchardet:juniversalchardet:$juniversalchardet_version"
+    implementation "com.googlecode.juniversalchardet:juniversalchardet:$versions.juniversalchardet"
 
-    implementation "com.evernote:android-job:$evernote_android_job_version"
+    implementation "com.evernote:android-job:$versions.evernote_android_job"
 
-    implementation "joda-time:joda-time:$joda_time_version"
+    implementation "joda-time:joda-time:$versions.joda_time"
 
-    implementation "com.github.bumptech.glide:glide:$glide_version"
+    implementation "com.github.bumptech.glide:glide:$versions.glide"
 
-    implementation("com.thegrizzlylabs.sardine-android:sardine-android:$sardine_version") {
+    implementation("com.thegrizzlylabs.sardine-android:sardine-android:$versions.sardine") {
         exclude group: 'xpp3', module: 'xpp3'
     }
 
-    implementation("org.eclipse.jgit:org.eclipse.jgit:$jgit_version") {
+    implementation("org.eclipse.jgit:org.eclipse.jgit:$versions.jgit") {
         // Resolves DuplicatePlatformClasses lint error
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }

diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,77 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
+    def versions = [:]
+
+    versions.android_gradle_plugin = '3.6.1'
+
+    versions.kotlin = '1.3.71'
+
+    versions.jetbrains_annotations = '16.0.3'
+
+    versions.android_multidex = '2.0.1'
+
+    versions.android_appcompat = '1.1.0'
+
+    versions.android_cardview = '1.0.0'
+    versions.android_recyclerview = '1.0.0'
+    versions.android_viewpager = '1.0.0'
+    versions.android_constraint_layout = '2.0.0-beta4'
+    versions.android_preference = '1.1.0'
+    versions.android_material = '1.0.0'
+    versions.android_swiperefreshlayout = '1.0.0'
+
+    versions.android_room = '2.2.1'
+
+    versions.android_lifecycle = '2.1.0'
+
+    versions.android_annotation = '1.1.0'
+
+    versions.junit = '4.12'
+
+    versions.android_test_espresso = '3.2.0'
+
+    versions.android_test = '1.2.0'
+
+    versions.android_test_uiautomator = '2.2.0'
+
+    versions.org_java = '1.3-SNAPSHOT'
+
+    versions.loremipsum = '1.0'
+
+    versions.dagger = '2.24'
+
+    versions.gson = '2.8.6'
+
+    versions.dropbox_core_sdk = '3.1.1'
+
+    versions.juniversalchardet = '1.0.3'
+
+    versions.evernote_android_job = '1.4.2'
+
+    versions.joda_time = '2.10.4'
+
+    versions.glide = '4.10.0'
+
+    versions.sardine = '0.5'
+
+    versions.jgit = '4.4.1.201607150455-r'
+
+    ext.versions = versions
+
     repositories {
         jcenter()
         google()
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$android_gradle_plugin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.android.tools.build:gradle:$versions.android_gradle_plugin"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
     }
 }
 
+
 plugins {
     id "com.github.ben-manes.versions" version "0.26.0"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -23,58 +23,4 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
 
 android.useAndroidX = true
 android.enableJetifier = true
-android.databinding.incremental = true
-
-android_gradle_plugin_version = 3.6.1
-
-kotlin_version = 1.3.71
-
-jetbrains_annotations_version = 16.0.3
-
-android_multidex_version = 2.0.1
-
-android_appcompat_version = 1.1.0
-
-android_cardview_version = 1.0.0
-android_recyclerview_version = 1.0.0
-android_viewpager_version = 1.0.0
-android_constraint_layout_version = 2.0.0-beta4
-android_preference_version = 1.1.0
-android_material_version = 1.0.0
-android_swiperefreshlayout_version = 1.0.0
-
-android_room_version = 2.2.1
-
-android_lifecycle_version = 2.1.0
-
-android_annotation_version = 1.1.0
-
-junit_version = 4.12
-
-android_test_espresso_version = 3.2.0
-
-android_test_version = 1.2.0
-
-android_test_uiautomator_version = 2.2.0
-
-org_java_version = 1.3-SNAPSHOT
-
-loremipsum_version = 1.0
-
-dagger_version = 2.24
-
-gson_version = 2.8.6
-
-dropbox_core_sdk_version = 3.1.1
-
-juniversalchardet_version = 1.0.3
-
-evernote_android_job_version = 1.4.2
-
-joda_time_version = 2.10.4
-
-glide_version = 4.10.0
-
-sardine_version = 0.5
-
-jgit_version = 4.4.1.201607150455-r
+android.databinding.incremental = true