From e13221b5035aa4727ebb173ac0e1def73d07bff7 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Sat, 7 Sep 2019 10:23:23 -0700
Subject: [PATCH] Apply japicmp plugin explicitly when needed

---
 auth/build.gradle          |  2 ++
 build.gradle               | 26 +++-----------------------
 context/build.gradle       |  1 +
 core/build.gradle          |  1 +
 grpclb/build.gradle        |  1 +
 netty/build.gradle         |  1 +
 okhttp/build.gradle        |  2 ++
 protobuf-lite/build.gradle |  1 +
 protobuf/build.gradle      |  1 +
 stub/build.gradle          |  2 ++
 testing/build.gradle       |  2 ++
 11 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/auth/build.gradle b/auth/build.gradle
index 85509f51df..a95d141962 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -1,5 +1,7 @@
 plugins {
     id "maven-publish"
+
+    id "me.champeau.gradle.japicmp"
 }
 
 description = "gRPC: Auth"
diff --git a/build.gradle b/build.gradle
index dbc0da1ee0..7591959fd7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -413,30 +413,10 @@ subprojects {
         }
         maxHeapSize = '1500m'
     }
-}
 
-// Run with: ./gradlew japicmp --continue
-def baselineGrpcVersion = '1.6.1'
-def publicApiSubprojects = [
-    // TODO: uncomment after grpc-alts, grpc-bom artifact is published.
-    // ':grpc-alts',
-    //':grpc-api',
-    ':grpc-auth',
-    //':grpc-bom',
-    ':grpc-context',
-    ':grpc-core',
-    ':grpc-grpclb',
-    ':grpc-netty',
-    ':grpc-okhttp',
-    ':grpc-protobuf',
-    ':grpc-protobuf-lite',
-    ':grpc-stub',
-    ':grpc-testing',
-]
-
-publicApiSubprojects.each { name ->
-    project(":$name") {
-        apply plugin: 'me.champeau.gradle.japicmp'
+    // Run with: ./gradlew japicmp --continue
+    plugins.withId("me.champeau.gradle.japicmp") {
+        def baselineGrpcVersion = '1.6.1'
 
         // Get the baseline version's jar for this subproject
         File baselineArtifact = null
diff --git a/context/build.gradle b/context/build.gradle
index b2c3c4d5a1..dbde77aa2c 100644
--- a/context/build.gradle
+++ b/context/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "maven-publish"
 
+    id "me.champeau.gradle.japicmp"
     id "me.champeau.gradle.jmh"
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index f9b81a0a97..4e0ef7dee0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "maven-publish"
 
+    id "me.champeau.gradle.japicmp"
     id "me.champeau.gradle.jmh"
 }
 
diff --git a/grpclb/build.gradle b/grpclb/build.gradle
index 7488fd0b52..c044e72091 100644
--- a/grpclb/build.gradle
+++ b/grpclb/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "maven-publish"
 
     id "com.google.protobuf"
+    id "me.champeau.gradle.japicmp"
 }
 
 description = "gRPC: GRPCLB LoadBalancer plugin"
diff --git a/netty/build.gradle b/netty/build.gradle
index 2143c3cd47..9076c7f0ac 100644
--- a/netty/build.gradle
+++ b/netty/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "maven-publish"
 
+    id "me.champeau.gradle.japicmp"
     id "me.champeau.gradle.jmh"
 }
 
diff --git a/okhttp/build.gradle b/okhttp/build.gradle
index 5b6fd6d468..c88bf262a3 100644
--- a/okhttp/build.gradle
+++ b/okhttp/build.gradle
@@ -1,5 +1,7 @@
 plugins {
     id "maven-publish"
+
+    id "me.champeau.gradle.japicmp"
 }
 
 description = "gRPC: OkHttp"
diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
index 49d42570c0..217f08795b 100644
--- a/protobuf-lite/build.gradle
+++ b/protobuf-lite/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "maven-publish"
 
     id "com.google.protobuf"
+    id "me.champeau.gradle.japicmp"
 }
 
 description = 'gRPC: Protobuf Lite'
diff --git a/protobuf/build.gradle b/protobuf/build.gradle
index 384bd3e2fb..fb1ca70c54 100644
--- a/protobuf/build.gradle
+++ b/protobuf/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "maven-publish"
 
     id "com.google.protobuf"
+    id "me.champeau.gradle.japicmp"
 }
 
 description = 'gRPC: Protobuf'
diff --git a/stub/build.gradle b/stub/build.gradle
index 6e9264b087..8a4e1e357c 100644
--- a/stub/build.gradle
+++ b/stub/build.gradle
@@ -1,5 +1,7 @@
 plugins {
     id "maven-publish"
+
+    id "me.champeau.gradle.japicmp"
 }
 
 description = "gRPC: Stub"
diff --git a/testing/build.gradle b/testing/build.gradle
index 450377072f..c156c7b45e 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -1,5 +1,7 @@
 plugins {
     id "maven-publish"
+
+    id "me.champeau.gradle.japicmp"
 }
 
 description = "gRPC: Testing"