From 58b1b7973af04c330e8f7480d0c5da9c7cbd2649 Mon Sep 17 00:00:00 2001
From: Ralf Wondratschek <ralf@squareup.com>
Date: Fri, 20 Nov 2020 11:52:21 -0800
Subject: [PATCH] Use the Kotlin 1.4 dependencies in the gradle plugin even
 though Gradle shows a warning. We need the new APIs.

---
 dependencies.gradle        | 7 -------
 gradle-plugin/build.gradle | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index e9f385219..0917216c9 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -70,13 +70,6 @@ ext {
           stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion",
       ],
 
-      // Required until Gradle uses Kotlin 1.4.
-      kotlin_gradle: [
-          gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72",
-          gradle_plugin_api: "org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.72",
-          stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72",
-      ],
-
       kotlinpoet: "com.squareup:kotlinpoet:1.7.2",
 
       truth: "com.google.truth:truth:1.0.1",
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
index 3e511753f..72e3e043f 100644
--- a/gradle-plugin/build.gradle
+++ b/gradle-plugin/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   }
 
   dependencies {
-    classpath deps.kotlin_gradle.gradle_plugin
+    classpath deps.kotlin.gradle_plugin
     classpath deps.maven_publishing_plugin
     classpath deps.gradle_publishing_plugin
     classpath deps.ktlint_plugin
@@ -75,9 +75,9 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
 }
 
 dependencies {
-  implementation deps.kotlin_gradle.gradle_plugin
-  implementation deps.kotlin_gradle.gradle_plugin_api
-  implementation deps.kotlin_gradle.stdlib
+  implementation deps.kotlin.gradle_plugin
+  implementation deps.kotlin.gradle_plugin_api
+  implementation deps.kotlin.stdlib
 
   // Compile only so that Java / Kotlin modules don't download it unnecessarily.
   compileOnly deps.android_gradle_plugin