Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Introduce gradle version catalog #5683

Merged
merged 34 commits into from
Jul 3, 2024
Merged

build: Introduce gradle version catalog #5683

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
87242c2
Demonstrate migrating BOM and regular dependencies to libs.versions.toml
devinrsmith Jun 24, 2024
fb0b20d
remove extraneous version ref on jackson-annotations
devinrsmith Jun 24, 2024
606f3b9
migrate elemental
devinrsmith Jun 24, 2024
a1be01c
migrate javaparser
devinrsmith Jun 24, 2024
f02c38c
migrate javax validation-api
devinrsmith Jun 24, 2024
76fefdf
migrate jsinterop
devinrsmith Jun 24, 2024
38f7f83
migrate commons text
devinrsmith Jun 24, 2024
2038b5b
migrate arrow
devinrsmith Jun 24, 2024
34dba27
migrate slf4j
devinrsmith Jun 24, 2024
bbcb3a4
migrate flatbuffers
devinrsmith Jun 24, 2024
46a3844
migrate dagger
devinrsmith Jun 24, 2024
2922c19
migrate autoservice
devinrsmith Jun 24, 2024
ce0bb61
migrate immutables
devinrsmith Jun 24, 2024
04f6123
migrate junit
devinrsmith Jun 24, 2024
9b4173b
migrate junit4
devinrsmith Jun 24, 2024
2961881
migrate jmock
devinrsmith Jun 24, 2024
9a3f0a9
migrate assertj
devinrsmith Jun 24, 2024
fbb7f42
migrate logback-classic
devinrsmith Jun 24, 2024
a1f56f8
migrate groovy
devinrsmith Jun 24, 2024
01c4887
migrate grpc
devinrsmith Jun 24, 2024
61c1d45
migrate protobuf-java
devinrsmith Jun 24, 2024
91a9fcc
migrate boringssl
devinrsmith Jun 24, 2024
fe54b43
migrate sslcontext
devinrsmith Jun 24, 2024
f4d2d93
migrate jetty
devinrsmith Jun 24, 2024
47d37ca
migrate guava
devinrsmith Jun 26, 2024
7d25291
migrate avro
devinrsmith Jun 26, 2024
b102eb0
migrate iceberg
devinrsmith Jun 26, 2024
3c59308
migrate parquet
devinrsmith Jun 26, 2024
3c1ec98
migrate awssdk
devinrsmith Jun 26, 2024
a66c617
Add newlines between library groups
devinrsmith Jun 26, 2024
8cdc6b9
review response
devinrsmith Jun 27, 2024
d74eee2
Merge remote-tracking branch 'upstream/main' into add-libs-versions-toml
devinrsmith Jul 1, 2024
2e43203
migrate hadoop-common and hadoop-hdfs-client
devinrsmith Jul 1, 2024
2acef60
migrate gwt, delete Classpaths
devinrsmith Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ dependencies {

api 'io.deephaven:hash:0.1.0'

Classpaths.inheritJUnitClassic(project, 'testImplementation')
Classpaths.inheritJMock(project, 'testImplementation')
testImplementation libs.junit4
testImplementation libs.jmock.junit4
testImplementation libs.jmock.imposters
testImplementation project(":base-test-utils")
}

Expand Down
2 changes: 1 addition & 1 deletion BenchmarkSupport/BenchmarkSupport.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ dependencies {
testRuntimeOnly project(':Numerics')

testRuntimeOnly project(':log-to-slf4j')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
8 changes: 4 additions & 4 deletions ClientSupport/ClientSupport.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ dependencies {
implementation depCommonsLang3

testImplementation project(':engine-test-utils')
Classpaths.inheritJUnitClassic(project, 'testImplementation')
Classpaths.inheritJUnitPlatform(project)
Classpaths.inheritAssertJ(project)
testImplementation libs.junit4
testImplementation platform(libs.junit.bom)
testImplementation libs.assertj

testRuntimeOnly project(':log-to-slf4j'),
project(path: ':configs'),
project(path: ':test-configs')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
10 changes: 6 additions & 4 deletions Configuration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ dependencies {
implementation project(':IO')
implementation project(':log-factory')
implementation depCommonsLang3
Classpaths.inheritJUnitClassic(project, 'testImplementation')
Classpaths.inheritJMock(project, 'testImplementation')
testImplementation libs.junit4
testImplementation libs.jmock.junit4
testImplementation libs.jmock.imposters

Classpaths.inheritAutoService(project)
compileOnly libs.autoservice
annotationProcessor libs.autoservice.compiler

testImplementation project(path: ':Base', configuration: 'tests')

testRuntimeOnly project(':log-to-slf4j')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion Container/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
Classpaths.inheritJUnitClassic(project, 'testImplementation')
testImplementation libs.junit4
}

spotless {
Expand Down
6 changes: 3 additions & 3 deletions Generators/Generators.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ dependencies {
implementation project(':extensions-parquet-table')
implementation depTrove3

Classpaths.inheritGroovy(project, 'groovy', 'implementation')
Classpaths.inheritGroovy(project, 'groovy-json', 'implementation')
implementation libs.groovy
implementation libs.groovy.json

runtimeOnly project(path: ':configs')
runtimeOnly project(path: ':test-configs')
runtimeOnly project(':extensions-kafka')

runtimeOnly project(':log-to-slf4j')
Classpaths.inheritLogbackClassic(project)
runtimeOnly libs.logback.classic

testRuntimeOnly project(path: ':configs')
testRuntimeOnly project(path: ':test-configs')
Expand Down
5 changes: 3 additions & 2 deletions IO/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ dependencies {
implementation project(':SevenZip')
implementation depCommonsCompress
testImplementation project(path: ':Base', configuration: 'tests')
Classpaths.inheritJUnitClassic(project, 'testImplementation')
Classpaths.inheritJMock(project, 'testImplementation')
testImplementation libs.junit4
testImplementation libs.jmock.junit4
testImplementation libs.jmock.imposters
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion ModelFarm/ModelFarm.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ dependencies {
testRuntimeOnly project(':log-to-slf4j')
testRuntimeOnly project(':configs')
testRuntimeOnly project(':test-configs')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
2 changes: 1 addition & 1 deletion Numerics/Numerics.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies {
testRuntimeOnly project(':log-to-slf4j'),
project(path: ':configs'),
project(path: ':test-configs')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
11 changes: 6 additions & 5 deletions Plot/Plot.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ dependencies {
implementation project(':engine-tuple')
implementation project(':log-factory')

Classpaths.inheritGroovy(project, 'groovy', 'api')
Classpaths.inheritGroovy(project, 'groovy-json', 'implementation')
Classpaths.inheritAutoService(project)
api libs.groovy
implementation libs.groovy.json
compileOnly libs.autoservice
annotationProcessor libs.autoservice.compiler

compileOnly 'javax.inject:javax.inject:1'

Classpaths.inheritGuava(project)
implementation libs.guava

testImplementation project(':engine-test-utils')
testImplementation TestTools.projectDependency(project, 'engine-time')
Expand All @@ -33,5 +34,5 @@ dependencies {
testRuntimeOnly project(':Numerics')

testRuntimeOnly project(':log-to-slf4j')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
4 changes: 2 additions & 2 deletions Stats/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies {
testImplementation project(path: ':Base', configuration: 'tests')

testRuntimeOnly project(':log-to-slf4j')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libs.XYZ is pretty nice, in that it's based on a symbol rather a string. I wonder if we could do similarly for project dependencies.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean its groovy, you can do just about anything. I believe I've seen this done on some other projects, I'll see if I can find where I saw it.

Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
Classpaths.inheritJUnitClassic(project, 'testImplementation')
testRuntimeOnly libs.slf4j.simple
testImplementation libs.junit4
}

test {
Expand Down
2 changes: 1 addition & 1 deletion TableLogger/TableLogger.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
runtimeOnly project(path: ':configs')

testRuntimeOnly project(':log-to-slf4j')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple
}
10 changes: 5 additions & 5 deletions Util/Util.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ dependencies {
testRuntimeOnly project(path: ':test-configs')

testRuntimeOnly project(':log-to-slf4j')
Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
testRuntimeOnly libs.slf4j.simple

Classpaths.inheritJUnitPlatform(project)
testImplementation project(':base-test-utils')
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation platform(libs.junit.bom)
testImplementation libs.junit.jupiter
testRuntimeOnly libs.junit.jupiter.engine
testRuntimeOnly libs.junit.platform.launcher
}
12 changes: 6 additions & 6 deletions Util/channel/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ dependencies {
implementation project(':Util')

// For CountingInputStream
Classpaths.inheritGuava(project)
implementation libs.guava

compileOnly depAnnotations

Classpaths.inheritJUnitPlatform(project)
Classpaths.inheritAssertJ(project)
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation libs.assertj
testImplementation platform(libs.junit.bom)
testImplementation libs.junit.jupiter
testRuntimeOnly libs.junit.jupiter.engine
testRuntimeOnly libs.junit.platform.launcher
}

test {
Expand Down
10 changes: 5 additions & 5 deletions Util/function/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ dependencies {

compileOnly depAnnotations

Classpaths.inheritJUnitPlatform(project)
Classpaths.inheritAssertJ(project)
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation libs.assertj
testImplementation platform(libs.junit.bom)
testImplementation libs.junit.jupiter
testRuntimeOnly libs.junit.jupiter.engine
testRuntimeOnly libs.junit.platform.launcher
}

test {
Expand Down
11 changes: 6 additions & 5 deletions application-mode/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ plugins {
dependencies {
implementation project(':Integrations')

Classpaths.inheritImmutables(project)
compileOnly project(':util-immutables')
annotationProcessor libs.immutables

// we'll rely on the engine-table module to provide the necessary groovy dependencies
Classpaths.inheritGroovy(project, 'groovy', 'compileOnly')
compileOnly libs.groovy

api project(':proto:proto-backplane-grpc')

implementation project(':Configuration')

Classpaths.inheritJUnitPlatform(project)
Classpaths.inheritAssertJ(project)
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation libs.assertj
testImplementation platform(libs.junit.bom)
testImplementation libs.junit.jupiter
}

test {
Expand Down
2 changes: 1 addition & 1 deletion authentication/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies {
implementation project(':log-factory')
implementation project(':Configuration')

Classpaths.inheritArrow(project, 'flight-core', 'implementation')
implementation libs.arrow.flight.core
}
2 changes: 1 addition & 1 deletion authentication/example-providers/sql-username-password/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
}

pwGen project(':log-to-stream')
Classpaths.inheritLogbackClassic(project, 'pwGen')
pwGen libs.logback.classic
}

shadowJar {
Expand Down
4 changes: 2 additions & 2 deletions authorization-codegen/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ description 'Deephaven Authorization Code Generator'
dependencies {
implementation project(':engine-api')

Classpaths.inheritGrpcPlatform(project, 'implementation')
implementation 'io.grpc:grpc-services'
implementation platform(libs.grpc.bom)
implementation libs.grpc.services

implementation 'com.squareup:javapoet:1.13.0'
}
6 changes: 3 additions & 3 deletions authorization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ dependencies {
api project(':engine-api')
api project(':proto:proto-backplane-grpc')

Classpaths.inheritGrpcPlatform(project, 'api')
api 'io.grpc:grpc-services'
Classpaths.inheritArrow(project, 'flight-core', 'api')
api platform(libs.grpc.bom)
api libs.grpc.services
api libs.arrow.flight.core

implementation project(':log-factory')
}
5 changes: 3 additions & 2 deletions base-test-utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies {

api 'io.deephaven:hash:0.1.0'

Classpaths.inheritJUnitClassic(project, 'api')
Classpaths.inheritJMock(project, 'api')
api libs.junit4
api libs.jmock.junit4
api libs.jmock.imposters
}
Loading
Loading