diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 5bf0e1e870f8..8faedfec7709 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -56,7 +56,6 @@ dependencies { // When updating, update above in plugins too implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1") implementation("com.google.guava:guava:33.4.8-jre") - implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9") implementation("org.apache.httpcomponents:httpclient:4.5.14") implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1.1") diff --git a/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts b/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts index 93bcfca7ee48..1b798164b322 100644 --- a/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts +++ b/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts @@ -24,6 +24,11 @@ dependencies { testLibrary("com.linecorp.armeria:armeria-junit5:1.14.0") } +tasks.named("checkstyleTest") { + // exclude generated classes + exclude("**/example/**") +} + val latestDepTest = findProperty("testLatestDeps") as Boolean protobuf { protoc { diff --git a/instrumentation/grpc-1.6/testing/build.gradle.kts b/instrumentation/grpc-1.6/testing/build.gradle.kts index 259d70dbb53e..374be72da2b2 100644 --- a/instrumentation/grpc-1.6/testing/build.gradle.kts +++ b/instrumentation/grpc-1.6/testing/build.gradle.kts @@ -31,6 +31,11 @@ tasks { compilerArgs.add("-Xlint:-cast") } } + + named("checkstyleMain") { + // exclude generated classes + exclude("**/example/**") + } } protobuf { diff --git a/settings.gradle.kts b/settings.gradle.kts index 52d6bafdd8a1..eca72f6776c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,6 +8,8 @@ pluginManagement { id("org.xbib.gradle.plugin.jflex") version "3.0.2" id("org.unbroken-dome.xjc") version "2.0.0" id("org.graalvm.buildtools.native") version "0.11.0" + id("com.google.osdetector") version "1.7.3" + id("com.google.protobuf") version "0.9.5" } }