Swap Animalsniffer to Java 8 and Android 19

Also added missing signatures. Swapping to version catalog will make this process easier in the future.
grpc · Aug 10, 2022 · 61f19d7 · 61f19d7
1 parent 2b50e40
commit 61f19d7
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 21 deletions.
diff --git a/alts/build.gradle b/alts/build.gradle
@@ -45,7 +45,7 @@ dependencies {
             classifier = "linux-x86_64"
         }
     }
-    signature 'org.codehaus.mojo.signature:java17:1.0@signature'
+    signature libraries.signature.java
 }
 
 configureProtoCompilation()

diff --git a/api/build.gradle b/api/build.gradle
@@ -24,8 +24,8 @@ dependencies {
     }
     jmh project(':grpc-core')
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure {

diff --git a/auth/build.gradle b/auth/build.gradle
@@ -13,6 +13,6 @@ dependencies {
     implementation libraries.guava
     testImplementation project(':grpc-testing'),
             libraries.google.auth.oauth2Http
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
diff --git a/authz/build.gradle b/authz/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     shadow configurations.implementation.getDependencies().minus([xdsDependency])
     shadow project(path: ':grpc-xds', configuration: 'shadow')
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
 }
 
 tasks.named("jar").configure {

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
     id "com.google.protobuf"
     id "me.champeau.jmh"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "grpc Benchmarks"
@@ -39,6 +40,8 @@ dependencies {
 
     testImplementation libraries.junit,
             libraries.mockito.core
+
+    signature libraries.signature.java
 }
 
 import net.ltgt.gradle.errorprone.CheckSeverity

diff --git a/census/build.gradle b/census/build.gradle
@@ -1,6 +1,8 @@
 plugins {
     id "java-library"
     id "maven-publish"
+
+    id "ru.vyarus.animalsniffer"
 }
 
 description = 'gRPC: Census'
@@ -18,6 +20,9 @@ dependencies {
             project(':grpc-core').sourceSets.test.output,
             project(':grpc-testing'),
             libraries.opencensus.impl
+
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure {

diff --git a/core/build.gradle b/core/build.gradle
@@ -42,8 +42,8 @@ dependencies {
 
     jmh project(':grpc-testing')
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure {

diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle
@@ -27,6 +27,8 @@ buildscript {
 plugins {
     id "java"
     id "war"
+
+    id "ru.vyarus.animalsniffer"
 }
 
 description = 'gRPC: gae interop testing (jdk8)'
@@ -53,6 +55,7 @@ dependencies {
     implementation libraries.junit
     implementation libraries.protobuf.java
     runtimeOnly libraries.netty.tcnative, libraries.netty.tcnative.classes
+    signature libraries.signature.java
 }
 
 tasks.named("compileJava").configure {

diff --git a/gcp-observability/build.gradle b/gcp-observability/build.gradle
@@ -50,7 +50,7 @@ dependencies {
         exclude group: 'junit', module: 'junit'
     }
 
-    signature "org.codehaus.mojo.signature:java18:1.0@signature"
+    signature libraries.signature.java
 }
 
 configureProtoCompilation()
diff --git a/googleapis/build.gradle b/googleapis/build.gradle
@@ -15,7 +15,7 @@ dependencies {
                    libraries.guava
     testImplementation project(':grpc-core').sourceSets.test.output
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
 }
 
 publishing {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -68,4 +68,6 @@ protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.
 protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
 re2j = "com.google.re2j:re2j:1.6"
 robolectric = "org.robolectric:robolectric:4.8.1"
+signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
+signature-java = "org.codehaus.mojo.signature:java18:1.0"
 truth = "com.google.truth:truth:1.0.1"
diff --git a/grpclb/build.gradle b/grpclb/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
     id "com.google.protobuf"
     id "me.champeau.gradle.japicmp"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: GRPCLB LoadBalancer plugin"
@@ -21,6 +22,8 @@ dependencies {
     compileOnly libraries.javax.annotation
     testImplementation libraries.truth,
             project(':grpc-core').sourceSets.test.output
+
+    signature libraries.signature.java
 }
 
 configureProtoCompilation()

diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
     id "com.github.johnrengelman.shadow"
     id "com.google.protobuf"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: Integration Testing"
@@ -56,6 +57,9 @@ dependencies {
             libraries.okhttp
     alpnagent libraries.jetty.alpn.agent
     shadow configurations.implementation.getDependencies().minus(xdsDependency)
+
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 configureProtoCompilation()

diff --git a/istio-interop-testing/build.gradle b/istio-interop-testing/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
     id "com.google.protobuf"
     id 'com.google.cloud.tools.jib'
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: Istio Interop testing"
@@ -34,6 +35,8 @@ dependencies {
             libraries.junit,
             libraries.truth
     alpnagent libraries.jetty.alpn.agent
+
+    signature libraries.signature.java
 }
 
 sourceSets {

diff --git a/netty/build.gradle b/netty/build.gradle
@@ -63,7 +63,8 @@ dependencies {
             classifier = "linux-x86_64"
         }
     }
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
     alpnagent libraries.jetty.alpn.agent
 }
 

diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle
@@ -9,6 +9,7 @@ plugins {
     id "maven-publish"
 
     id "com.github.johnrengelman.shadow"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: Netty Shaded"
@@ -61,6 +62,8 @@ dependencies {
     shadow project(':grpc-netty').configurations.runtimeClasspath.allDependencies.matching {
         it.group != 'io.netty'
     }
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("jar").configure {

diff --git a/okhttp/build.gradle b/okhttp/build.gradle
@@ -23,8 +23,8 @@ dependencies {
             project(':grpc-testing'),
             libraries.netty.codec.http2,
             libraries.okhttp
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 project.sourceSets {

diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
@@ -17,8 +17,8 @@ dependencies {
 
     testImplementation project(':grpc-core')
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("compileTestJava").configure {

diff --git a/protobuf/build.gradle b/protobuf/build.gradle
@@ -25,7 +25,8 @@ dependencies {
         exclude group: 'com.google.protobuf', module: 'protobuf-javalite'
     }
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure {

diff --git a/rls/build.gradle b/rls/build.gradle
@@ -23,7 +23,7 @@ dependencies {
             project(':grpc-testing'),
             project(':grpc-testing-proto'),
             project(':grpc-core').sourceSets.test.output  // for FakeClock
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
 }
 
 tasks.named("compileJava").configure {

diff --git a/services/build.gradle b/services/build.gradle
@@ -32,7 +32,7 @@ dependencies {
             libraries.netty.transport.epoll, // for DomainSocketAddress
             project(':grpc-core').sourceSets.test.output  // for FakeClock
     testCompileOnly libraries.javax.annotation
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
 }
 
 configureProtoCompilation()

diff --git a/stub/build.gradle b/stub/build.gradle
@@ -13,8 +13,8 @@ dependencies {
     implementation libraries.errorprone.annotations
     testImplementation libraries.truth,
             project(':grpc-testing')
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure {

diff --git a/testing-proto/build.gradle b/testing-proto/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id "maven-publish"
 
     id "com.google.protobuf"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: Testing Protos"
@@ -13,6 +14,7 @@ dependencies {
     compileOnly libraries.javax.annotation
     testImplementation libraries.truth
     testRuntimeOnly libraries.javax.annotation
+    signature libraries.signature.java
 }
 
 configureProtoCompilation()
diff --git a/testing/build.gradle b/testing/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id "maven-publish"
 
     id "me.champeau.gradle.japicmp"
+    id "ru.vyarus.animalsniffer"
 }
 
 description = "gRPC: Testing"
@@ -24,6 +25,9 @@ dependencies {
 
     testImplementation project(':grpc-testing-proto'),
             project(':grpc-core').sourceSets.test.output
+
+    signature libraries.signature.java
+    signature libraries.signature.android
 }
 
 tasks.named("javadoc").configure { exclude 'io/grpc/internal/**' }

diff --git a/xds/build.gradle b/xds/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     shadow configurations.implementation.getDependencies().minus([nettyDependency])
     shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')
 
-    signature "org.codehaus.mojo.signature:java17:1.0@signature"
+    signature libraries.signature.java
     testRuntimeOnly libraries.netty.tcnative,
             libraries.netty.tcnative.classes
     testRuntimeOnly (libraries.netty.tcnative) {