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

Small consistency #5931

Merged
merged 1 commit into from
Apr 25, 2022
Merged

Small consistency #5931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sourceSets {
}

dependencies {
compileOnly(project(path = ":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded", configuration = "shadow"))
compileOnly(project(":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded", configuration = "shadow"))

library("com.azure:azure-core:1.14.0")

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sourceSets {
}

dependencies {
compileOnly(project(path = ":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded", configuration = "shadow"))
compileOnly(project(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded", configuration = "shadow"))

library("com.azure:azure-core:1.19.0")

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ subprojects {
// this only exists to make Intellij happy since it doesn't (currently at least) understand our
// inclusion of this artifact inside :testing-common
dependencies {
compileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow"))
testCompileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow"))
compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
// the @WithSpan annotation references the OpenTelemetry API's SpanKind class
//
// see the comment in opentelemetry-api-1.0.gradle for more details
compileOnly(project(path = ":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow"))
compileOnly(project(":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow"))

testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
testImplementation(project(":instrumentation-api-annotation-support"))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
//
// and in the code "io.opentelemetry.*" refers to the (shaded) OpenTelemetry API that is used by
// the agent (as those references will later be shaded)
compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))

// using OpenTelemetry SDK to make sure that instrumentation doesn't cause
// OpenTelemetrySdk.getTracerProvider() to throw ClassCastException
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
}
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ plugins {
}

dependencies {
compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
}
2 changes: 1 addition & 1 deletion instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {

compileOnly(project(":javaagent-tooling"))
compileOnly(project(":instrumentation-api-annotation-support"))
compileOnly(project(path = ":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))

testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
testImplementation(project(":instrumentation:opentelemetry-annotations-1.0:testing"))
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")

// make IntelliJ see shaded Armeria
testCompileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow"))
testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
}

tasks {
Expand Down
2 changes: 1 addition & 1 deletion testing-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {

api("com.google.guava:guava")

compileOnly(project(path = ":testing:armeria-shaded-for-testing", configuration = "shadow"))
compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))

implementation("io.opentelemetry.proto:opentelemetry-proto")

Expand Down