Merge branch 'main' into 188-final-type-comparison

deephaven · Jul 8, 2024 · 66ba1ee · 66ba1ee
2 parents 2936cf3 + a301587
commit 66ba1ee
Show file tree

Hide file tree

Showing 58 changed files with 131 additions and 231 deletions.
diff --git a/Base/build.gradle b/Base/build.gradle
@@ -7,9 +7,9 @@ dependencies {
 
     api project(':clock')
 
-    implementation depTrove3
-    compileOnlyApi depAnnotations
-    implementation depCommonsLang3
+    implementation libs.trove
+    compileOnlyApi libs.jetbrains.annotations
+    implementation libs.commons.lang3
 
     api 'io.deephaven:hash:0.1.0'
 

diff --git a/BenchmarkSupport/BenchmarkSupport.gradle b/BenchmarkSupport/BenchmarkSupport.gradle
@@ -2,14 +2,6 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom dhBenchmarkSupport
-
-    testImplementation.extendsFrom fishIoTest
-
-    testRuntimeOnly.extendsFrom fishDataGenerator
-}
-
 sourceSets {
     main {
         java {
@@ -34,7 +26,10 @@ dependencies {
     implementation project(':Configuration')
     implementation 'org.openjdk.jmh:jmh-core:1.20'
 
+    implementation libs.univocity.parsers
+
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')

diff --git a/ClientSupport/ClientSupport.gradle b/ClientSupport/ClientSupport.gradle
@@ -2,16 +2,12 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom dhConsole
-}
-
 dependencies {
     implementation project(':engine-table')
     implementation project(':engine-function')
     implementation project(':log-factory')
     implementation project(':Configuration')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
     testImplementation project(':engine-test-utils')
     testImplementation libs.junit4

diff --git a/Configuration/build.gradle b/Configuration/build.gradle
@@ -1,13 +1,16 @@
 plugins {
+    id 'java-library'
     id 'io.deephaven.project.register'
 }
 
 dependencies {
+    api libs.trove
+
     implementation project(':Base')
     implementation project(':DataStructures')
     implementation project(':IO')
     implementation project(':log-factory')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
     testImplementation libs.junit4
     testImplementation libs.jmock.junit4
     testImplementation libs.jmock.imposters
@@ -16,6 +19,7 @@ dependencies {
     annotationProcessor libs.autoservice.compiler
 
     testImplementation project(path: ':Base', configuration: 'tests')
+    testImplementation libs.commons.compress
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly libs.slf4j.simple

diff --git a/Generators/Generators.gradle b/Generators/Generators.gradle
@@ -6,8 +6,6 @@ plugins {
 evaluationDependsOn Docker.registryProject('python')
 
 configurations {
-    implementation.extendsFrom jdom
-    testImplementation.extendsFrom fishBaseTest
     combinedJavadoc
 }
 
@@ -17,7 +15,7 @@ dependencies {
     implementation project(':extensions-csv')
     implementation project(':extensions-kafka')
     implementation project(':extensions-parquet-table')
-    implementation depTrove3
+    implementation libs.trove
 
     implementation libs.groovy
     implementation libs.groovy.json
@@ -29,6 +27,8 @@ dependencies {
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly libs.logback.classic
 
+    testImplementation project(path: ':Base', configuration: 'tests')
+
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
 

diff --git a/IO/build.gradle b/IO/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation project(':Base')
     implementation project(':SevenZip')
-    implementation depCommonsCompress
+    implementation libs.commons.compress
     testImplementation project(path: ':Base', configuration: 'tests')
     testImplementation libs.junit4
     testImplementation libs.jmock.junit4

diff --git a/Integrations/build.gradle b/Integrations/build.gradle
@@ -9,11 +9,6 @@ plugins {
 
 evaluationDependsOn ':docker-server-jetty'
 
-configurations {
-    implementation.extendsFrom dhIntegrations
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
 
     implementation project(':engine-table')
@@ -22,6 +17,7 @@ dependencies {
     implementation project(':log-factory')
 
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     // Needed for CalendarInit
     testRuntimeOnly TestTools.projectDependency(project, 'engine-time')

diff --git a/ModelFarm/ModelFarm.gradle b/ModelFarm/ModelFarm.gradle
@@ -7,10 +7,6 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-table')
     api project(':engine-time')
@@ -21,6 +17,7 @@ dependencies {
     runtimeOnly project(':configs')
 
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')

diff --git a/Numerics/Numerics.gradle b/Numerics/Numerics.gradle
@@ -3,17 +3,15 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    implementation.extendsFrom dhNumerics
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-time')
     implementation project(':engine-function')
     implementation project(':log-factory')
+    implementation libs.jama
+    implementation libs.commons.math3
 
     testImplementation project(':base-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
 

diff --git a/Plot/Plot.gradle b/Plot/Plot.gradle
@@ -3,19 +3,15 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    implementation.extendsFrom dhPlot
-
-    testImplementation.extendsFrom fishIoTest
-}
-
 dependencies {
 
     api project(':engine-api')
+    implementation project(':Base')
     implementation project(':engine-table')
     implementation project(':engine-function')
     implementation project(':engine-tuple')
     implementation project(':log-factory')
+    implementation project(':Configuration')
 
     api libs.groovy
     implementation libs.groovy.json
@@ -25,9 +21,11 @@ dependencies {
     compileOnly 'javax.inject:javax.inject:1'
 
     implementation libs.guava
+    implementation libs.commons.lang3
 
     testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-time')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')

diff --git a/R/build.gradle b/R/build.gradle
@@ -179,7 +179,10 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
         runCommand('''echo "status = tryCatch(" \
                            "   {" \
-                           "      install.packages('pkgdown', repos='https://cran.r-project.org'); " \
+                           "      install.packages('devtools'); " \
+                           "      require(devtools); " \
+                           "      remove.packages('pkgdown'); " \
+                           "      devtools::install_version('pkgdown', version='2.0.0', repos='https://cran.r-project.org'); " \
                            "      0" \
                            "   }," \
                            "  error=function(e) 1," \

diff --git a/Util/Util.gradle b/Util/Util.gradle
@@ -3,14 +3,15 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom configurations.dhUtil, commonsLang3
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-query-constants')
+    implementation project(':Base')
     implementation project(':log-factory')
+    implementation libs.jdom2
+    implementation libs.commons.compress
+
+    implementation project(':DataStructures')
+    implementation project(':Configuration')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
@@ -19,6 +20,7 @@ dependencies {
     testRuntimeOnly libs.slf4j.simple
 
     testImplementation project(':base-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
     testImplementation platform(libs.junit.bom)
     testImplementation libs.junit.jupiter
     testRuntimeOnly libs.junit.jupiter.engine

diff --git a/Util/channel/build.gradle b/Util/channel/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     // For CountingInputStream
     implementation libs.guava
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
     testImplementation libs.assertj
     testImplementation platform(libs.junit.bom)

diff --git a/Util/function/build.gradle b/Util/function/build.gradle
@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api project(':qst-type')
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
     testImplementation libs.assertj
     testImplementation platform(libs.junit.bom)

diff --git a/base-test-utils/build.gradle b/base-test-utils/build.gradle
@@ -6,9 +6,9 @@ plugins {
 dependencies {
 
     implementation project(':Base')
-    implementation depTrove3
-    compileOnlyApi depAnnotations
-    implementation depCommonsLang3
+    implementation libs.trove
+    compileOnlyApi libs.jetbrains.annotations
+    implementation libs.commons.lang3
 
     api 'io.deephaven:hash:0.1.0'
 

diff --git a/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'base'
     id 'java'
-    id 'io.deephaven.java-classpath-conventions'
     id 'io.deephaven.java-license-conventions'
     id 'io.deephaven.java-toolchain-conventions'
     id 'io.deephaven.java-jar-conventions'

diff --git a/engine/api/build.gradle b/engine/api/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     api project(':engine-rowset')
 
     implementation project(':DataStructures')
-    implementation depTrove3
+    implementation libs.trove
 
     compileOnly project(':util-immutables')
     annotationProcessor libs.immutables
@@ -29,7 +29,7 @@ dependencies {
     testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-table')
     testImplementation TestTools.projectDependency(project, 'engine-vector')
-    testImplementation depCommonsLang3
+    testImplementation libs.commons.lang3
 
     testImplementation libs.junit4