From f3875bda50d3f9a216ddfb58e2ea831636a1c9e8 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 17 Aug 2020 15:24:11 -0400 Subject: [PATCH] Update to Kotlin 1.4 (cherry picked from commit 967df6f7a3ee7cdd618027801acf7ccb4fbda6a1) # Conflicts: # app/build.gradle --- app/build.gradle | 3 +-- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7544974db..983d63951 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -278,7 +278,7 @@ dependencies { // Licenses // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN - implementation "com.mikepenz:aboutlibraries:8.3.0" + implementation 'com.mikepenz:aboutlibraries:8.3.0' // Tests testImplementation 'junit:junit:4.13' @@ -290,7 +290,6 @@ 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" diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 1602df39a..6b9c1f921 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -4,7 +4,7 @@ object Versions { object BuildPluginsVersion { const val AGP = "4.0.1" - const val KOTLIN = "1.3.72" + const val KOTLIN = "1.4.0" const val KTLINT = "9.2.1" const val VERSIONS_PLUGIN = "0.28.0" }