From 93eac2538c665d164cfddb44a75fd99c2b3267c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 16:32:13 -0500 Subject: [PATCH] Bump com.squareup.wire:wire-compiler from 4.7.0 to 4.7.2 (#5550) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Berg --- buildSrc/build.gradle.kts | 4 ++-- .../kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6759343923..d4303aa5ff 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -39,8 +39,8 @@ dependencies { // Needed for japicmp but not automatically brought in for some reason. implementation("com.google.guava:guava:32.0.1-jre") implementation("com.squareup:javapoet:1.13.0") - implementation("com.squareup.wire:wire-compiler:4.7.0") - implementation("com.squareup.wire:wire-gradle-plugin:4.7.0") + implementation("com.squareup.wire:wire-compiler:4.7.2") + implementation("com.squareup.wire:wire-gradle-plugin:4.7.2") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0") implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.1") diff --git a/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt index 9af0105869..c24e9031bb 100644 --- a/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt +++ b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/ProtoFieldsWireHandler.kt @@ -99,7 +99,10 @@ class ProtoFieldsWireHandler : SchemaHandler() { fun get(schema: Schema): JavaGenerator { val nameToJavaName = linkedMapOf() for (protoFile in schema.protoFiles) { - val javaPackage = javaPackage(protoFile) + if (protoFile.location.path == "wire/extensions.proto") { + continue + } + val javaPackage = javaPackage(protoFile) putAll(nameToJavaName, javaPackage, null, protoFile.types) }