From 039737eac92adf6a23a1b45bfcbcdc161827fa1e Mon Sep 17 00:00:00 2001
From: Vladimir <vovaaksenov99@mail.ru>
Date: Sat, 18 Apr 2020 15:30:19 +0300
Subject: [PATCH] Updated dependencies, multi-modules static

---
 app/build.gradle                         |  3 ---
 build.gradle                             | 19 ++++++++++++++-----
 gradle.properties                        |  1 -
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle                          |  3 ++-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index edf8f7d..0da21ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,8 +55,6 @@ android {
             minifyEnabled true
             shrinkResources true
             ext.enableCrashlytics = true
-            ext.betaDistributionGroupAliases = "touch-instinct"
-            ext.betaDistributionReleaseNotesFilePath = file("release-notes.txt")
             signingConfig signingConfigs.release
         }
     }
@@ -175,6 +173,5 @@ dependencies {
 //}
 
 //apply from: "$buildScriptsDir/gradle/stringGenerator.gradle"
-apply from: "$buildScriptsDir/gradle/staticAnalysis.gradle"
 apply from: "$buildScriptsDir/gradle/apiGenerator.gradle"
 apply from: "$buildScriptsDir/gradle/applicationFileNaming.gradle"
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 29415ce..0d41c1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,25 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.71'
-    ext.gradle_version = '3.5.2'
+    ext.kotlin_version = '1.3.72'
+    ext.gradle_version = '3.6.2'
     ext.fabric_version = '1.27.1'
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:${gradle_version}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'de.aaschmid:gradle-cpd-plugin:1.3'
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.5.1"
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta04'
     }
+
+}
+
+plugins {
+    id "io.gitlab.arturbosch.detekt" version "1.7.4"
+    id "de.aaschmid.cpd" version "3.1"
 }
 
 allprojects {
@@ -57,3 +60,9 @@ ext {
             leakcanary         : '2.1'
     ]
 }
+
+subprojects {
+    apply plugin: "io.gitlab.arturbosch.detekt"
+}
+
+apply from: "$buildScriptsDir/gradle/staticAnalysis.gradle"
diff --git a/gradle.properties b/gradle.properties
index 72953d7..d20f0b5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,6 @@ org.gradle.jvmargs=-Xmx4096m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-org.gradle.configureondemand=true
 
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bf06348..7544f2d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/settings.gradle b/settings.gradle
index 9e122be..c4b9417 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
+include ':app'
+
 gradle.ext.roboswag = [
         'utils',
         'logging',
@@ -16,4 +18,3 @@ gradle.ext.roboswag.forEach { module ->
     project(":$module").projectDir = file("RoboSwag/$module")
 }
 
-include ':app'