diff --git a/build.gradle.kts b/build.gradle.kts index 3c9ea5037b..be765bcfd7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -345,6 +345,15 @@ subprojects { } } } + + afterEvaluate { + // Classpath when compiling protos, we add dependency management directly + // since it doesn't follow Gradle conventions of naming / properties. + dependencies { + add("compileProtoPath", platform(project(":dependencyManagement"))) + add("testCompileProtoPath", platform(project(":dependencyManagement"))) + } + } } plugins.withId("ru.vyarus.animalsniffer") { diff --git a/exporters/jaeger/build.gradle b/exporters/jaeger/build.gradle index 20894a8a03..8695c68137 100644 --- a/exporters/jaeger/build.gradle +++ b/exporters/jaeger/build.gradle @@ -28,10 +28,6 @@ dependencies { testImplementation project(':sdk:testing') - // Protobuf plugin seems to erroneously use the non-classpath configurations for resolving - // dependencies. - testImplementation enforcedPlatform(project(':dependencyManagement')) - testRuntimeOnly "io.grpc:grpc-netty-shaded" } diff --git a/proto/build.gradle b/proto/build.gradle index a40588bfcb..d4b2ee60d2 100644 --- a/proto/build.gradle +++ b/proto/build.gradle @@ -11,10 +11,6 @@ description = 'OpenTelemetry Proto' ext.moduleName = 'io.opentelemetry.proto' dependencies { - // Protobuf plugin seems to erroneously use the non-classpath configurations for resolving - // dependencies. - implementation enforcedPlatform(project(':dependencyManagement')) - api "com.google.protobuf:protobuf-java", "io.grpc:grpc-api", "io.grpc:grpc-protobuf",