Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion agent-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha))
api(libs.opentelemetry.api)
}
1 change: 0 additions & 1 deletion android-agent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ android {

dependencies {
api(project(":agent-api"))
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we can merge this, due to the problems that I've now encountered multiple times during the release process. Namely, sonatype does some additional validations that will fail if this platform dependency isn't there.


implementation(project(":core"))
implementation(project(":common"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ dependencies {
androidTestImplementation(libs.findLibrary("androidx-test-rules").get())
androidTestImplementation(libs.findLibrary("androidx-test-runner").get())
androidTestImplementation(platform(libs.findLibrary("opentelemetry-platform-alpha").get()))
val platform = platform(libs.findLibrary("opentelemetry-platform-alpha").get())
implementation(platform)
testImplementation(platform)
androidTestImplementation(platform)
androidTestImplementation(libs.findLibrary("opentelemetry-sdk-testing").get())
coreLibraryDesugaring(libs.findLibrary("desugarJdkLibs").get())
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ dependencies {
testImplementation(libs.findBundle("mocking").get())
testImplementation(libs.findBundle("junit").get())
testRuntimeOnly(libs.findLibrary("junit-platform-launcher").get())
testImplementation(platform(libs.findLibrary("opentelemetry-platform-alpha").get()))
val platform = platform(libs.findLibrary("opentelemetry-platform-alpha").get())
implementation(platform)
testImplementation(platform)
androidTestImplementation(platform)
testImplementation(libs.findLibrary("opentelemetry-sdk-testing").get())
testImplementation(libs.findLibrary("androidx-junit").get())
}
1 change: 0 additions & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.instrumentation.api)
Expand Down
2 changes: 0 additions & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":common"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/activity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:common-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/android-log/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":agent-api"))

Expand Down
1 change: 0 additions & 1 deletion instrumentation/anr/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":instrumentation:common-api"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/common-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":common"))
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
Expand Down
2 changes: 0 additions & 2 deletions instrumentation/compose/click/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/crash/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":common"))
implementation(project(":services"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/fragment/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:common-api"))
implementation(project(":instrumentation:android-instrumentation"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":agent-api"))
api(libs.opentelemetry.context)
Expand Down
1 change: 0 additions & 1 deletion instrumentation/network/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":common"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
compileOnly(libs.okhttp)
Expand Down
1 change: 0 additions & 1 deletion instrumentation/sessions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(libs.opentelemetry.sdk)
Expand Down
1 change: 0 additions & 1 deletion instrumentation/slowrendering/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":session"))
Expand Down
2 changes: 0 additions & 2 deletions instrumentation/startup/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":core"))
implementation(project(":instrumentation:android-instrumentation"))
Expand Down
1 change: 0 additions & 1 deletion instrumentation/view-click/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":services"))
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
Expand Down
1 change: 0 additions & 1 deletion session/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
}