From 8a0064fff8926f62474e835e39af8a5921556a81 Mon Sep 17 00:00:00 2001
From: Stefan Wolf <wolf@gradle.com>
Date: Wed, 8 Apr 2020 17:22:25 +0200
Subject: [PATCH] Consistently use GE plugin 3.2.1

---
 buildSrc/build.gradle.kts |  6 +-----
 settings.gradle.kts       | 12 +-----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 49f66c1f04807..28939cb538b2a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import java.util.*
 import org.gradle.internal.os.OperatingSystem
+import java.util.Properties
 
 plugins {
     `java`
@@ -88,10 +88,6 @@ allprojects {
                 excludeModule("com.google.j2objc", "j2objc-annotations")
             }
         }
-        maven {
-            name = "Gradle Enterprise Gradle plugin RC"
-            url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local")
-        }
         maven {
             name = "kotlinx"
             url = uri("https://dl.bintray.com/kotlin/kotlinx")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 75685f49afe0e..a402d2f5d6e1a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -20,21 +20,11 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
-        maven { url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local") }
-    }
-
-    // No plugin marker for plugin RC - can be removed when going to a final version
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "com.gradle.enterprise") {
-                useModule("com.gradle:gradle-enterprise-gradle-plugin:${requested.version}")
-            }
-        }
     }
 }
 
 plugins {
-    id("com.gradle.enterprise").version("3.2-rc-1")
+    id("com.gradle.enterprise").version("3.2.1")
 }
 
 apply(from = "gradle/build-cache-configuration.settings.gradle.kts")