From e34e78d16335198f01f102655a5839456278038c Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 5 Jun 2020 19:19:36 +0300 Subject: [PATCH 1/7] 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' + } + } + } } From 874b0f5924406bfd7448d5de0c51073f0b903667 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 9 Jun 2020 18:01:40 +0300 Subject: [PATCH 2/7] changed kotlin-stdlib-jdk7 to kotlin-stdlib --- base-map/build.gradle | 2 +- bottom-navigation-base/build.gradle | 2 +- bottom-navigation-fragment/build.gradle | 2 +- bottom-navigation-viewcontroller/build.gradle | 2 +- google-map/build.gradle | 2 +- kotlin-extensions/build.gradle | 2 +- lifecycle-rx/build.gradle | 2 +- lifecycle-viewcontroller/build.gradle | 2 +- lifecycle/build.gradle | 2 +- livedata-location/build.gradle | 2 +- navigation-base/build.gradle | 2 +- navigation-viewcontroller/build.gradle | 2 +- recyclerview-adapters/build.gradle | 2 +- utils/build.gradle | 2 +- yandex-map/build.gradle | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base-map/build.gradle b/base-map/build.gradle index f8f30bc..d5a44da 100644 --- a/base-map/build.gradle +++ b/base-map/build.gradle @@ -10,6 +10,6 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" } diff --git a/bottom-navigation-base/build.gradle b/bottom-navigation-base/build.gradle index 28e0ffc..5ee554e 100644 --- a/bottom-navigation-base/build.gradle +++ b/bottom-navigation-base/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(":logging") implementation project(":navigation-base") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") + implementation("org.jetbrains.kotlin:kotlin-stdlib") implementation("androidx.core:core-ktx") diff --git a/bottom-navigation-fragment/build.gradle b/bottom-navigation-fragment/build.gradle index 56537e8..c534245 100644 --- a/bottom-navigation-fragment/build.gradle +++ b/bottom-navigation-fragment/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(":navigation-base") implementation project(":bottom-navigation-base") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.core:core-ktx" diff --git a/bottom-navigation-viewcontroller/build.gradle b/bottom-navigation-viewcontroller/build.gradle index 8bfb006..d6fd6e6 100644 --- a/bottom-navigation-viewcontroller/build.gradle +++ b/bottom-navigation-viewcontroller/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation project(":navigation-viewcontroller") implementation project(":bottom-navigation-base") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.core:core-ktx" diff --git a/google-map/build.gradle b/google-map/build.gradle index 3ec91fe..20c4a09 100644 --- a/google-map/build.gradle +++ b/google-map/build.gradle @@ -12,7 +12,7 @@ android { dependencies { api project(":base-map") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "com.google.android.gms:play-services-maps" diff --git a/kotlin-extensions/build.gradle b/kotlin-extensions/build.gradle index eed4ded..ad799de 100644 --- a/kotlin-extensions/build.gradle +++ b/kotlin-extensions/build.gradle @@ -10,7 +10,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.recyclerview:recyclerview" diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle index 0613fa6..c885051 100644 --- a/lifecycle-rx/build.gradle +++ b/lifecycle-rx/build.gradle @@ -14,7 +14,7 @@ dependencies { api project(":logging") api project(":lifecycle") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.appcompat:appcompat" diff --git a/lifecycle-viewcontroller/build.gradle b/lifecycle-viewcontroller/build.gradle index bffe90f..e40e049 100644 --- a/lifecycle-viewcontroller/build.gradle +++ b/lifecycle-viewcontroller/build.gradle @@ -24,7 +24,7 @@ dependencies { compileOnly "javax.inject:javax.inject:1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.appcompat:appcompat" diff --git a/lifecycle/build.gradle b/lifecycle/build.gradle index 226543e..322c98f 100644 --- a/lifecycle/build.gradle +++ b/lifecycle/build.gradle @@ -21,7 +21,7 @@ android { dependencies { compileOnly "javax.inject:javax.inject:1" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.appcompat:appcompat" diff --git a/livedata-location/build.gradle b/livedata-location/build.gradle index 46a7624..43615ea 100644 --- a/livedata-location/build.gradle +++ b/livedata-location/build.gradle @@ -13,7 +13,7 @@ android { dependencies { api project(":lifecycle") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "com.google.android.gms:play-services-location" diff --git a/navigation-base/build.gradle b/navigation-base/build.gradle index 2310e15..3aadeea 100644 --- a/navigation-base/build.gradle +++ b/navigation-base/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation 'net.danlew:android.joda' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.appcompat:appcompat" diff --git a/navigation-viewcontroller/build.gradle b/navigation-viewcontroller/build.gradle index 955461a..34c2b1b 100644 --- a/navigation-viewcontroller/build.gradle +++ b/navigation-viewcontroller/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation 'net.danlew:android.joda' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.appcompat:appcompat" diff --git a/recyclerview-adapters/build.gradle b/recyclerview-adapters/build.gradle index 40b114c..552fc4f 100644 --- a/recyclerview-adapters/build.gradle +++ b/recyclerview-adapters/build.gradle @@ -12,7 +12,7 @@ android { dependencies { implementation project(':kotlin-extensions') - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "androidx.recyclerview:recyclerview" diff --git a/utils/build.gradle b/utils/build.gradle index 447ddcd..b69e92a 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -17,7 +17,7 @@ android { dependencies { implementation "androidx.core:core" implementation "androidx.annotation:annotation" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" constraints { implementation("androidx.core:core") { diff --git a/yandex-map/build.gradle b/yandex-map/build.gradle index 9fe6bf5..2d08918 100644 --- a/yandex-map/build.gradle +++ b/yandex-map/build.gradle @@ -12,7 +12,7 @@ android { dependencies { implementation project(":base-map") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" + implementation "org.jetbrains.kotlin:kotlin-stdlib" implementation "com.yandex.android:mapkit" From 7f10b89b86042c7516a4794914e9603a55b56350 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 15 Jun 2020 17:00:31 +0300 Subject: [PATCH 3/7] move common android build settings to RoboSwag/android-configs --- api-logansquare/build.gradle | 15 +------------ base-map/build.gradle | 11 +--------- bottom-navigation-base/build.gradle | 21 +----------------- bottom-navigation-fragment/build.gradle | 21 +----------------- bottom-navigation-viewcontroller/build.gradle | 21 +----------------- google-map/build.gradle | 11 +--------- kotlin-extensions/build.gradle | 11 +--------- lifecycle-rx/build.gradle | 11 +--------- lifecycle-viewcontroller/build.gradle | 20 +---------------- lifecycle/build.gradle | 20 +---------------- livedata-location/build.gradle | 12 +--------- logging/build.gradle | 15 +------------ navigation-base/build.gradle | 22 ++----------------- navigation-viewcontroller/build.gradle | 22 ++----------------- recyclerview-adapters/build.gradle | 11 +--------- recyclerview-calendar/build.gradle | 10 +-------- rx-extensions/build.gradle | 11 +--------- storable/build.gradle | 15 +------------ utils/build.gradle | 16 +------------- views/build.gradle | 15 +------------ yandex-map/build.gradle | 11 +--------- 21 files changed, 23 insertions(+), 299 deletions(-) diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle index 9582901..46d7270 100644 --- a/api-logansquare/build.gradle +++ b/api-logansquare/build.gradle @@ -1,17 +1,4 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":utils") diff --git a/base-map/build.gradle b/base-map/build.gradle index d5a44da..28cb33f 100644 --- a/base-map/build.gradle +++ b/base-map/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 17 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" diff --git a/bottom-navigation-base/build.gradle b/bottom-navigation-base/build.gradle index 5ee554e..2d47a0f 100644 --- a/bottom-navigation-base/build.gradle +++ b/bottom-navigation-base/build.gradle @@ -1,23 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":logging") diff --git a/bottom-navigation-fragment/build.gradle b/bottom-navigation-fragment/build.gradle index c534245..7be765e 100644 --- a/bottom-navigation-fragment/build.gradle +++ b/bottom-navigation-fragment/build.gradle @@ -1,23 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":navigation-base") diff --git a/bottom-navigation-viewcontroller/build.gradle b/bottom-navigation-viewcontroller/build.gradle index d6fd6e6..ab6dfc9 100644 --- a/bottom-navigation-viewcontroller/build.gradle +++ b/bottom-navigation-viewcontroller/build.gradle @@ -1,23 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":navigation-base") diff --git a/google-map/build.gradle b/google-map/build.gradle index 20c4a09..5dbe162 100644 --- a/google-map/build.gradle +++ b/google-map/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 17 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { api project(":base-map") diff --git a/kotlin-extensions/build.gradle b/kotlin-extensions/build.gradle index ad799de..9a33a8e 100644 --- a/kotlin-extensions/build.gradle +++ b/kotlin-extensions/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle index c885051..fb335b2 100644 --- a/lifecycle-rx/build.gradle +++ b/lifecycle-rx/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { api project(":utils") diff --git a/lifecycle-viewcontroller/build.gradle b/lifecycle-viewcontroller/build.gradle index e40e049..22d42c4 100644 --- a/lifecycle-viewcontroller/build.gradle +++ b/lifecycle-viewcontroller/build.gradle @@ -1,22 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":lifecycle") diff --git a/lifecycle/build.gradle b/lifecycle/build.gradle index 322c98f..6538e89 100644 --- a/lifecycle/build.gradle +++ b/lifecycle/build.gradle @@ -1,22 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { compileOnly "javax.inject:javax.inject:1" diff --git a/livedata-location/build.gradle b/livedata-location/build.gradle index 43615ea..b61b9ce 100644 --- a/livedata-location/build.gradle +++ b/livedata-location/build.gradle @@ -1,14 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - -} +apply from: "../android-configs/lib-config.gradle" dependencies { api project(":lifecycle") diff --git a/logging/build.gradle b/logging/build.gradle index cf9568f..e1c188e 100644 --- a/logging/build.gradle +++ b/logging/build.gradle @@ -1,17 +1,4 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation "androidx.annotation:annotation" diff --git a/navigation-base/build.gradle b/navigation-base/build.gradle index 3aadeea..d99d1b4 100644 --- a/navigation-base/build.gradle +++ b/navigation-base/build.gradle @@ -1,25 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +apply from: "../android-configs/lib-config.gradle" + apply plugin: 'kotlin-kapt' -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - -} - dependencies { implementation project(":utils") implementation project(":logging") diff --git a/navigation-viewcontroller/build.gradle b/navigation-viewcontroller/build.gradle index 34c2b1b..9c1aae5 100644 --- a/navigation-viewcontroller/build.gradle +++ b/navigation-viewcontroller/build.gradle @@ -1,25 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +apply from: "../android-configs/lib-config.gradle" + apply plugin: 'kotlin-kapt' -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - -} - dependencies { implementation project(":utils") implementation project(":logging") diff --git a/recyclerview-adapters/build.gradle b/recyclerview-adapters/build.gradle index 552fc4f..f733886 100644 --- a/recyclerview-adapters/build.gradle +++ b/recyclerview-adapters/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(':kotlin-extensions') diff --git a/recyclerview-calendar/build.gradle b/recyclerview-calendar/build.gradle index a783c55..811a091 100644 --- a/recyclerview-calendar/build.gradle +++ b/recyclerview-calendar/build.gradle @@ -1,12 +1,4 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":logging") diff --git a/rx-extensions/build.gradle b/rx-extensions/build.gradle index 0099f13..bb4e059 100644 --- a/rx-extensions/build.gradle +++ b/rx-extensions/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":utils") diff --git a/storable/build.gradle b/storable/build.gradle index b4b59bc..58f4456 100644 --- a/storable/build.gradle +++ b/storable/build.gradle @@ -1,17 +1,4 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":utils") diff --git a/utils/build.gradle b/utils/build.gradle index b69e92a..f8763bd 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -1,18 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation "androidx.core:core" diff --git a/views/build.gradle b/views/build.gradle index 6bc166b..623cb8b 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -1,17 +1,4 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 16 - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":utils") diff --git a/yandex-map/build.gradle b/yandex-map/build.gradle index 2d08918..88830e4 100644 --- a/yandex-map/build.gradle +++ b/yandex-map/build.gradle @@ -1,13 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion versions.compileSdk - - defaultConfig { - minSdkVersion 17 - } -} +apply from: "../android-configs/lib-config.gradle" dependencies { implementation project(":base-map") From ba78cd441b10f990cb6b0a2550a3194c4746bc80 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 15 Jun 2020 17:13:48 +0300 Subject: [PATCH 4/7] added config.gradle to RoboSwag --- android-configs/app-config.gradle | 7 +++++ android-configs/common-config.gradle | 22 +++++++++++++++ android-configs/lib-config.gradle | 3 +++ android-plugins/build.gradle.kts | 18 +++++++++++++ .../kotlin/plugins/lib-settings.gradle.kts | 27 +++++++++++++++++++ .../gradle-plugins/android_app.properties | 1 + 6 files changed, 78 insertions(+) create mode 100644 android-configs/app-config.gradle create mode 100644 android-configs/common-config.gradle create mode 100644 android-configs/lib-config.gradle create mode 100644 android-plugins/build.gradle.kts create mode 100644 android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts create mode 100644 android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties diff --git a/android-configs/app-config.gradle b/android-configs/app-config.gradle new file mode 100644 index 0000000..2d0cbf8 --- /dev/null +++ b/android-configs/app-config.gradle @@ -0,0 +1,7 @@ +apply plugin: 'com.android.application' + +apply from: '../RoboSwag/android-configs/common-config.gradle' + +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' \ No newline at end of file diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle new file mode 100644 index 0000000..f74b344 --- /dev/null +++ b/android-configs/common-config.gradle @@ -0,0 +1,22 @@ +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 29 + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 29 + + multiDexEnabled = true + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + +} diff --git a/android-configs/lib-config.gradle b/android-configs/lib-config.gradle new file mode 100644 index 0000000..954df9f --- /dev/null +++ b/android-configs/lib-config.gradle @@ -0,0 +1,3 @@ +apply plugin: 'com.android.library' + +apply from: '../android-configs/common-config.gradle' \ No newline at end of file diff --git a/android-plugins/build.gradle.kts b/android-plugins/build.gradle.kts new file mode 100644 index 0000000..b044b2e --- /dev/null +++ b/android-plugins/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + `kotlin-dsl` + `kotlin-dsl-precompiled-script-plugins` +} + +repositories { + jcenter() + google() +} + +dependencies { + implementation("com.android.tools.build:gradle:4.0.0") + + implementation("com.android.tools.build:gradle-api:4.0.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61") + +} diff --git a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts new file mode 100644 index 0000000..ff0c3cd --- /dev/null +++ b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts @@ -0,0 +1,27 @@ + +plugins { + id("com.android.application") apply false + id("kotlin-android") + id("kotlin-android-extensions") +} + +android { + compileSdkVersion(29) + + defaultConfig { + minSdkVersion(21) + targetSdkVersion(29) + + multiDexEnabled = true + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + +} diff --git a/android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties b/android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties new file mode 100644 index 0000000..e5d4100 --- /dev/null +++ b/android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties @@ -0,0 +1 @@ +implementation-class=plugins.AndroidAppPlugin From 2599f4a2c7c73bd63a1f23ed0ef0688ff5a40598 Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Tue, 23 Jun 2020 17:41:47 +0300 Subject: [PATCH 5/7] update crashlytics required version --- logging/build.gradle | 2 +- navigation-base/build.gradle | 2 +- navigation-viewcontroller/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/logging/build.gradle b/logging/build.gradle index e1c188e..1cc7977 100644 --- a/logging/build.gradle +++ b/logging/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation("com.crashlytics.sdk.android:crashlytics") { version { - require '2.5.0' + require '2.10.0' } } } diff --git a/navigation-base/build.gradle b/navigation-base/build.gradle index d99d1b4..e444e8a 100644 --- a/navigation-base/build.gradle +++ b/navigation-base/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation("com.crashlytics.sdk.android:crashlytics") { version { - require '2.0.0' + require '2.10.0' } } } diff --git a/navigation-viewcontroller/build.gradle b/navigation-viewcontroller/build.gradle index 9c1aae5..05bbe39 100644 --- a/navigation-viewcontroller/build.gradle +++ b/navigation-viewcontroller/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation("com.crashlytics.sdk.android:crashlytics") { version { - require '2.0.0' + require '2.10.0' } } } From 382f0d1da07cffbb9088dadb7ce3392fd52e9aed Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jun 2020 11:30:30 +0300 Subject: [PATCH 6/7] formatting fix --- android-configs/common-config.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle index f74b344..cda3a5c 100644 --- a/android-configs/common-config.gradle +++ b/android-configs/common-config.gradle @@ -5,9 +5,9 @@ android { defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 29 - multiDexEnabled = true + multiDexEnabled = true } compileOptions { From b6c5ca3a754e763e9f6444da06d4e0bb0754796d Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jun 2020 15:51:22 +0300 Subject: [PATCH 7/7] constants to root extensions --- android-configs/app-config.gradle | 2 +- android-configs/common-config.gradle | 16 ++++++++++------ .../main/kotlin/plugins/lib-settings.gradle.kts | 6 +----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android-configs/app-config.gradle b/android-configs/app-config.gradle index 2d0cbf8..cf6759d 100644 --- a/android-configs/app-config.gradle +++ b/android-configs/app-config.gradle @@ -4,4 +4,4 @@ apply from: '../RoboSwag/android-configs/common-config.gradle' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' \ No newline at end of file +apply plugin: 'kotlin-kapt' diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle index cda3a5c..4949440 100644 --- a/android-configs/common-config.gradle +++ b/android-configs/common-config.gradle @@ -1,13 +1,18 @@ apply plugin: 'kotlin-android' +rootProject.ext { + compileSdk = 29 + + minSdk = 21 + targetSdk = 29 +} + android { - compileSdkVersion 29 + compileSdkVersion rootProject.ext.compileSdk defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - - multiDexEnabled = true + minSdkVersion rootProject.ext.minSdk + targetSdkVersion rootProject.ext.targetSdk } compileOptions { @@ -18,5 +23,4 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - } diff --git a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts index ff0c3cd..016b271 100644 --- a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts +++ b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts @@ -1,4 +1,3 @@ - plugins { id("com.android.application") apply false id("kotlin-android") @@ -10,9 +9,7 @@ android { defaultConfig { minSdkVersion(21) - targetSdkVersion(29) - - multiDexEnabled = true + targetSdkVersion(29) } compileOptions { @@ -23,5 +20,4 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - }