From 6ef642fd1cf52e71b665c5213f366b0e6861d7dc Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Tue, 8 Sep 2020 18:47:24 +0300 Subject: [PATCH] fix gradle scripts for new modules --- android-plugins/build.gradle.kts | 18 ---- .../kotlin/plugins/lib-settings.gradle.kts | 23 ----- .../gradle-plugins/android_app.properties | 1 - mvi-arch/build.gradle | 86 +++++++++++++++++++ mvi-arch/build.gradle.kts | 13 --- navigation-cicerone/build.gradle | 27 ++++++ navigation-cicerone/build.gradle.kts | 10 --- pagination/build.gradle | 29 +++++++ pagination/build.gradle.kts | 12 --- 9 files changed, 142 insertions(+), 77 deletions(-) delete mode 100644 android-plugins/build.gradle.kts delete mode 100644 android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts delete mode 100644 android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties create mode 100644 mvi-arch/build.gradle delete mode 100644 mvi-arch/build.gradle.kts create mode 100644 navigation-cicerone/build.gradle delete mode 100644 navigation-cicerone/build.gradle.kts create mode 100644 pagination/build.gradle delete mode 100644 pagination/build.gradle.kts diff --git a/android-plugins/build.gradle.kts b/android-plugins/build.gradle.kts deleted file mode 100644 index b044b2e..0000000 --- a/android-plugins/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 016b271..0000000 --- a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id("com.android.application") apply false - id("kotlin-android") - id("kotlin-android-extensions") -} - -android { - compileSdkVersion(29) - - defaultConfig { - minSdkVersion(21) - targetSdkVersion(29) - } - - 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 deleted file mode 100644 index e5d4100..0000000 --- a/android-plugins/src/main/resources/META-INF/gradle-plugins/android_app.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=plugins.AndroidAppPlugin diff --git a/mvi-arch/build.gradle b/mvi-arch/build.gradle new file mode 100644 index 0000000..5306a90 --- /dev/null +++ b/mvi-arch/build.gradle @@ -0,0 +1,86 @@ +apply from: "../android-configs/lib-config.gradle" + +dependencies { + implementation project(":navigation-base") + implementation project(":lifecycle") + implementation project(":kotlin-extensions") + + implementation("androidx.core:core-ktx") + implementation("androidx.appcompat:appcompat") + + implementation("androidx.fragment:fragment") + implementation("androidx.fragment:fragment-ktx") + + implementation("androidx.lifecycle:lifecycle-extensions") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx") + implementation("androidx.lifecycle:lifecycle-livedata-ktx") + + implementation("com.google.dagger:dagger") + implementation("com.github.valeryponomarenko.componentsmanager:androidx") + + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android") + + def fragmentVersion = "1.2.1" + def lifecycleVersion = "2.2.0" + def coroutinesVersion = "1.3.7" + + constraints { + implementation("androidx.core:core-ktx") { + version { + require("1.2.0") + } + } + implementation("androidx.appcompat:appcompat") { + version { + require("1.0.2") + } + } + implementation("androidx.fragment:fragment") { + version { + require(fragmentVersion) + } + } + implementation("androidx.fragment:fragment-ktx") { + version { + require(fragmentVersion) + } + } + implementation("androidx.lifecycle:lifecycle-extensions") { + version { + require(lifecycleVersion) + } + } + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx") { + version { + require(lifecycleVersion) + } + } + implementation("androidx.lifecycle:lifecycle-livedata-ktx") { + version { + require(lifecycleVersion) + } + } + implementation("com.google.dagger:dagger") { + version { + require("2.27") + } + } + implementation("com.github.valeryponomarenko.componentsmanager:androidx") { + version { + require("2.1.0") + } + } + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core") { + version { + require(coroutinesVersion) + } + } + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android") { + version { + require(coroutinesVersion) + } + } + } + +} diff --git a/mvi-arch/build.gradle.kts b/mvi-arch/build.gradle.kts deleted file mode 100644 index 99febc6..0000000 --- a/mvi-arch/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) -} - -dependencies { - androidX() - fragment() - lifecycle() - - dagger() - - coroutines() -} diff --git a/navigation-cicerone/build.gradle b/navigation-cicerone/build.gradle new file mode 100644 index 0000000..a8a659d --- /dev/null +++ b/navigation-cicerone/build.gradle @@ -0,0 +1,27 @@ +apply from: "../android-configs/lib-config.gradle" + +dependencies { + implementation project(":navigation-base") + + implementation("ru.terrakok.cicerone:cicerone") + implementation("androidx.fragment:fragment") + implementation("com.google.dagger:dagger") + + constraints { + implementation("ru.terrakok.cicerone:cicerone") { + version { + require("5.1.0") + } + } + implementation("androidx.fragment:fragment") { + version { + require("1.2.1") + } + } + implementation("com.google.dagger:dagger") { + version { + require("2.27") + } + } + } +} diff --git a/navigation-cicerone/build.gradle.kts b/navigation-cicerone/build.gradle.kts deleted file mode 100644 index a4dc829..0000000 --- a/navigation-cicerone/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -plugins { - id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) -} - -dependencies { - implementationModule(Module.RoboSwag.NAVIGATION_BASE) - implementation(Library.CICERONE) - fragment() - dagger(withAssistedInject = false) -} diff --git a/pagination/build.gradle b/pagination/build.gradle new file mode 100644 index 0000000..98e100c --- /dev/null +++ b/pagination/build.gradle @@ -0,0 +1,29 @@ +apply from: "../android-configs/lib-config.gradle" + +dependencies { + implementation project(":mvi-arch") + implementation project(":recyclerview-adapters") + implementation project(":utils") + + implementation("com.google.android.material:material") + implementation("androidx.swiperefreshlayout:swiperefreshlayout") + implementation("androidx.recyclerview:recyclerview") + + constraints { + implementation("com.google.android.material:material") { + version { + require("1.2.0") + } + } + implementation("androidx.swiperefreshlayout:swiperefreshlayout") { + version { + require("1.0.0") + } + } + implementation("androidx.recyclerview:recyclerview") { + version { + require("1.1.0") + } + } + } +} diff --git a/pagination/build.gradle.kts b/pagination/build.gradle.kts deleted file mode 100644 index 53f07c6..0000000 --- a/pagination/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) -} - -dependencies { - mvi() - materialDesign() - recyclerView() - implementationModule(Module.RoboSwag.KOTLIN_EXTENSIONS) - implementationModule(Module.RoboSwag.VIEWS) - implementationModule(Module.RoboSwag.UTILS) -}