From e34e78d16335198f01f102655a5839456278038c Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 5 Jun 2020 19:19:36 +0300 Subject: [PATCH] changed version to constraints in roboswag modules --- api-logansquare/build.gradle | 48 +++++++++++++++-- base-map/build.gradle | 2 +- bottom-navigation-base/build.gradle | 20 +++++-- bottom-navigation-fragment/build.gradle | 20 +++++-- bottom-navigation-viewcontroller/build.gradle | 20 +++++-- build.gradle | 14 +++-- google-map/build.gradle | 12 ++++- kotlin-extensions/build.gradle | 12 ++++- lifecycle-rx/build.gradle | 36 +++++++++++-- lifecycle-viewcontroller/build.gradle | 36 +++++++++++-- lifecycle/build.gradle | 36 +++++++++++-- livedata-location/build.gradle | 12 ++++- logging/build.gradle | 18 +++++-- navigation-base/build.gradle | 52 ++++++++++++++++--- navigation-viewcontroller/build.gradle | 36 ++++++++++--- recyclerview-adapters/build.gradle | 14 +++-- recyclerview-calendar/build.gradle | 20 +++++-- rx-extensions/build.gradle | 16 ++++-- storable/build.gradle | 38 +++++++++++--- utils/build.gradle | 20 +++++-- views/build.gradle | 14 +++-- yandex-map/build.gradle | 14 +++-- 22 files changed, 429 insertions(+), 81 deletions(-) diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle index c522cc9..9582901 100644 --- a/api-logansquare/build.gradle +++ b/api-logansquare/build.gradle @@ -14,10 +14,48 @@ android { } dependencies { - api project(":storable") - api 'net.danlew:android.joda:2.9.9.4' + implementation project(":utils") + implementation project(":logging") + implementation project(":storable") - implementation "androidx.annotation:annotation:$versions.androidx" - implementation "com.squareup.retrofit2:retrofit:$versions.retrofit" - implementation 'ru.touchin:logansquare:1.4.3' + implementation 'net.danlew:android.joda' + + implementation "androidx.core:core" + implementation "androidx.annotation:annotation" + + implementation "com.squareup.retrofit2:retrofit" + + implementation 'ru.touchin:logansquare' + + constraints { + implementation("androidx.core:core") { + version { + require '1.0.0' + } + } + + implementation("ru.touchin:logansquare") { + version { + require '1.4.3' + } + } + + implementation("com.squareup.retrofit2:retrofit") { + version { + require '2.7.0' + } + } + + implementation("androidx.annotation:annotation") { + version { + require '1.0.0' + } + } + + implementation("net.danlew:android.joda") { + version { + require '2.9.9.4' + } + } + } } diff --git a/base-map/build.gradle b/base-map/build.gradle index b80165f..f8f30bc 100644 --- a/base-map/build.gradle +++ b/base-map/build.gradle @@ -10,6 +10,6 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" } diff --git a/bottom-navigation-base/build.gradle b/bottom-navigation-base/build.gradle index f97eb55..28e0ffc 100644 --- a/bottom-navigation-base/build.gradle +++ b/bottom-navigation-base/build.gradle @@ -23,9 +23,23 @@ dependencies { implementation project(":logging") implementation project(":navigation-base") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") - implementation "androidx.core:core-ktx:$versions.coreKtx" + implementation("androidx.core:core-ktx") - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation("androidx.appcompat:appcompat") + + constraints { + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + + implementation("androidx.core:core-ktx") { + version { + require '1.0.0' + } + } + } } diff --git a/bottom-navigation-fragment/build.gradle b/bottom-navigation-fragment/build.gradle index 69410ca..56537e8 100644 --- a/bottom-navigation-fragment/build.gradle +++ b/bottom-navigation-fragment/build.gradle @@ -23,9 +23,23 @@ dependencies { implementation project(":navigation-base") implementation project(":bottom-navigation-base") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.core:core-ktx:$versions.coreKtx" + implementation "androidx.core:core-ktx" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" + + constraints { + implementation("androidx.core:core-ktx") { + version { + require '1.0.0' + } + } + + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + } } diff --git a/bottom-navigation-viewcontroller/build.gradle b/bottom-navigation-viewcontroller/build.gradle index 8a5beda..8bfb006 100644 --- a/bottom-navigation-viewcontroller/build.gradle +++ b/bottom-navigation-viewcontroller/build.gradle @@ -24,9 +24,23 @@ dependencies { implementation project(":navigation-viewcontroller") implementation project(":bottom-navigation-base") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.core:core-ktx:$versions.coreKtx" + implementation "androidx.core:core-ktx" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" + + constraints { + implementation("androidx.core:core-ktx") { + version { + require '1.0.0' + } + } + + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + } } diff --git a/build.gradle b/build.gradle index 41d4c15..7a61b19 100644 --- a/build.gradle +++ b/build.gradle @@ -5,10 +5,10 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'de.aaschmid:gradle-cpd-plugin:1.1' - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12" + classpath 'de.aaschmid:gradle-cpd-plugin:3.1' + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.6.0" } } @@ -16,7 +16,13 @@ allprojects { repositories { google() jcenter() - maven { url "http://dl.bintray.com/touchin/touchin-tools" } + maven { + url "https://dl.bintray.com/touchin/touchin-tools" + metadataSources { + artifact() + } + + } } } diff --git a/google-map/build.gradle b/google-map/build.gradle index 7673daa..3ec91fe 100644 --- a/google-map/build.gradle +++ b/google-map/build.gradle @@ -12,7 +12,15 @@ android { dependencies { api project(":base-map") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "com.google.android.gms:play-services-maps:$versions.google_maps" + implementation "com.google.android.gms:play-services-maps" + + constraints { + implementation("com.google.android.gms:play-services-maps") { + version { + require '17.0.0' + } + } + } } diff --git a/kotlin-extensions/build.gradle b/kotlin-extensions/build.gradle index 797cd49..eed4ded 100644 --- a/kotlin-extensions/build.gradle +++ b/kotlin-extensions/build.gradle @@ -10,7 +10,15 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.recyclerview:recyclerview:$versions.androidx" + implementation "androidx.recyclerview:recyclerview" + + constraints { + implementation("androidx.recyclerview:recyclerview") { + version { + require '1.0.0' + } + } + } } diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle index 4d58f46..0613fa6 100644 --- a/lifecycle-rx/build.gradle +++ b/lifecycle-rx/build.gradle @@ -14,12 +14,38 @@ dependencies { api project(":logging") api project(":lifecycle") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" - implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-extensions" - implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" - implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" + implementation "io.reactivex.rxjava2:rxjava" + implementation "io.reactivex.rxjava2:rxandroid" + + constraints { + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + + implementation("androidx.lifecycle:lifecycle-extensions") { + version { + require '2.1.0' + } + } + + implementation("io.reactivex.rxjava2:rxjava") { + version { + require '2.2.6' + } + } + + implementation("io.reactivex.rxjava2:rxandroid") { + version { + require '2.0.0' + } + } + } } diff --git a/lifecycle-viewcontroller/build.gradle b/lifecycle-viewcontroller/build.gradle index 7ceb229..bffe90f 100644 --- a/lifecycle-viewcontroller/build.gradle +++ b/lifecycle-viewcontroller/build.gradle @@ -24,12 +24,38 @@ dependencies { compileOnly "javax.inject:javax.inject:1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" - implementation "androidx.fragment:fragment:$versions.fragment" - implementation "androidx.fragment:fragment-ktx:$versions.fragment" + implementation "androidx.fragment:fragment" + implementation "androidx.fragment:fragment-ktx" - implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-extensions" + + constraints { + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + + implementation("androidx.fragment:fragment") { + version { + require '1.1.0' + } + } + + implementation("androidx.fragment:fragment-ktx") { + version { + require '1.1.0' + } + } + + implementation("androidx.lifecycle:lifecycle-extensions") { + version { + require '2.1.0' + } + } + } } diff --git a/lifecycle/build.gradle b/lifecycle/build.gradle index 6ca35ff..226543e 100644 --- a/lifecycle/build.gradle +++ b/lifecycle/build.gradle @@ -21,12 +21,38 @@ android { dependencies { compileOnly "javax.inject:javax.inject:1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" - implementation "androidx.fragment:fragment:$versions.fragment" - implementation "androidx.fragment:fragment-ktx:$versions.fragment" + implementation "androidx.fragment:fragment" + implementation "androidx.fragment:fragment-ktx" - implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-extensions" + + constraints { + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + + implementation("androidx.lifecycle:lifecycle-extensions") { + version { + require '2.1.0' + } + } + + implementation("androidx.fragment:fragment") { + version { + require '1.0.0' + } + } + + implementation("androidx.fragment:fragment-ktx") { + version { + require '1.1.0' + } + } + } } diff --git a/livedata-location/build.gradle b/livedata-location/build.gradle index 297284c..46a7624 100644 --- a/livedata-location/build.gradle +++ b/livedata-location/build.gradle @@ -13,7 +13,15 @@ android { dependencies { api project(":lifecycle") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "com.google.android.gms:play-services-location:$versions.location" + implementation "com.google.android.gms:play-services-location" + + constraints { + implementation("com.google.android.gms:play-services-location") { + version { + require '1.0.0' + } + } + } } diff --git a/logging/build.gradle b/logging/build.gradle index 2b79ac2..cf9568f 100644 --- a/logging/build.gradle +++ b/logging/build.gradle @@ -14,9 +14,21 @@ android { } dependencies { - implementation "androidx.annotation:annotation:$versions.androidx" + implementation "androidx.annotation:annotation" - implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { - transitive = true + implementation "com.crashlytics.sdk.android:crashlytics" + + constraints { + implementation("androidx.annotation:annotation") { + version { + require '1.0.0' + } + } + + implementation("com.crashlytics.sdk.android:crashlytics") { + version { + require '2.5.0' + } + } } } diff --git a/navigation-base/build.gradle b/navigation-base/build.gradle index ed356be..2310e15 100644 --- a/navigation-base/build.gradle +++ b/navigation-base/build.gradle @@ -24,18 +24,56 @@ dependencies { implementation project(":utils") implementation project(":logging") - implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.multidex:multidex' - implementation 'net.danlew:android.joda:2.10.2' + implementation 'net.danlew:android.joda' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" - implementation "androidx.fragment:fragment:$versions.fragment" - implementation "androidx.fragment:fragment-ktx:$versions.fragment" + implementation "androidx.fragment:fragment" + implementation "androidx.fragment:fragment-ktx" - implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { + implementation("com.crashlytics.sdk.android:crashlytics") { transitive = true } + + constraints { + implementation("androidx.multidex:multidex") { + version { + require '2.0.0' + } + } + + implementation("net.danlew:android.joda") { + version { + require '2.10.0' + } + } + + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.0' + } + } + + implementation("androidx.fragment:fragment") { + version { + require '1.1.0' + } + } + + implementation("androidx.fragment:fragment-ktx") { + version { + require '1.1.0' + } + } + + implementation("com.crashlytics.sdk.android:crashlytics") { + version { + require '2.0.0' + } + } + } } diff --git a/navigation-viewcontroller/build.gradle b/navigation-viewcontroller/build.gradle index e40ef52..955461a 100644 --- a/navigation-viewcontroller/build.gradle +++ b/navigation-viewcontroller/build.gradle @@ -25,15 +25,39 @@ dependencies { implementation project(":logging") implementation project(":navigation-base") - implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.multidex:multidex' - implementation 'net.danlew:android.joda:2.10.2' + implementation 'net.danlew:android.joda' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.appcompat:appcompat:$versions.appcompat" + implementation "androidx.appcompat:appcompat" - implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { - transitive = true + implementation("com.crashlytics.sdk.android:crashlytics") + + constraints { + implementation("androidx.multidex:multidex") { + version { + require '2.0.1' + } + } + + implementation("net.danlew:android.joda") { + version { + require '2.10.2' + } + } + + implementation("androidx.appcompat:appcompat") { + version { + require '1.0.2' + } + } + + implementation("com.crashlytics.sdk.android:crashlytics") { + version { + require '2.0.0' + } + } } } diff --git a/recyclerview-adapters/build.gradle b/recyclerview-adapters/build.gradle index f4730f9..40b114c 100644 --- a/recyclerview-adapters/build.gradle +++ b/recyclerview-adapters/build.gradle @@ -10,9 +10,17 @@ android { } dependencies { - api project(':kotlin-extensions') + implementation project(':kotlin-extensions') - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "androidx.recyclerview:recyclerview:$versions.androidx" + implementation "androidx.recyclerview:recyclerview" + + constraints { + implementation("androidx.recyclerview:recyclerview") { + version { + require '1.0.0' + } + } + } } diff --git a/recyclerview-calendar/build.gradle b/recyclerview-calendar/build.gradle index 09ee166..a783c55 100644 --- a/recyclerview-calendar/build.gradle +++ b/recyclerview-calendar/build.gradle @@ -9,8 +9,22 @@ android { } dependencies { - api project(":logging") - api 'net.danlew:android.joda:2.9.9.4' + implementation project(":logging") + implementation 'net.danlew:android.joda' - implementation "androidx.recyclerview:recyclerview:$versions.androidx" + implementation "androidx.recyclerview:recyclerview" + + constraints { + implementation("androidx.recyclerview:recyclerview") { + version { + require '1.0.0' + } + } + + implementation("net.danlew:android.joda") { + version { + require '2.9.9.4' + } + } + } } diff --git a/rx-extensions/build.gradle b/rx-extensions/build.gradle index 14da026..0099f13 100644 --- a/rx-extensions/build.gradle +++ b/rx-extensions/build.gradle @@ -10,9 +10,17 @@ android { } dependencies { - api project(":utils") - api project(":logging") + implementation project(":utils") + implementation project(":logging") - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" + implementation "org.jetbrains.kotlin:kotlin-stdlib" + implementation "io.reactivex.rxjava2:rxjava" + + constraints { + implementation("io.reactivex.rxjava2:rxjava") { + version { + require '2.2.9' + } + } + } } diff --git a/storable/build.gradle b/storable/build.gradle index 340a921..b4b59bc 100644 --- a/storable/build.gradle +++ b/storable/build.gradle @@ -14,12 +14,38 @@ android { } dependencies { - api project(":utils") - api project(":logging") + implementation project(":utils") + implementation project(":logging") - implementation "androidx.core:core:$versions.androidx" - implementation "androidx.annotation:annotation:$versions.androidx" + implementation "androidx.core:core" + implementation "androidx.annotation:annotation" - implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" - implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" + implementation "io.reactivex.rxjava2:rxjava" + implementation "io.reactivex.rxjava2:rxandroid" + + constraints { + implementation("androidx.core:core") { + version { + require '1.0.0' + } + } + + implementation("androidx.annotation:annotation") { + version { + require '1.0.0' + } + } + + implementation("io.reactivex.rxjava2:rxjava") { + version { + require '2.2.6' + } + } + + implementation("io.reactivex.rxjava2:rxandroid") { + version { + require '2.1.1' + } + } + } } diff --git a/utils/build.gradle b/utils/build.gradle index ac3a82f..447ddcd 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -15,7 +15,21 @@ android { } dependencies { - implementation "androidx.core:core:$versions.androidx" - implementation "androidx.annotation:annotation:$versions.androidx" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.core:core" + implementation "androidx.annotation:annotation" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + + constraints { + implementation("androidx.core:core") { + version { + require '1.0.0' + } + } + + implementation("androidx.annotation:annotation") { + version { + require '1.1.0' + } + } + } } diff --git a/views/build.gradle b/views/build.gradle index 7f190bd..6bc166b 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -14,8 +14,16 @@ android { } dependencies { - api project(":utils") - api project(":logging") + implementation project(":utils") + implementation project(":logging") - implementation "com.google.android.material:material:$versions.material" + implementation "com.google.android.material:material" + + constraints { + implementation("com.google.android.material:material") { + version { + require '1.0.0' + } + } + } } diff --git a/yandex-map/build.gradle b/yandex-map/build.gradle index e34fbaf..9fe6bf5 100644 --- a/yandex-map/build.gradle +++ b/yandex-map/build.gradle @@ -10,9 +10,17 @@ android { } dependencies { - api project(":base-map") + implementation project(":base-map") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" - implementation "com.yandex.android:mapkit:$versions.yandex_mapkit" + implementation "com.yandex.android:mapkit" + + constraints { + implementation("com.yandex.android:mapkit") { + version { + require '3.4.0' + } + } + } }