Skip to content

Commit

Permalink
Update dependency declarations: adjust api vs implementation, remove …
Browse files Browse the repository at this point in the history
…unused ones

This change brings dependency analysis plugin:

  ./gradlew buildHealth --no-parallel --no-daemon

Most of the times the suggestions are good, however, there are still issues,
so don't blindly follow the recommendations.

See https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

vlsi committed Mar 5, 2021
1 parent 0fb14d5 commit b49693d
Showing 23 changed files with 69 additions and 45 deletions.
3 changes: 1 addition & 2 deletions babel/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -15,17 +15,16 @@
* limitations under the License.
*/
plugins {
kotlin("jvm")
id("com.github.vlsi.ide")
calcite.fmpp
calcite.javacc
}

dependencies {
api(project(":core"))
api("org.apache.calcite.avatica:avatica-core")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.slf4j:slf4j-api")

testImplementation("net.hydromatic:quidem")
18 changes: 18 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ plugins {
id("com.github.vlsi.gradle-extensions")
id("com.github.vlsi.license-gather") apply false
id("com.github.vlsi.stage-vote-release")
id("com.autonomousapps.dependency-analysis")
}

repositories {
@@ -233,6 +234,23 @@ val buildSqllineClasspath by tasks.registering(Jar::class) {
}
}

dependencyAnalysis {
// See https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
// Most of the time the recommendations are good, however, there are cases the suggestsions
// are off, so we don't include the dependency analysis to CI workflow yet
// ./gradlew buildHealth --no-parallel --no-daemon
issues {
all { // all projects
onAny {
severity("fail")
}
onRedundantPlugins {
severity("ignore")
}
}
}
}

val javaccGeneratedPatterns = arrayOf(
"org/apache/calcite/jdbc/CalciteDriverVersion.java",
"**/parser/**/*ParserImpl.*",
7 changes: 4 additions & 3 deletions cassandra/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -18,10 +18,11 @@ dependencies {
api(project(":core"))
api(project(":linq4j"))

implementation("com.datastax.cassandra:cassandra-driver-core")
implementation("com.google.guava:guava")
api("com.datastax.cassandra:cassandra-driver-core")
api("com.google.guava:guava")
api("org.slf4j:slf4j-api")

implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testImplementation("org.apache.cassandra:cassandra-all") {
11 changes: 6 additions & 5 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -39,34 +39,35 @@ val testMysql by configurations.creating(integrationTestConfig)
dependencies {
api(project(":linq4j"))

api("com.esri.geometry:esri-geometry-api")
api("com.fasterxml.jackson.core:jackson-annotations")
api("com.google.errorprone:error_prone_annotations")
api("com.google.guava:guava")
api("org.apache.calcite.avatica:avatica-core")
api("org.apiguardian:apiguardian-api")
api("org.checkerframework:checker-qual")
api("org.slf4j:slf4j-api")

implementation("com.esri.geometry:esri-geometry-api")
implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
implementation("com.google.errorprone:error_prone_annotations")
implementation("com.google.guava:guava")
implementation("com.google.uzaygezen:uzaygezen-core")
implementation("com.jayway.jsonpath:json-path")
implementation("com.yahoo.datasketches:sketches-core")
implementation("commons-codec:commons-codec")
implementation("net.hydromatic:aggdesigner-algorithm")
implementation("org.apache.commons:commons-dbcp2")
implementation("org.apache.commons:commons-lang3")
implementation("org.checkerframework:checker-qual")
implementation("commons-io:commons-io")
implementation("org.codehaus.janino:commons-compiler")
implementation("org.codehaus.janino:janino")
implementation("org.slf4j:slf4j-api")

testH2("com.h2database:h2")
testMysql("mysql:mysql-connector-java")
testOracle("com.oracle.ojdbc:ojdbc8")
testPostgresql("org.postgresql:postgresql")

testImplementation("commons-lang:commons-lang")
testImplementation("net.hydromatic:foodmart-data-hsqldb")
testImplementation("net.hydromatic:foodmart-queries")
testImplementation("net.hydromatic:quidem")
10 changes: 5 additions & 5 deletions druid/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.fasterxml.jackson.core:jackson-core")
api("joda-time:joda-time")
api("org.apache.calcite.avatica:avatica-core")
api("org.checkerframework:checker-qual")
api("org.slf4j:slf4j-api")

implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.google.guava:guava")
implementation("joda-time:joda-time")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")
implementation("org.checkerframework:checker-qual")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testImplementation("org.mockito:mockito-core")
9 changes: 5 additions & 4 deletions elasticsearch/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -25,16 +25,17 @@ dependencies {
api(project(":linq4j"))

api("com.fasterxml.jackson.core:jackson-annotations")
api("com.fasterxml.jackson.core:jackson-core")
api("com.fasterxml.jackson.core:jackson-databind")
api("org.elasticsearch.client:elasticsearch-rest-client")
api("org.slf4j:slf4j-api")

implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.httpcomponents:httpasyncclient")
implementation("org.apache.httpcomponents:httpclient")
implementation("org.apache.httpcomponents:httpcore")
implementation("org.checkerframework:checker-qual")
implementation("org.elasticsearch.client:elasticsearch-rest-client")
implementation("org.slf4j:slf4j-api")

// https://github.com/elastic/elasticsearch/issues/49218
if (project.props.bool("elasticStrictAsm", default = true)) {
4 changes: 1 addition & 3 deletions example/csv/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -23,14 +23,12 @@ dependencies {
api(project(":core"))
api(project(":file"))
api(project(":linq4j"))
api("org.checkerframework:checker-qual")

implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.google.guava:guava")
implementation("commons-io:commons-io")
implementation("net.sf.opencsv:opencsv")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")

testImplementation("sqlline:sqlline")
testImplementation(project(":core", "testClasses"))
1 change: 1 addition & 0 deletions example/function/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.checkerframework:checker-qual")

implementation("com.google.guava:guava") {
because("""ForbiddenApis' signatures.txt contains com.google.common.base.Precondition
3 changes: 3 additions & 0 deletions file/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.checkerframework:checker-qual")

implementation("com.google.guava:guava")
implementation("com.joestelmach:natty")
@@ -25,6 +26,8 @@ dependencies {
implementation("commons-io:commons-io")
implementation("org.apache.commons:commons-lang3")
implementation("org.jsoup:jsoup")
implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")

testImplementation(project(":core", "testClasses"))
}
5 changes: 3 additions & 2 deletions geode/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,12 +17,13 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.apache.geode:geode-core")
api("org.checkerframework:checker-qual")
api("org.slf4j:slf4j-api")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")
implementation("org.apache.geode:geode-core")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testImplementation("com.fasterxml.jackson.core:jackson-databind")
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@ calcite.avatica.version=1.17.0
# publishGradleMetadata=true

# Plugins
com.autonomousapps.dependency-analysis.version=0.71.0
org.checkerframework.version=0.5.16
com.github.autostyle.version=3.0
com.github.burrunan.s3-build-cache.version=1.1
5 changes: 3 additions & 2 deletions innodb/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.alibaba.database:innodb-java-reader")
api("com.google.guava:guava")

implementation("com.alibaba.database:innodb-java-reader")
implementation("com.google.guava:guava")
implementation("commons-collections:commons-collections")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")
implementation("org.slf4j:slf4j-api")
3 changes: 2 additions & 1 deletion kafka/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.apache.kafka:kafka-clients")
api("org.checkerframework:checker-qual")

implementation("com.google.guava:guava")
implementation("org.apache.kafka:kafka-clients")

testImplementation(project(":core", "testClasses"))
}
2 changes: 1 addition & 1 deletion linq4j/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
*/
dependencies {
api("org.apiguardian:apiguardian-api")
api("org.checkerframework:checker-qual")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.checkerframework:checker-qual")
}
4 changes: 2 additions & 2 deletions mongodb/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.google.guava:guava")
api("org.slf4j:slf4j-api")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.mongodb:mongo-java-driver")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testImplementation("de.bwaldvogel:mongo-java-server-core")
3 changes: 1 addition & 2 deletions pig/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,11 +17,10 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.google.guava:guava")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.pig:pig::h2")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testImplementation("org.apache.hadoop:hadoop-client")
4 changes: 2 additions & 2 deletions piglet/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@ plugins {
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.google.guava:guava")
api("org.apache.pig:pig::h2")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.hadoop:hadoop-common")
implementation("org.apache.pig:pig::h2")
implementation("org.checkerframework:checker-qual")
implementation("org.slf4j:slf4j-api")

6 changes: 3 additions & 3 deletions plus/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,16 +17,16 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("net.hydromatic:quidem")
api("org.apache.calcite.avatica:avatica-core")
api("org.checkerframework:checker-qual")

implementation("com.google.guava:guava")
implementation("com.teradata.tpcds:tpcds")
implementation("io.prestosql.tpch:tpch")
implementation("net.hydromatic:chinook-data-hsqldb")
implementation("net.hydromatic:quidem")
implementation("net.hydromatic:tpcds")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.calcite.avatica:avatica-server")
implementation("org.eclipse.jetty:jetty-server")
implementation("org.hsqldb:hsqldb")

testImplementation(project(":core", "testClasses"))
4 changes: 1 addition & 3 deletions redis/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,17 +17,15 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("redis.clients:jedis")

implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.github.kstyrc:embedded-redis")
implementation("com.google.guava:guava")
implementation("joda-time:joda-time")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.apache.commons:commons-lang3")
implementation("org.apache.commons:commons-pool2")
implementation("org.slf4j:slf4j-api")
implementation("redis.clients:jedis")

testImplementation(project(":core", "testClasses"))
testImplementation("com.github.kstyrc:embedded-redis")
2 changes: 1 addition & 1 deletion server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -23,9 +23,9 @@ plugins {
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.apache.calcite.avatica:avatica-core")

implementation("com.google.guava:guava")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ pluginManagement {
fun String.v() = extra["$this.version"].toString()
fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) version key.v()

idv("com.autonomousapps.dependency-analysis")
idv("org.checkerframework")
idv("com.github.autostyle")
idv("com.github.burrunan.s3-build-cache")
2 changes: 1 addition & 1 deletion spark/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("org.apache.spark:spark-core_2.10")

implementation("com.google.guava:guava")
implementation("org.apache.spark:spark-core_2.10")
implementation("org.eclipse.jetty:jetty-server")
implementation("org.eclipse.jetty:jetty-util")
implementation("org.scala-lang:scala-library")
6 changes: 3 additions & 3 deletions splunk/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@
dependencies {
api(project(":core"))
api(project(":linq4j"))
api("com.google.guava:guava")
api("org.apache.calcite.avatica:avatica-core")
api("org.slf4j:slf4j-api")

implementation("com.google.guava:guava")
implementation("net.sf.opencsv:opencsv")
implementation("org.apache.calcite.avatica:avatica-core")
implementation("org.slf4j:slf4j-api")

testImplementation(project(":core", "testClasses"))
testRuntimeOnly("org.slf4j:slf4j-log4j12")

0 comments on commit b49693d

Please sign in to comment.