Skip to content

Commit

Permalink
Gradle spring cleaning (#1696)
Browse files Browse the repository at this point in the history
Gradle spring cleaning
  • Loading branch information
schlosna authored Apr 7, 2023
1 parent b757242 commit 6fbc548
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 57 deletions.
15 changes: 2 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ allprojects {
apply plugin: 'com.palantir.baseline-null-away'
apply plugin: 'com.palantir.jakarta-package-alignment'
apply plugin: 'com.palantir.java-format'
apply plugin: 'com.palantir.revapi'

configurations {
testImplementationClasspath {
Expand Down Expand Up @@ -111,22 +112,10 @@ allprojects {

tasks.withType(Javadoc).configureEach {
// suppress Javadoc doclint warnings in Java 8+
if (!System.getProperty("java.version").startsWith("1.7")) {
options.addStringOption('Xdoclint:none', '-quiet')
}
options.addStringOption('Xdoclint:none', '-quiet')
}
tasks.check.dependsOn(javadoc)

checkImplicitDependencies {
// avoid spurious flags on dropwizard metrics
ignore 'io.dropwizard.metrics', 'metrics-core'
}
checkUnusedDependencies {
// avoid spurious flags on junit-jupiter
ignore 'org.junit.jupiter', 'junit-jupiter'
}
tasks.check.dependsOn(checkImplicitDependencies)
tasks.check.dependsOn(checkUnusedDependencies)
tasks.check.dependsOn(checkUnusedConstraints)
}

3 changes: 0 additions & 3 deletions tritium-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

implementation 'com.google.code.findbugs:jsr305'
}

7 changes: 2 additions & 5 deletions tritium-caffeine/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

api project(':tritium-metrics')
api project(':tritium-registry')
api 'com.github.ben-manes.caffeine:caffeine'
api 'io.dropwizard.metrics:metrics-core'
api project(':tritium-metrics')
api project(':tritium-registry')

implementation 'com.google.guava:guava'
implementation 'com.palantir.safe-logging:logger'
Expand All @@ -21,4 +19,3 @@ dependencies {
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
}

4 changes: 1 addition & 3 deletions tritium-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

api project(':tritium-api')

implementation 'com.google.code.findbugs:jsr305'
Expand All @@ -12,10 +10,10 @@ dependencies {
implementation 'com.palantir.safe-logging:preconditions'
implementation 'com.palantir.safe-logging:safe-logging'

testImplementation project(':tritium-test')
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.mockito:mockito-core'
testImplementation project(':tritium-test')
}
9 changes: 3 additions & 6 deletions tritium-lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.metric-schema'
apply plugin: 'com.palantir.revapi'

dependencies {

api 'io.dropwizard.metrics:metrics-core'
api project(':tritium-api')
api project(':tritium-core')
api project(':tritium-metrics')
Expand All @@ -12,24 +11,22 @@ dependencies {
api project(':tritium-slf4j')
api project(':tritium-time')
api project(':tritium-tracing')
api 'io.dropwizard.metrics:metrics-core'

implementation 'net.bytebuddy:byte-buddy'
implementation 'com.google.code.findbugs:jsr305'
implementation 'com.google.errorprone:error_prone_annotations'
implementation 'com.google.guava:guava'
implementation 'com.palantir.safe-logging:logger'
implementation 'com.palantir.safe-logging:preconditions'
implementation 'com.palantir.safe-logging:safe-logging'
implementation 'io.dropwizard.metrics:metrics-core'
implementation 'net.bytebuddy:byte-buddy'
implementation 'org.slf4j:slf4j-api'

testImplementation project(':tritium-test')
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.slf4j:slf4j-simple'
testImplementation project(':tritium-test')
}

7 changes: 2 additions & 5 deletions tritium-metrics-jvm/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'
apply plugin: 'com.palantir.metric-schema'

dependencies {

api project(':tritium-registry')
api 'io.dropwizard.metrics:metrics-core'
api project(':tritium-registry')

implementation project(':tritium-metrics')
implementation 'com.google.code.findbugs:jsr305'
implementation 'com.google.guava:guava'
implementation 'com.palantir.jvm.diagnostics:jvm-diagnostics'
Expand All @@ -16,9 +13,9 @@ dependencies {
implementation 'com.palantir.safe-logging:safe-logging'
implementation 'io.dropwizard.metrics:metrics-core'
implementation 'io.dropwizard.metrics:metrics-jvm'
implementation project(':tritium-metrics')

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
}

9 changes: 3 additions & 6 deletions tritium-metrics/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'
apply plugin: 'com.palantir.metric-schema'

dependencies {

api 'io.dropwizard.metrics:metrics-core'
api project(':tritium-api')
api project(':tritium-core')
api project(':tritium-registry')
api 'io.dropwizard.metrics:metrics-core'

implementation 'com.google.code.findbugs:jsr305'
implementation 'com.google.guava:guava'
implementation 'com.palantir.safe-logging:logger'
implementation 'com.palantir.safe-logging:preconditions'
implementation 'com.palantir.safe-logging:safe-logging'
implementation 'org.hdrhistogram:HdrHistogram'
implementation ('org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir') {
exclude group: 'io.dropwizard.metrics', module: 'metrics-core'
exclude group: 'org.hdrhistogram', module: 'HdrHistogram'
}
implementation 'org.hdrhistogram:HdrHistogram'

testImplementation project(':tritium-test')
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'io.undertow:undertow-core'
testImplementation 'org.assertj:assertj-core'
Expand All @@ -31,5 +28,5 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation project(':tritium-test')
}

5 changes: 1 addition & 4 deletions tritium-proxy/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

testImplementation project(':tritium-test')

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation project(':tritium-test')
}
3 changes: 0 additions & 3 deletions tritium-registry/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

annotationProcessor 'com.google.auto.service:auto-service'
compileOnly 'com.google.auto.service:auto-service-annotations'

Expand All @@ -24,4 +22,3 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testImplementation 'org.mockito:mockito-core'
}

5 changes: 1 addition & 4 deletions tritium-slf4j/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

api project(':tritium-api')
api project(':tritium-core')

Expand All @@ -12,11 +10,10 @@ dependencies {
implementation 'com.palantir.safe-logging:safe-logging'
implementation 'org.slf4j:slf4j-api'

testImplementation project(':tritium-test')
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testImplementation 'org.slf4j:slf4j-simple'
testImplementation project(':tritium-test')
}

2 changes: 0 additions & 2 deletions tritium-time/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'
apply plugin: 'me.champeau.jmh'

dependencies {

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
Expand Down
4 changes: 1 addition & 3 deletions tritium-tracing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {

api project(':tritium-api')
api project(':tritium-core')

Expand All @@ -13,12 +11,12 @@ dependencies {
implementation 'com.palantir.safe-logging:safe-logging'
implementation 'com.palantir.tracing:tracing'

testImplementation project(':tritium-test')
testImplementation 'com.palantir.tracing:tracing-api'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.slf4j:slf4j-api'
testImplementation project(':tritium-test')
}

0 comments on commit 6fbc548

Please sign in to comment.