Merge branch 'release/sprint-4-5' into prod

Author: Mikhail Vorozhtsov

.detekt/detekt-config.yml

@@ -124,10 +124,10 @@ complexity:
     threshold: 600
   LongMethod:
     active: true
-    threshold: 60
+    threshold: 600
   LongParameterList:
     active: true
-    functionThreshold: 6
+    functionThreshold: 10
     constructorThreshold: 7
     ignoreDefaultParameters: false
     ignoreDataClasses: true

build.gradle.kts

@@ -6,6 +6,14 @@ plugins {
     id("io.gitlab.arturbosch.detekt") version Dependencies.Plugins.DETEKT_VERSION
 }
 
+buildscript {
+    dependencies {
+        Dependencies.Firebase.ALL_GRADLE_PLUGINS.forEach {
+            classpath(it)
+        }
+    }
+}
+
 tasks {
     val detektAll by registering(io.gitlab.arturbosch.detekt.Detekt::class) {
         parallel = true

buildSrc/src/main/kotlin/consts/Dependencies.kt

@@ -86,6 +86,15 @@ object Dependencies {
             val ALL_RXJAVA_DEPS = listOf(RX_JAVA)
         }
 
+        object UiTest {
+
+            // add to build.gradle with androidTestImplementation()
+            const val UI_TEST = "androidx.compose.ui:ui-test-junit4:$COMPOSE_VERSION"
+
+            // add to build.gradle with debugImplementation
+            const val UI_TEST_DEBUG = "androidx.compose.ui:ui-test-manifest:$COMPOSE_VERSION"
+        }
+
         val ALL_DEPS =
             Core.ALL_CORE_DEPS + Lifecycle.ALL_LIFECYCLE_DEPS + Foundation.ALL_FOUNDATION_DEPS +
                 RxJava.ALL_RXJAVA_DEPS + Navigation.ALL_NAVIGATION_DEPS
@@ -108,12 +117,25 @@ object Dependencies {
     }
 
     object Retrofit {
-        private const val VERSION = "2.9.0"
+        private const val RETROFIT_VERSION = "2.9.0"
+        private const val XMLRPC_VERSION = "1.2"
+
+        const val CONVERTER_GSON = "com.squareup.retrofit2:converter-gson:$RETROFIT_VERSION"
+        const val RETROFIT_DEPENDENCY = "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
+        const val RETROFIT_XMLRPC = "com.github.erickok:retrofit-xmlrpc:$XMLRPC_VERSION"
+        const val RX_ADAPTER = "com.squareup.retrofit2:adapter-rxjava3:$RETROFIT_VERSION"
+
+        val ALL_DEPS = listOf(CONVERTER_GSON, RETROFIT_DEPENDENCY, RETROFIT_XMLRPC, RX_ADAPTER)
+    }
 
-        const val CONVERTER_GSON = "com.squareup.retrofit2:converter-gson:$VERSION"
-        const val RETROFIT_DEPENDENCY = "com.squareup.retrofit2:retrofit:$VERSION"
+    object RxJava {
+        private const val RX_VERSION = "3.1.5"
+        private const val RX_ANDROID_VERSION = "3.0.2"
 
-        val ALL_DEPS = listOf(CONVERTER_GSON, RETROFIT_DEPENDENCY)
+        const val RXJAVA_DEPENDENCE = "io.reactivex.rxjava3:rxjava:$RX_VERSION"
+        const val RXJAVA_ANDROID = "io.reactivex.rxjava3:rxandroid:$RX_ANDROID_VERSION"
+
+        val ALL_DEPS = listOf(RXJAVA_DEPENDENCE, RXJAVA_ANDROID)
     }
 
     object Test {
@@ -135,6 +157,24 @@ object Dependencies {
         val ALL_DEPS = listOf(CONSTRAINT_LAYOUT, CORE)
     }
 
+    object Firebase {
+        private const val GOOGLE_SERVICES_VERSION = "4.3.14"
+        private const val BOM_VERSION = "31.1.0"
+        private const val CRASHLYTICS_GRADLE_VERSION = "2.9.2"
+
+        const val GOOGLE_SERVICES_GRADLE_PLUGIN = "com.google.gms:google-services:$GOOGLE_SERVICES_VERSION"
+        const val FIREBASE_CRASHLYTICS_GRADLE_PLUGIN =
+            "com.google.firebase:firebase-crashlytics-gradle:$CRASHLYTICS_GRADLE_VERSION"
+
+        const val FIREBASE_BOM = "com.google.firebase:firebase-bom:$BOM_VERSION"
+        const val FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx"
+        const val FIREBASE_CRASHLYTICS = "com.google.firebase:firebase-crashlytics-ktx"
+
+        val ALL_GRADLE_PLUGINS = listOf(GOOGLE_SERVICES_GRADLE_PLUGIN, FIREBASE_CRASHLYTICS_GRADLE_PLUGIN)
+
+        val ALL_DEPS = listOf(FIREBASE_ANALYTICS, FIREBASE_CRASHLYTICS)
+    }
+
     object Plugins {
         const val DETEKT_VERSION = "1.22.0-RC1"
 

buildSrc/src/main/kotlin/conventions/module/conventions.module-app.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
 
 /**
- * Конвеция для app модулей, которая содержит [conventions.base-api] и
+ * Конвеция для app модулей, которая содержит [conventions.base-app] и
  * добавляет необходимые зависимости
  *
  * @author Ворожцов Михаил
@@ -23,6 +23,10 @@ dependencies {
     implementation(Dependencies.Dagger.ANDROID)
     Dependencies.Dagger.KAPT_DEPS.forEach { kapt(it) }
 
+    // Firebase
+    Dependencies.Firebase.ALL_DEPS.forEach { implementation(it) }
+    implementation(platform(Dependencies.Firebase.FIREBASE_BOM))
+
     // Logger
     implementation(Dependencies.Logger.TIMBER)
 

buildSrc/src/main/kotlin/conventions/module_advanced/api/conventions.module-common-network-api.gradle.kts

@@ -0,0 +1,22 @@
+/**
+ * Convention for expansion [conventions.base-impl] for to generalize
+ * common dependencies in `common/network/-/api` modules
+ *
+ * @author Vorozhtsov Mikhail
+ * @since 27.11.2022
+ */
+plugins {
+    id("conventions.base-impl")
+}
+
+dependencies {
+
+    implementation(Dependencies.RxJava.RXJAVA_DEPENDENCE)
+
+    // Core
+    // DI
+    api(project(":core:di:api"))
+
+    // Utils
+    implementation(project(":core:utils"))
+}

…onventions.module-compose-api.gradle.kts …onventions.module-compose-api.gradle.ktsbuildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-api.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/api/conventions.module-compose-api.gradle.kts buildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-api.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/api/conventions.module-compose-api.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.dependencies
-
 /**
  * Конвеция для расширения [conventions.module-app] в andorid-compose состовляющую
  *
@@ -25,7 +23,7 @@ dependencies {
     // Android Core
     Dependencies.AndroidCore.ALL_DEPS.forEach { implementation(it) }
 
-    // // Compose
+    // Compose
     Dependencies.Compose.ALL_DEPS.forEach { implementation(it) }
     Dependencies.Compose.Core.ALL_CORE_DEBUG_DEPS.forEach { debugImplementation(it) }
 

…onventions.module-compose-app.gradle.kts …onventions.module-compose-app.gradle.ktsbuildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-app.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/app/conventions.module-compose-app.gradle.kts buildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-app.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/app/conventions.module-compose-app.gradle.kts

@@ -0,0 +1,23 @@
+/**
+ * Convention for expansion [conventions.module-impl] for to generalize
+ * common dependencies in `common/network/-/impl` modules
+ *
+ * @author Vorozhtsov Mikhail
+ * @since 27.11.2022
+ */
+plugins {
+    id("conventions.module-impl")
+}
+
+dependencies {
+
+    Dependencies.RxJava.ALL_DEPS.forEach { implementation(it) }
+
+    // Core
+    // Utils
+    implementation(project(":core:utils"))
+
+    // Core
+    // Retrofit Api Fabric
+    implementation(project(":core:retrofitApiFabric:impl"))
+}

buildSrc/src/main/kotlin/conventions/module_advanced/impl/conventions.module-common-network-impl.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.dependencies
-
 /**
  * Конвеция для расширения [conventions.module-impl] в android-compose состовляющую
  *
@@ -15,6 +13,10 @@ android {
         compose = true
     }
 
+    defaultConfig {
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = CompileVersions.COMPOSE_COMPILE_VERSION
     }
@@ -29,6 +31,14 @@ dependencies {
     Dependencies.Compose.ALL_DEPS.forEach { implementation(it) }
     Dependencies.Compose.Core.ALL_CORE_DEBUG_DEPS.forEach { debugImplementation(it) }
 
+    // Tests
+    androidTestImplementation(Dependencies.Compose.UiTest.UI_TEST)
+    debugImplementation(Dependencies.Compose.UiTest.UI_TEST_DEBUG)
+
     // UI
     Dependencies.UI.ALL_DEPS.forEach { implementation(it) }
+
+    // Core
+    // Utils
+    implementation(project(":core:utils"))
 }

…nventions.module-compose-impl.gradle.kts …nventions.module-compose-impl.gradle.ktsbuildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-impl.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/impl/conventions.module-compose-impl.gradle.kts buildSrc/src/main/kotlin/conventions/module_advanced/conventions.module-compose-impl.gradle.kts renamed to buildSrc/src/main/kotlin/conventions/module_advanced/impl/conventions.module-compose-impl.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    conventions.`module-common-network-api`
+}