From 159146e1977fddb8e0e6da90c104cbc3cf81ab5a Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Mon, 10 Aug 2020 22:49:46 -0400
Subject: [PATCH] Slight gradle cleanup, plugin updates

---
 app/build.gradle                         | 12 +++++-------
 build.gradle.kts                         |  4 ++--
 buildSrc/src/main/kotlin/Dependencies.kt |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 181c706e2..4f5df7db6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -260,13 +260,12 @@ dependencies {
     implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
 
     // Licenses
-    final aboutlibraries_version = '8.3.0'
-    implementation "com.mikepenz:aboutlibraries-core:$aboutlibraries_version"
-    implementation "com.mikepenz:aboutlibraries:$aboutlibraries_version"
+    // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN
+    implementation 'com.mikepenz:aboutlibraries:8.3.0'
 
     // Tests
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.assertj:assertj-core:3.12.2'
+    testImplementation 'org.assertj:assertj-core:3.16.1'
     testImplementation 'org.mockito:mockito-core:1.10.19'
 
     final robolectric_version = '3.1.4'
@@ -274,7 +273,7 @@ dependencies {
     testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
     testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$BuildPluginsVersion.KOTLIN"
 
     final coroutines_version = '1.3.8'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
@@ -289,12 +288,11 @@ dependencies {
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 39bd555c5..a1ab0c11f 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
+    id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT_PLUGIN
     id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
 }
 
@@ -39,7 +39,7 @@ buildscript {
     dependencies {
         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.2.0")
+        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0")
     }
     repositories {
         google()
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 1602df39a..57054b615 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.36.0"
+    const val KTLINT = "0.37.2"
 }
 
 object BuildPluginsVersion {
     const val AGP = "4.0.1"
     const val KOTLIN = "1.3.72"
-    const val KTLINT = "9.2.1"
+    const val KTLINT_PLUGIN = "9.3.0"
     const val VERSIONS_PLUGIN = "0.28.0"
 }