From 61ad70b0fc3ff3b5455d2ce8075544680270d1e5 Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@gmail.com>
Date: Tue, 14 Dec 2021 11:55:42 +0100
Subject: [PATCH] deps: exclude unused transied dependencies

---
 jetcd-api/build.gradle    |  2 --
 jetcd-common/build.gradle | 22 ++++++++++++++++++++--
 jetcd-core/build.gradle   |  3 +--
 jetcd-grpc/build.gradle   | 27 +++++++++++++++++++++++++--
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/jetcd-api/build.gradle b/jetcd-api/build.gradle
index bca64aa76..f2246ebdb 100644
--- a/jetcd-api/build.gradle
+++ b/jetcd-api/build.gradle
@@ -17,6 +17,4 @@
 
 dependencies {
     api libs.slf4j
-    api libs.guava
-    api libs.grpcCore
 }
diff --git a/jetcd-common/build.gradle b/jetcd-common/build.gradle
index 4e16d87e3..6696df514 100644
--- a/jetcd-common/build.gradle
+++ b/jetcd-common/build.gradle
@@ -17,8 +17,26 @@
 
 dependencies {
     api libs.slf4j
-    api libs.guava
-    api libs.grpcCore
+
+    api(libs.guava) {
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+        exclude group: 'org.checkerframework', module: 'checker-qual'
+    }
+
+    api(libs.grpcCore) {
+        exclude group: 'com.google.code.gson', module: 'gson'
+        exclude group: 'com.google.android', module: 'annotations'
+        exclude group: 'com.google.guava', module: 'guava'
+        exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+        exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        exclude group: 'io.perfmark', module: 'perfmark-api'
+        exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+    }
 
     testImplementation libs.bundles.testing
     testRuntimeOnly libs.bundles.log4j
diff --git a/jetcd-core/build.gradle b/jetcd-core/build.gradle
index 0b7a29a30..84ed1363d 100644
--- a/jetcd-core/build.gradle
+++ b/jetcd-core/build.gradle
@@ -20,9 +20,7 @@ dependencies {
     api project(':jetcd-common')
 
     api libs.slf4j
-    api libs.guava
     api libs.javaxAnnotation
-    api libs.bundles.grpc
     api libs.spotbugs
     api libs.failsafe
 
@@ -30,6 +28,7 @@ dependencies {
     annotationProcessor libs.autoServiceProcessor
 
     testImplementation project(':jetcd-launcher')
+
     testImplementation project(':jetcd-test')
 
     testImplementation libs.awaitility
diff --git a/jetcd-grpc/build.gradle b/jetcd-grpc/build.gradle
index da06657a7..7c86e234d 100644
--- a/jetcd-grpc/build.gradle
+++ b/jetcd-grpc/build.gradle
@@ -20,13 +20,36 @@ plugins {
 
 dependencies {
     api libs.slf4j
-    api libs.bundles.grpc
     api libs.javaxAnnotation
+
+    api(libs.guava) {
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+        exclude group: 'org.checkerframework', module: 'checker-qual'
+    }
+
+    api(libs.bundles.grpc) {
+        exclude group: 'com.google.code.gson', module: 'gson'
+        exclude group: 'com.google.android', module: 'annotations'
+        exclude group: 'com.google.guava', module: 'guava'
+        exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+        exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        exclude group: 'io.perfmark', module: 'perfmark-api'
+        exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+    }
 }
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:${protocVersion}"
+        if (osdetector.os == "osx") {
+            artifact = "com.google.protobuf:protoc:${protocVersion}:osx-x86_64"
+        } else {
+            artifact = "com.google.protobuf:protoc:${protocVersion}"
+        }
     }
     plugins {
         grpc {