From 25af0093c6524efaa5a16bbfa32f8805a3d210e3 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Mon, 18 Aug 2025 15:04:28 -0400 Subject: [PATCH 1/5] chore(deps): update dependency gradle to v9 - Update gradle wrapper to 9.0.0 - Fix gradle configuration issues in build files - Remove redundant configuration.add() calls in animal-sniffer-signature - Update protobuf gradle plugin dependency - Fix ProjectDependency comparison in custom-checks --- animal-sniffer-signature/build.gradle.kts | 3 --- buildSrc/build.gradle.kts | 2 +- custom-checks/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/animal-sniffer-signature/build.gradle.kts b/animal-sniffer-signature/build.gradle.kts index f9e67347a07..be649012e55 100644 --- a/animal-sniffer-signature/build.gradle.kts +++ b/animal-sniffer-signature/build.gradle.kts @@ -22,9 +22,6 @@ val generatedSignature = configurations.create("generatedSignature") { isCanBeConsumed = true isCanBeResolved = false } -configurations.add(signatureJar) -configurations.add(signatureJarClasspath) -configurations.add(generatedSignature) dependencies { signature("com.toasttab.android:gummy-bears-api-23:0.12.0@signature") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fd3489aecaf..7aa0f156dc8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { implementation("com.squareup:javapoet:1.13.0") implementation("com.squareup.wire:wire-compiler") implementation("com.squareup.wire:wire-gradle-plugin") - implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") + implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4") implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6") implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6") implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3") diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts index 22ce0614b30..adce219eff0 100644 --- a/custom-checks/build.gradle.kts +++ b/custom-checks/build.gradle.kts @@ -76,7 +76,7 @@ tasks.withType().configureEach { configurations { named("errorprone") { dependencies.removeIf { - it is ProjectDependency && it.dependencyProject == project + it is ProjectDependency && it.name == project.name } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e16a49..3e781fbad9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 3a3348e07f3f432cc3002637d6cf2f4d9e715959 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Wed, 20 Aug 2025 12:55:48 -0400 Subject: [PATCH 2/5] dont refernce project variables in dolast, exclude protos from checkstyle --- .../src/main/kotlin/otel.java-conventions.gradle.kts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index bd360ccf0e5..98c79ef4f17 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -47,6 +47,10 @@ checkstyle { configProperties["rootDir"] = rootDir } +tasks.withType().configureEach { + exclude("**/build/generated/**") +} + dependencyCheck { skipConfigurations = mutableListOf( "errorprone", @@ -178,12 +182,13 @@ plugins.withId("otel.publish-conventions") { register("generateVersionResource") { val moduleName = otelJava.moduleName val propertiesDir = moduleName.map { File(layout.buildDirectory.asFile.get(), "generated/properties/${it.replace('.', '/')}") } + val versionProperty = project.version.toString() - inputs.property("project.version", project.version.toString()) + inputs.property("project.version", versionProperty) outputs.dir(propertiesDir) doLast { - File(propertiesDir.get(), "version.properties").writeText("sdk.version=${project.version}") + File(propertiesDir.get(), "version.properties").writeText("sdk.version=${versionProperty}") } } } From 9d0d8dc5b53db9da00a1f876c23780e06ecada88 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Wed, 20 Aug 2025 14:58:33 -0400 Subject: [PATCH 3/5] try different approach for exclusion --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 4 +--- sdk-extensions/jaeger-remote-sampler/build.gradle.kts | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 98c79ef4f17..6b6d41c53b0 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -47,9 +47,7 @@ checkstyle { configProperties["rootDir"] = rootDir } -tasks.withType().configureEach { - exclude("**/build/generated/**") -} + dependencyCheck { skipConfigurations = mutableListOf( diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts index f9164a07093..960ddd0cf72 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts @@ -79,4 +79,8 @@ tasks { compilerArgs.add("-Xlint:-serial") } } + + checkstyleMain { + source = fileTree("src/main/java") + } } From cab5d92dc85623475fedaf378f45ba96afe9fe14 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Wed, 20 Aug 2025 15:36:07 -0400 Subject: [PATCH 4/5] remove spaces --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 6b6d41c53b0..fcb71b09299 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -47,8 +47,6 @@ checkstyle { configProperties["rootDir"] = rootDir } - - dependencyCheck { skipConfigurations = mutableListOf( "errorprone", From 4f760ef46e9b1f00283a109092a9ac75bf07a158 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 22 Aug 2025 06:21:20 -0400 Subject: [PATCH 5/5] Update build.gradle.kts Co-authored-by: Trask Stalnaker --- sdk-extensions/jaeger-remote-sampler/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts index 960ddd0cf72..06b15eeac9c 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts @@ -81,6 +81,7 @@ tasks { } checkstyleMain { + // overrides the default which includes generated proto sources source = fileTree("src/main/java") } }