From 9a26a3e5a29c13a7dad195d3743dd520ccca1bfa Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Fri, 14 Aug 2020 18:54:34 -0400
Subject: [PATCH] Revert "Slight gradle cleanup, plugin updates"

This reverts commit 08d11914afa08e6876feff589e21396b95265d88.
---
 app/build.gradle                         | 15 +++++++++------
 build.gradle.kts                         |  4 ++--
 buildSrc/src/main/kotlin/Dependencies.kt |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2bef7c126..20708938e 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -277,12 +277,13 @@ dependencies {
     implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
 
     // Licenses
-    // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN
-    implementation 'com.mikepenz:aboutlibraries:8.3.0'
+    final aboutlibraries_version = '8.3.0'
+    implementation "com.mikepenz:aboutlibraries-core:$aboutlibraries_version"
+    implementation "com.mikepenz:aboutlibraries:$aboutlibraries_version"
 
     // Tests
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
+    testImplementation 'org.assertj:assertj-core:3.12.2'
     testImplementation 'org.mockito:mockito-core:1.10.19'
 
     final robolectric_version = '3.1.4'
@@ -290,8 +291,9 @@ dependencies {
     testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
     testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$BuildPluginsVersion.KOTLIN"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+
 
     final coroutines_version = '1.3.8'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
@@ -357,11 +359,12 @@ dependencies {
 }
 
 buildscript {
+    ext.kotlin_version = '1.3.72'
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 875c61aa3..13d90a67f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("com.android.application") version BuildPluginsVersion.AGP apply false
     id("com.android.library") version BuildPluginsVersion.AGP apply false
     kotlin("android") version BuildPluginsVersion.KOTLIN apply false
-    id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT_PLUGIN
+    id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT
     id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
 }
 
@@ -42,7 +42,7 @@ buildscript {
         classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
         classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2")
         classpath("com.google.gms:google-services:4.3.3")
-        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0")
+        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.2.0")
         // Realm (EH)
         classpath("io.realm:realm-gradle-plugin:7.0.1")
 
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 57054b615..1602df39a 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,10 +1,10 @@
 object Versions {
-    const val KTLINT = "0.37.2"
+    const val KTLINT = "0.36.0"
 }
 
 object BuildPluginsVersion {
     const val AGP = "4.0.1"
     const val KOTLIN = "1.3.72"
-    const val KTLINT_PLUGIN = "9.3.0"
+    const val KTLINT = "9.2.1"
     const val VERSIONS_PLUGIN = "0.28.0"
 }