changed version to constraints in roboswag modules

This commit is contained in:
alex 2020-06-05 19:19:36 +03:00
parent cb4000b48d
commit e34e78d163
22 changed files with 429 additions and 81 deletions

View File

@ -14,10 +14,48 @@ android {
} }
dependencies { dependencies {
api project(":storable") implementation project(":utils")
api 'net.danlew:android.joda:2.9.9.4' implementation project(":logging")
implementation project(":storable")
implementation "androidx.annotation:annotation:$versions.androidx" implementation 'net.danlew:android.joda'
implementation "com.squareup.retrofit2:retrofit:$versions.retrofit"
implementation 'ru.touchin:logansquare:1.4.3' 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'
}
}
}
} }

View File

@ -10,6 +10,6 @@ android {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
} }

View File

@ -23,9 +23,23 @@ dependencies {
implementation project(":logging") implementation project(":logging")
implementation project(":navigation-base") 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'
}
}
}
} }

View File

@ -23,9 +23,23 @@ dependencies {
implementation project(":navigation-base") implementation project(":navigation-base")
implementation project(":bottom-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'
}
}
}
} }

View File

@ -24,9 +24,23 @@ dependencies {
implementation project(":navigation-viewcontroller") implementation project(":navigation-viewcontroller")
implementation project(":bottom-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'
}
}
}
} }

View File

@ -5,10 +5,10 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
} }
dependencies { 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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'de.aaschmid:gradle-cpd-plugin:1.1' classpath 'de.aaschmid:gradle-cpd-plugin:3.1'
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.6.0"
} }
} }
@ -16,7 +16,13 @@ allprojects {
repositories { repositories {
google() google()
jcenter() jcenter()
maven { url "http://dl.bintray.com/touchin/touchin-tools" } maven {
url "https://dl.bintray.com/touchin/touchin-tools"
metadataSources {
artifact()
}
}
} }
} }

View File

@ -12,7 +12,15 @@ android {
dependencies { dependencies {
api project(":base-map") 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'
}
}
}
} }

View File

@ -10,7 +10,15 @@ android {
} }
dependencies { 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'
}
}
}
} }

View File

@ -14,12 +14,38 @@ dependencies {
api project(":logging") api project(":logging")
api project(":lifecycle") 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:rxjava"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" 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'
}
}
}
} }

View File

@ -24,12 +24,38 @@ dependencies {
compileOnly "javax.inject:javax.inject:1" 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"
implementation "androidx.fragment:fragment-ktx:$versions.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'
}
}
}
} }

View File

@ -21,12 +21,38 @@ android {
dependencies { dependencies {
compileOnly "javax.inject:javax.inject:1" 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"
implementation "androidx.fragment:fragment-ktx:$versions.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'
}
}
}
} }

View File

@ -13,7 +13,15 @@ android {
dependencies { dependencies {
api project(":lifecycle") 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'
}
}
}
} }

View File

@ -14,9 +14,21 @@ android {
} }
dependencies { dependencies {
implementation "androidx.annotation:annotation:$versions.androidx" implementation "androidx.annotation:annotation"
implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { implementation "com.crashlytics.sdk.android:crashlytics"
transitive = true
constraints {
implementation("androidx.annotation:annotation") {
version {
require '1.0.0'
}
}
implementation("com.crashlytics.sdk.android:crashlytics") {
version {
require '2.5.0'
}
}
} }
} }

View File

@ -24,18 +24,56 @@ dependencies {
implementation project(":utils") implementation project(":utils")
implementation project(":logging") 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"
implementation "androidx.fragment:fragment-ktx:$versions.fragment" implementation "androidx.fragment:fragment-ktx"
implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { implementation("com.crashlytics.sdk.android:crashlytics") {
transitive = true 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'
}
}
}
} }

View File

@ -25,15 +25,39 @@ dependencies {
implementation project(":logging") implementation project(":logging")
implementation project(":navigation-base") 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") { implementation("com.crashlytics.sdk.android:crashlytics")
transitive = true
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'
}
}
} }
} }

View File

@ -10,9 +10,17 @@ android {
} }
dependencies { 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'
}
}
}
} }

View File

@ -9,8 +9,22 @@ android {
} }
dependencies { dependencies {
api project(":logging") implementation project(":logging")
api 'net.danlew:android.joda:2.9.9.4' 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'
}
}
}
} }

View File

@ -10,9 +10,17 @@ android {
} }
dependencies { dependencies {
api project(":utils") implementation project(":utils")
api project(":logging") implementation project(":logging")
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib"
implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" implementation "io.reactivex.rxjava2:rxjava"
constraints {
implementation("io.reactivex.rxjava2:rxjava") {
version {
require '2.2.9'
}
}
}
} }

View File

@ -14,12 +14,38 @@ android {
} }
dependencies { dependencies {
api project(":utils") implementation project(":utils")
api project(":logging") implementation project(":logging")
implementation "androidx.core:core:$versions.androidx" implementation "androidx.core:core"
implementation "androidx.annotation:annotation:$versions.androidx" implementation "androidx.annotation:annotation"
implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" implementation "io.reactivex.rxjava2:rxjava"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" 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'
}
}
}
} }

View File

@ -15,7 +15,21 @@ android {
} }
dependencies { dependencies {
implementation "androidx.core:core:$versions.androidx" implementation "androidx.core:core"
implementation "androidx.annotation:annotation:$versions.androidx" implementation "androidx.annotation:annotation"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 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'
}
}
}
} }

View File

@ -14,8 +14,16 @@ android {
} }
dependencies { dependencies {
api project(":utils") implementation project(":utils")
api project(":logging") 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'
}
}
}
} }

View File

@ -10,9 +10,17 @@ android {
} }
dependencies { 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'
}
}
}
} }