Skip to content

Commit b2b3d18

Browse files
authored
Remove protobuf plugin from build classpath (#14496)
1 parent c0d1775 commit b2b3d18

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

conventions/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ dependencies {
5656
// When updating, update above in plugins too
5757
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
5858
implementation("com.google.guava:guava:33.4.8-jre")
59-
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
6059
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9")
6160
implementation("org.apache.httpcomponents:httpclient:4.5.14")
6261
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1.1")

instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ dependencies {
2424
testLibrary("com.linecorp.armeria:armeria-junit5:1.14.0")
2525
}
2626

27+
tasks.named<Checkstyle>("checkstyleTest") {
28+
// exclude generated classes
29+
exclude("**/example/**")
30+
}
31+
2732
val latestDepTest = findProperty("testLatestDeps") as Boolean
2833
protobuf {
2934
protoc {

instrumentation/grpc-1.6/testing/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ tasks {
3131
compilerArgs.add("-Xlint:-cast")
3232
}
3333
}
34+
35+
named<Checkstyle>("checkstyleMain") {
36+
// exclude generated classes
37+
exclude("**/example/**")
38+
}
3439
}
3540

3641
protobuf {

settings.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ pluginManagement {
88
id("org.xbib.gradle.plugin.jflex") version "3.0.2"
99
id("org.unbroken-dome.xjc") version "2.0.0"
1010
id("org.graalvm.buildtools.native") version "0.11.0"
11+
id("com.google.osdetector") version "1.7.3"
12+
id("com.google.protobuf") version "0.9.5"
1113
}
1214
}
1315

0 commit comments

Comments
 (0)