From a19c5f42ab1fde9095a4834f93616c2bcc606125 Mon Sep 17 00:00:00 2001
From: Vaidotas Valuckas <vvaluckas@gradle.com>
Date: Fri, 10 Apr 2020 11:31:11 +0300
Subject: [PATCH] Precompile binary-compatibility.gradle as Groovy plugin

---
 .../binary-compatibility/binary-compatibility.gradle.kts    | 6 ++++++
 .../src/main/groovy}/binary-compatibility.gradle            | 0
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 subprojects/distributions/distributions.gradle              | 6 ++++--
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename {subprojects/distributions => buildSrc/subprojects/binary-compatibility/src/main/groovy}/binary-compatibility.gradle (100%)

diff --git a/buildSrc/subprojects/binary-compatibility/binary-compatibility.gradle.kts b/buildSrc/subprojects/binary-compatibility/binary-compatibility.gradle.kts
index 92e40ece3351..41a2673da52b 100644
--- a/buildSrc/subprojects/binary-compatibility/binary-compatibility.gradle.kts
+++ b/buildSrc/subprojects/binary-compatibility/binary-compatibility.gradle.kts
@@ -1,7 +1,13 @@
+plugins {
+    `groovy-gradle-plugin`
+}
+
 dependencies {
     api("me.champeau.gradle:japicmp-gradle-plugin:0.2.9")
 
     implementation(project(":kotlinDsl"))
+    implementation(project(":configuration"))
+    implementation(project(":versioning"))
 
     implementation("com.google.code.gson:gson:2.8.2")
     implementation("org.javassist:javassist:3.23.0-GA")
diff --git a/subprojects/distributions/binary-compatibility.gradle b/buildSrc/subprojects/binary-compatibility/src/main/groovy/binary-compatibility.gradle
similarity index 100%
rename from subprojects/distributions/binary-compatibility.gradle
rename to buildSrc/subprojects/binary-compatibility/src/main/groovy/binary-compatibility.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0522a921f262..320908df1b4a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.4-20200409155744+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.4-20200410071617+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/subprojects/distributions/distributions.gradle b/subprojects/distributions/distributions.gradle
index 71844c4e72e3..8dce7e529003 100644
--- a/subprojects/distributions/distributions.gradle
+++ b/subprojects/distributions/distributions.gradle
@@ -18,6 +18,10 @@ import org.gradle.gradlebuild.unittestandcompile.ModuleType
  * limitations under the License.
  */
 
+plugins {
+    id 'binary-compatibility'
+}
+
 // This is a groovy project because we have int tests.
 // Remove any pre-configured archives
 configurations.all {
@@ -219,5 +223,3 @@ integTestTasks.configureEach {
     systemProperty 'org.gradle.public.api.includes', PublicApi.includes.join(':')
     systemProperty 'org.gradle.public.api.excludes', PublicApi.excludes.join(':')
 }
-
-apply from: 'binary-compatibility.gradle'