Skip to content

Commit

Permalink
Promote dependencies to api where necessary (#3167)
Browse files Browse the repository at this point in the history
Motivation:

Dependency-analysis plugin detected that some dependencies must be
declared as `api` while they have more restrictive scope today.
Promotion to `api` is a safe change for users.

Modifications:

- Update scope of dependencies to `api` as recommended by the plugin.
- Regenerate lock files.

Result:

Addresses warning from dependency-analysis plugin that recommend
different scope for main dependencies.
  • Loading branch information
idelpivnitskiy authored Jan 10, 2025
1 parent 724f755 commit cb6fd6c
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 20 deletions.
8 changes: 4 additions & 4 deletions servicetalk-concurrent-api-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"

dependencies {
api project(":servicetalk-buffer-api") // Buffer based Concurrent conversions
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-internal")
api project(":servicetalk-oio-api")

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-buffer-api") // Buffer based Concurrent conversions
implementation project(":servicetalk-concurrent-api")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-utils-internal")
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
testImplementation testFixtures(project(":servicetalk-concurrent-api"))
testImplementation testFixtures(project(":servicetalk-concurrent-internal"))
testImplementation project(":servicetalk-buffer-netty")
Expand Down
2 changes: 1 addition & 1 deletion servicetalk-concurrent-api-test/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-concurrent-test-internal/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-data-protobuf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ dependencies {
api platform("com.google.protobuf:protobuf-bom:$protobufVersion")
api project(":servicetalk-buffer-api")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-serialization-api")
api project(":servicetalk-serializer-api")
api "com.google.protobuf:protobuf-java"

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-serialization-api")
implementation project(":servicetalk-serializer-utils")

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
Expand Down
2 changes: 1 addition & 1 deletion servicetalk-grpc-internal/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-grpc-utils/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
com.google.protobuf:protobuf-bom:3.25.3=runtimeClasspath
com.google.protobuf:protobuf-java:3.25.3=runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-http-router-jersey-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ dependencies {
api project(":servicetalk-buffer-api")
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-api-internal")
api project(":servicetalk-http-api")
api "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"

implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-http-utils")
implementation project(":servicetalk-transport-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ dependencies {
api project(":servicetalk-buffer-api")
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-api-internal")
api project(":servicetalk-http-api")
api "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"

implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-http-utils")
implementation project(":servicetalk-transport-api")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ dependencies {
api project(":servicetalk-buffer-api")
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-api-internal")
api project(":servicetalk-http-api")
api "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"

implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-http-utils")
implementation project(":servicetalk-transport-api")
Expand Down
3 changes: 2 additions & 1 deletion servicetalk-log4j2-mdc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"

dependencies {
api project(":servicetalk-log4j2-mdc-utils")

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-log4j2-mdc-utils")

testImplementation enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
Expand Down
5 changes: 3 additions & 2 deletions servicetalk-router-utils-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"

dependencies {
api project(":servicetalk-router-api")
api project(":servicetalk-transport-api")

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api")
implementation project(":servicetalk-router-api")
implementation project(":servicetalk-transport-api")
}
2 changes: 1 addition & 1 deletion servicetalk-serialization-api/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-serializer-utils/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-test-resources/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
org.hamcrest:hamcrest:2.2=compileClasspath,runtimeClasspath
org.jctools:jctools-core:4.0.3=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath
empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor
2 changes: 1 addition & 1 deletion servicetalk-transport-netty-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies {
api project(":servicetalk-buffer-netty")
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-concurrent-api-internal")
api project(":servicetalk-logging-api")
api project(":servicetalk-transport-api")
api "io.netty:netty-buffer"
Expand All @@ -46,7 +47,6 @@ dependencies {

implementation platform("io.netty:netty-bom:$nettyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-context-api")
implementation project(":servicetalk-logging-slf4j-internal")
Expand Down
3 changes: 2 additions & 1 deletion servicetalk-utils-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"

dependencies {
api "org.slf4j:slf4j-api:$slf4jVersion"

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-buffer-api")
implementation "org.jctools:jctools-core:$jcToolsVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
testImplementation "org.junit.jupiter:junit-jupiter-api"
Expand Down

0 comments on commit cb6fd6c

Please sign in to comment.