From 57c0e22af33a6dc33273a47b3c7742123028597e Mon Sep 17 00:00:00 2001
From: Colin Alworth <colinalworth@deephaven.io>
Date: Thu, 16 Dec 2021 09:55:09 -0600
Subject: [PATCH] Reduce scope of dependencies for faster/simplier rebuilds

---
 extensions/barrage/build.gradle               | 16 ++++-----
 grpc-api/grpc-api.gradle                      | 36 +++++++++----------
 java-client/session-dagger/build.gradle       |  2 ++
 .../proto-backplane-grpc-flight/build.gradle  |  2 +-
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/extensions/barrage/build.gradle b/extensions/barrage/build.gradle
index 0912b85b08f..1c08ea00c29 100644
--- a/extensions/barrage/build.gradle
+++ b/extensions/barrage/build.gradle
@@ -7,20 +7,20 @@ configurations {
     testCompile.extendsFrom irisDbTest
 }
 
-description = 'An extension integrating Barrage with Deephavens Table Model'
+description = 'An extension integrating Barrage with Deephaven\'s Table Model'
 
 dependencies {
-    api project(':Base')
-    api project(':Util')
+    implementation project(':Base')
+    implementation project(':Util')
     api project(':engine-table')
-    api project(':proto:proto-backplane-grpc-flight')
-    api project(':log-factory')
+    implementation project(':proto:proto-backplane-grpc-flight')
+    implementation project(':log-factory')
     api "io.deephaven.barrage:barrage-format:0.3.0"
 
-    Classpaths.inheritFlatbuffer(project, 'api')
+    Classpaths.inheritFlatbuffer(project, 'implementation')
 
-    Classpaths.inheritArrow(project, 'arrow-vector', 'api')
-    Classpaths.inheritArrow(project, 'arrow-format', 'api')
+    Classpaths.inheritArrow(project, 'arrow-vector', 'implementation')
+    Classpaths.inheritArrow(project, 'arrow-format', 'implementation')
 
     Classpaths.inheritImmutables(project)
 
diff --git a/grpc-api/grpc-api.gradle b/grpc-api/grpc-api.gradle
index 87eb3269db2..4069574b58d 100644
--- a/grpc-api/grpc-api.gradle
+++ b/grpc-api/grpc-api.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 configurations {
     // custom configuration, sourceset, test task to keep flight-core off the main/test classpath
-    flightTestCompile.extendsFrom(testCompile)
+    flightTestCompile.extendsFrom(testImplementation)
 }
 
 sourceSets {
@@ -20,25 +20,25 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':engine-table'),
-            project(':extensions-csv'),
-            project(':extensions-parquet-table'),
-            project(':Util'),
-            project(':java-client-barrage-dagger'),
-            project(':proto:proto-backplane-grpc-flight'),
-            project(':open-api-lang-tools'),
-            project(':log-factory'),
-            project(':application-mode'),
-            'com.github.f4b6a3:uuid-creator:3.6.0'
-
-    Classpaths.inheritFlatbuffer(project, 'compile')
+    implementation project(':engine-table')
+    implementation project(':extensions-csv')
+    implementation project(':extensions-parquet-table')
+    implementation project(':Util')
+    api project(':java-client-barrage-dagger')
+    implementation project(':proto:proto-backplane-grpc-flight')
+    implementation project(':open-api-lang-tools')
+    implementation project(':log-factory')
+    implementation project(':application-mode')
+    implementation 'com.github.f4b6a3:uuid-creator:3.6.0'
+
+    Classpaths.inheritFlatbuffer(project, 'implementation')
 
     Classpaths.inheritDagger(project)
     Classpaths.inheritDagger(project, /* test */ true)
 
-    compile project(':Plot')
+    implementation project(':Plot')
 
-    compile project(':ClientSupport')
+    implementation project(':ClientSupport')
 
     if ('true' == project.findProperty('extensions.classgraph.enabled')) {
         runtimeOnly project(':extensions-classgraph')
@@ -47,7 +47,7 @@ dependencies {
         runtimeOnly project(':extensions-suanshu')
     }
 
-    testCompile TestTools.projectDependency(project, 'engine-table'),
+    testImplementation TestTools.projectDependency(project, 'engine-table'),
                 TestTools.projectDependency(project, 'Util')
 
     runtimeOnly project(':Numerics'),
@@ -59,7 +59,7 @@ dependencies {
     Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
 
     // it is essential that this is only added to the classpath for flightTestCompile
-    Classpaths.inheritArrow(project, 'flight-grpc', 'flightTestCompile')
+    Classpaths.inheritArrow(project, 'flight-core', 'flightTestCompile')
 }
 
 // testOutOfBand: non-parallel, not a engine test, not isolated
diff --git a/java-client/session-dagger/build.gradle b/java-client/session-dagger/build.gradle
index 86b9898311d..6efc60d18cf 100644
--- a/java-client/session-dagger/build.gradle
+++ b/java-client/session-dagger/build.gradle
@@ -24,6 +24,8 @@ dependencies {
     Classpaths.inheritAssertJ(project)
 
     testImplementation TestTools.projectDependency(project, 'grpc-api')
+    testImplementation project(':java-client-flight')
+    testImplementation project(':proto:proto-backplane-grpc-flight')
     testImplementation project(':log-to-slf4j')
 }
 
diff --git a/proto/proto-backplane-grpc-flight/build.gradle b/proto/proto-backplane-grpc-flight/build.gradle
index 1abf91d6df5..ca3966977a4 100644
--- a/proto/proto-backplane-grpc-flight/build.gradle
+++ b/proto/proto-backplane-grpc-flight/build.gradle
@@ -6,7 +6,7 @@ description = 'The Deephaven proto-backplane-grpc-flight'
 
 dependencies {
     api project(':proto:proto-backplane-grpc')
-    Classpaths.inheritArrow(project, 'flight-grpc', 'api')
+    Classpaths.inheritArrow(project, 'flight-core', 'api')
 }
 
 apply plugin: 'io.deephaven.java-publishing-conventions'