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
4 changes: 2 additions & 2 deletions dd-java-agent/agent-iast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import net.ltgt.gradle.errorprone.CheckSeverity
plugins {
id 'com.gradleup.shadow'
id 'me.champeau.jmh'
id 'com.google.protobuf' version '0.8.18'
id 'com.google.protobuf' version '0.10.0'
id 'net.ltgt.errorprone' version '3.1.0'
}

Expand Down Expand Up @@ -118,7 +118,7 @@ tasks.named("forbiddenApisJmh") {
sourceSets {
test {
java {
srcDirs += ["$buildDir/generated/source/proto/test/java"]
srcDirs += [layout.buildDirectory.dir("generated/sources/proto/test/java")]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.google.protobuf' version '0.8.18'
id 'com.google.protobuf' version '0.10.0'
}

muzzle {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/grpc-1.5/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.google.protobuf' version '0.8.18'
id 'com.google.protobuf' version '0.10.0'
}

muzzle {
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/protobuf-3.0/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.10.0'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down Expand Up @@ -37,7 +37,7 @@ dependencies {
sourceSets {
test {
java {
srcDir "$buildDir/generated/source/proto/test/java"
srcDir layout.buildDirectory.dir("generated/sources/proto/test/java")
}
}
}
Comment on lines 37 to 43
Copy link
Copy Markdown
Contributor

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD May 7, 2026

Choose a reason for hiding this comment

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

Build failed and Clude suggested to delete this block completely:

The protobuf 0.8.18 plugin (pre-upgrade) didn't auto-add the directory, so the manual addition was needed.
Plugin 0.10.0 does it for you — keeping the manual line on top of it actively breaks the wiring.

12 changes: 3 additions & 9 deletions dd-smoke-tests/armeria-grpc/application/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
buildscript {
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.3'
}
}

plugins {
id 'application'
id 'java'
id 'com.gradleup.shadow' version '8.3.9'
id 'com.google.protobuf' version '0.9.3'
id 'com.google.protobuf' version '0.10.0'
}

def sharedRootDir = "$rootDir/../../../"
Expand Down Expand Up @@ -39,8 +33,8 @@ protobuf {
}
}
generateProtoTasks {
ofSourceSet('main')*.plugins {
grpc {}
ofSourceSet('main').configureEach {
plugins { grpc {} }
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions dd-smoke-tests/armeria-grpc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.google.protobuf' version '0.9.3'
id 'com.google.protobuf' version '0.10.0'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down Expand Up @@ -33,8 +33,8 @@ protobuf {
}
}
generateProtoTasks {
ofSourceSet('main')*.plugins {
grpc {}
ofSourceSet('main').configureEach {
plugins { grpc {} }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/grpc-1.5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'application'
id 'java'
id 'java-test-fixtures'
id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.10.0'
id 'com.gradleup.shadow'
}

Expand Down
6 changes: 3 additions & 3 deletions dd-smoke-tests/springboot-grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id 'com.gradleup.shadow'
id 'com.google.protobuf' version '0.8.18'
id 'com.google.protobuf' version '0.10.0'
}

apply from: "$rootDir/gradle/java.gradle"
Expand All @@ -26,8 +26,8 @@ protobuf {
}
}
generateProtoTasks {
all()*.plugins {
grpc {}
ofSourceSet("main").configureEach {
plugins { grpc {} }
}
}
}
Expand Down
Loading