From 87fefdc7bb3a3df533d1d91470b49ff2b4b9cb2b Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Wed, 15 Sep 2021 20:22:52 +0300 Subject: [PATCH] Add more dependencies to common dependencies.gradle --- attachment-viewer/build.gradle | 4 +- dependencies.gradle | 28 ++++++++++-- matrix-sdk-android/build.gradle | 24 +++++----- multipicker/build.gradle | 4 +- vector/build.gradle | 77 ++++++++++++++------------------- 5 files changed, 72 insertions(+), 65 deletions(-) diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle index 76a79544bf..aa0e48bc52 100644 --- a/attachment-viewer/build.gradle +++ b/attachment-viewer/build.gradle @@ -54,9 +54,9 @@ dependencies { implementation libs.rx.rxAndroid implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" - implementation 'androidx.core:core-ktx:1.6.0' + implementation libs.androidx.core implementation libs.androidx.appCompat - implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation libs.androidx.recyclerview implementation 'com.google.android.material:material:1.4.0' } \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 532f5ff683..440bc2f654 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,11 +6,11 @@ ext.versions = [ 'sourceCompat' : JavaVersion.VERSION_11, 'targetCompat' : JavaVersion.VERSION_11, + // Ref: https://kotlinlang.org/releases.html 'kotlin' : '1.5.30', 'kotlinCoroutines' : '1.5.1', 'dagger' : '2.38.1', 'timber' : '5.0.1', - 'work' : '2.5.0', 'lifecycle' : '2.2.0', 'moshi' : '1.12.0', 'arch' : '2.1.0', @@ -18,6 +18,17 @@ ext.versions = [ 'arrow' : '0.8.2', 'rxKotlin' : '2.4.0', 'rxAndroid' : '2.1.1', + 'retrofit' : '2.9.0', + 'epoxy' : '4.6.2', + 'glide' : '4.12.0', + 'rxBinding' : '3.1.0', + 'bigImageViwer' : '1.8.1', + 'jjwt' : '0.11.2', + 'kluent' : '1.68', + 'androidxTest' : '1.4.0', + 'espresso' : '3.4.0' + + ] @@ -33,7 +44,15 @@ ext.libs = [ 'coroutinesRx2' : "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:${versions.kotlinCoroutines}" ], androidx : [ - 'appCompat' : "androidx.appcompat:appcompat:1.3.1" + 'appCompat' : "androidx.appcompat:appcompat:1.3.1", + 'core' : "androidx.core:core-ktx:1.6.0", + 'recyclerview' : "androidx.recyclerview:recyclerview:1.2.1", + 'exifinterface' : "androidx.exifinterface:exifinterface:1.3.3", + 'fragmentKtx' : "androidx.fragment:fragment-ktx:1.3.6", + 'constraintLayout' : "androidx.constraintlayout:constraintlayout:2.1.0", + 'work' : "androidx.work:work-runtime-ktx:2.5.0", + 'autoFill' : "androidx.autofill:autofill:1.1.0", + 'junit' : "androidx.test.ext:junit:1.1.3" ], dagger : [ 'dagger' : "com.google.dagger:dagger:${versions.dagger}", @@ -44,6 +63,9 @@ ext.libs = [ 'rxAndroid' : "io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}" ], jakewharton : [ - 'timber' : "com.jakewharton.timber:timber:${versions.timber}", + 'timber' : "com.jakewharton.timber:timber:${versions.timber}" + ], + tests : [ + 'junit' : "junit:junit:4.13.2" ] ] \ No newline at end of file diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 1a228472db..0884c9d878 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -101,21 +101,19 @@ static def gitRevisionDate() { dependencies { - def retrofit_version = '2.9.0' - implementation libs.jetbrains.kotlinStdlib implementation libs.jetbrains.coroutinesCore implementation libs.jetbrains.coroutinesAndroid implementation libs.androidx.appCompat - implementation "androidx.core:core-ktx:1.6.0" + implementation libs.androidx.core implementation "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}" implementation "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}" // Network - implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" + implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}" + implementation "com.squareup.retrofit2:converter-moshi:${versions.retrofit}" implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.1")) implementation 'com.squareup.okhttp3:okhttp' @@ -128,14 +126,14 @@ dependencies { implementation "io.noties.markwon:core:${versions.markwon}" // Image - implementation 'androidx.exifinterface:exifinterface:1.3.3' + implementation libs.androidx.exifinterface // Database implementation 'com.github.Zhuinden:realm-monarchy:0.7.1' kapt 'dk.ilios:realmfieldnameshelper:2.0.0' // Work - implementation "androidx.work:work-runtime-ktx:${versions.work}" + implementation libs.androidx.work // FP implementation "io.arrow-kt:arrow-core:${versions.arrow}" @@ -158,7 +156,7 @@ dependencies { // Phone number https://github.com/google/libphonenumber implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.32' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.tests.junit testImplementation 'org.robolectric:robolectric:4.6.1' //testImplementation 'org.robolectric:shadows-support-v4:3.0' // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281 @@ -169,11 +167,11 @@ dependencies { testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1' kaptAndroidTest libs.dagger.daggerCompiler - 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.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.test:core:${versions.androidxTest}" + androidTestImplementation "androidx.test:runner:${versions.androidxTest}" + androidTestImplementation "androidx.test:rules:${versions.androidxTest}" + androidTestImplementation libs.androidx.junit + androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}" androidTestImplementation 'org.amshove.kluent:kluent-android:1.68' androidTestImplementation 'io.mockk:mockk-android:1.12.0' androidTestImplementation "androidx.arch.core:core-testing:${versions.arch}" diff --git a/multipicker/build.gradle b/multipicker/build.gradle index be86963868..8d37ec7ecf 100644 --- a/multipicker/build.gradle +++ b/multipicker/build.gradle @@ -40,8 +40,8 @@ android { dependencies { implementation libs.jetbrains.kotlinStdlib implementation libs.androidx.appCompat - implementation "androidx.fragment:fragment-ktx:1.3.6" - implementation 'androidx.exifinterface:exifinterface:1.3.3' + implementation libs.androidx.fragmentKtx + implementation libs.androidx.exifinterface // Log implementation libs.jakewharton.timber diff --git a/vector/build.gradle b/vector/build.gradle index cb9824287a..37995d9e8a 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -316,19 +316,6 @@ android { dependencies { - def epoxy_version = '4.6.2' - def fragment_version = '1.3.6' - def big_image_viewer_version = '1.8.1' - def glide_version = '4.12.0' - def autofill_version = "1.1.0" - def rxbinding_version = '3.1.0' - def jjwt_version = '0.11.2' - - // Tests - def kluent_version = '1.68' - def androidxTest_version = '1.4.0' - def espresso_version = '3.4.0' - implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android-rx") implementation project(":diff-match-patch") @@ -341,12 +328,12 @@ dependencies { implementation libs.jetbrains.coroutinesCore implementation libs.jetbrains.coroutinesAndroid - implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation libs.androidx.recyclerview implementation libs.androidx.appCompat - implementation "androidx.fragment:fragment-ktx:$fragment_version" - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation libs.androidx.fragmentKtx + implementation libs.androidx.constraintLayout implementation "androidx.sharetarget:sharetarget:1.1.0" - implementation 'androidx.core:core-ktx:1.6.0' + implementation libs.androidx.core implementation "androidx.media:media:1.4.1" implementation "androidx.transition:transition:1.4.1" @@ -372,18 +359,18 @@ dependencies { implementation libs.rx.rxAndroid implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.1' // RXBinding - implementation "com.jakewharton.rxbinding3:rxbinding:$rxbinding_version" - implementation "com.jakewharton.rxbinding3:rxbinding-appcompat:$rxbinding_version" - implementation "com.jakewharton.rxbinding3:rxbinding-material:$rxbinding_version" + implementation "com.jakewharton.rxbinding3:rxbinding:${versions.rxBinding}" + implementation "com.jakewharton.rxbinding3:rxbinding-appcompat:${versions.rxBinding}" + implementation "com.jakewharton.rxbinding3:rxbinding-material:${versions.rxBinding}" - implementation("com.airbnb.android:epoxy:$epoxy_version") - implementation "com.airbnb.android:epoxy-glide-preloading:$epoxy_version" - kapt "com.airbnb.android:epoxy-processor:$epoxy_version" - implementation "com.airbnb.android:epoxy-paging:$epoxy_version" + implementation("com.airbnb.android:epoxy:${versions.epoxy}") + implementation "com.airbnb.android:epoxy-glide-preloading:${versions.epoxy}" + kapt "com.airbnb.android:epoxy-processor:${versions.epoxy}" + implementation "com.airbnb.android:epoxy-paging:${versions.epoxy}" implementation 'com.airbnb.android:mvrx:1.5.1' // Work - implementation "androidx.work:work-runtime-ktx:${versions.work}" + implementation libs.androidx.work // Paging implementation "androidx.paging:paging-runtime-ktx:2.1.2" @@ -403,7 +390,7 @@ dependencies { implementation 'com.googlecode.htmlcompressor:htmlcompressor:1.5.2' implementation 'me.saket:better-link-movement-method:2.2.0' implementation 'com.google.android:flexbox:2.0.1' - implementation "androidx.autofill:autofill:$autofill_version" + implementation libs.androidx.autoFill implementation 'jp.wasabeef:glide-transformations:4.3.0' implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12' implementation 'com.github.hyuwah:DraggableView:1.0.0' @@ -427,16 +414,16 @@ dependencies { implementation 'com.squareup:seismic:1.0.2' // Image Loading - implementation "com.github.piasy:BigImageViewer:$big_image_viewer_version" - implementation "com.github.piasy:GlideImageLoader:$big_image_viewer_version" - implementation "com.github.piasy:ProgressPieIndicator:$big_image_viewer_version" - implementation "com.github.piasy:GlideImageViewFactory:$big_image_viewer_version" + implementation "com.github.piasy:BigImageViewer:${versions.bigImageViwer}" + implementation "com.github.piasy:GlideImageLoader:${versions.bigImageViwer}" + implementation "com.github.piasy:ProgressPieIndicator:${versions.bigImageViwer}" + implementation "com.github.piasy:GlideImageViewFactory:${versions.bigImageViwer}" // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2' implementation 'com.github.chrisbanes:PhotoView:2.3.0' - implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" + implementation "com.github.bumptech.glide:glide:${versions.glide}" + kapt "com.github.bumptech.glide:compiler:${versions.glide}" implementation 'com.danikula:videocache:2.7.1' implementation 'com.github.yalantis:ucrop:2.2.7' @@ -488,31 +475,31 @@ dependencies { implementation 'im.dlg:android-dialer:1.2.5' // JWT - api "io.jsonwebtoken:jjwt-api:$jjwt_version" - runtimeOnly "io.jsonwebtoken:jjwt-impl:$jjwt_version" - runtimeOnly("io.jsonwebtoken:jjwt-orgjson:$jjwt_version") { + api "io.jsonwebtoken:jjwt-api:${versions.jjwt}" + runtimeOnly "io.jsonwebtoken:jjwt-impl:${versions.jjwt}" + runtimeOnly("io.jsonwebtoken:jjwt-orgjson:${versions.jjwt}") { exclude group: 'org.json', module: 'json' //provided by Android natively } implementation 'commons-codec:commons-codec:1.15' // TESTS - testImplementation 'junit:junit:4.13.2' - testImplementation "org.amshove.kluent:kluent-android:$kluent_version" + testImplementation libs.tests.junit + testImplementation "org.amshove.kluent:kluent-android:${versions.kluent}" // Plant Timber tree for test testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1' // Activate when you want to check for leaks, from time to time. //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3' - androidTestImplementation "androidx.test:core:$androidxTest_version" - androidTestImplementation "androidx.test:runner:$androidxTest_version" - androidTestImplementation "androidx.test:rules:$androidxTest_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" - androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version" - androidTestImplementation "androidx.test.espresso:espresso-intents:$espresso_version" - androidTestImplementation "org.amshove.kluent:kluent-android:$kluent_version" + androidTestImplementation "androidx.test:core:${versions.androidxTest}" + androidTestImplementation "androidx.test:runner:${versions.androidxTest}" + androidTestImplementation "androidx.test:rules:${versions.androidxTest}" + androidTestImplementation libs.androidx.junit + androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}" + androidTestImplementation "androidx.test.espresso:espresso-contrib:${versions.espresso}" + androidTestImplementation "androidx.test.espresso:espresso-intents:${versions.espresso}" + androidTestImplementation "org.amshove.kluent:kluent-android:${versions.kluent}" androidTestImplementation "androidx.arch.core:core-testing:${versions.arch}" // Plant Timber tree for test androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'