diff --git a/api/build.gradle b/api/build.gradle index 18efea3208..854f862b83 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -14,7 +14,7 @@ dependencies { annotationProcessor libraries.auto_value - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature testImplementation libraries.jqf } diff --git a/build.gradle b/build.gradle index 111565b158..e5cb9c0c57 100644 --- a/build.gradle +++ b/build.gradle @@ -341,7 +341,10 @@ configure(opentelemetryProjects) { jaeger_client : 'io.jaegertracing:jaeger-client:1.2.0', // Jaeger Client zipkin_junit : "io.zipkin.zipkin2:zipkin-junit:${zipkinVersion}", // Zipkin JUnit rule archunit : 'com.tngtech.archunit:archunit-junit4:0.13.1', //Architectural constraints - jqf : 'edu.berkeley.cs.jqf:jqf-fuzz:1.6' // fuzz testing + jqf : 'edu.berkeley.cs.jqf:jqf-fuzz:1.6', // fuzz testing + + // Tooling + android_signature : 'com.toasttab.android:gummy-bears-api-24:0.2.0:coreLib@signature' ] } diff --git a/context/build.gradle b/context/build.gradle index 4370df3461..c88f2fd0ef 100644 --- a/context/build.gradle +++ b/context/build.gradle @@ -29,5 +29,5 @@ dependencies { testImplementation libraries.awaitility - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/exporters/jaeger-thrift/build.gradle b/exporters/jaeger-thrift/build.gradle index ebe18cb4d6..d4271dc0d5 100644 --- a/exporters/jaeger-thrift/build.gradle +++ b/exporters/jaeger-thrift/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation project(':opentelemetry-sdk-testing') signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } animalsniffer { diff --git a/exporters/jaeger/build.gradle b/exporters/jaeger/build.gradle index 263098bd73..290ec8abad 100644 --- a/exporters/jaeger/build.gradle +++ b/exporters/jaeger/build.gradle @@ -30,7 +30,7 @@ dependencies { testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } animalsniffer { diff --git a/exporters/logging/build.gradle b/exporters/logging/build.gradle index 3d5414bf4a..1e7adaeea5 100644 --- a/exporters/logging/build.gradle +++ b/exporters/logging/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(':opentelemetry-sdk-testing') signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } animalsniffer { diff --git a/exporters/otlp/build.gradle b/exporters/otlp/build.gradle index 735215f216..d7d3d21b9c 100644 --- a/exporters/otlp/build.gradle +++ b/exporters/otlp/build.gradle @@ -24,5 +24,5 @@ dependencies { testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/exporters/prometheus/build.gradle b/exporters/prometheus/build.gradle index ee948e86f6..dc6200dcd0 100644 --- a/exporters/prometheus/build.gradle +++ b/exporters/prometheus/build.gradle @@ -16,5 +16,5 @@ dependencies { testImplementation libraries.prometheus_client_common signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/exporters/zipkin/build.gradle b/exporters/zipkin/build.gradle index 99a7290912..adbfccb7f7 100644 --- a/exporters/zipkin/build.gradle +++ b/exporters/zipkin/build.gradle @@ -23,7 +23,7 @@ dependencies { libraries.zipkin_junit signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } configurations { diff --git a/extensions/trace-propagators/build.gradle b/extensions/trace-propagators/build.gradle index c6270a3e2b..6913e03021 100644 --- a/extensions/trace-propagators/build.gradle +++ b/extensions/trace-propagators/build.gradle @@ -15,5 +15,5 @@ dependencies { testImplementation libraries.jaeger_client signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/extensions/trace-utils/build.gradle b/extensions/trace-utils/build.gradle index b4a128aab5..8d55302ddf 100644 --- a/extensions/trace-utils/build.gradle +++ b/extensions/trace-utils/build.gradle @@ -14,5 +14,5 @@ dependencies { annotationProcessor libraries.auto_value signature "org.codehaus.mojo.signature:java18:1.0@signature" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 7d3742794a..1928090c10 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -31,7 +31,7 @@ dependencies { libraries.testcontainers, libraries.okhttp - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature tasks.withType(Test) { dependsOn fatJar diff --git a/proto/build.gradle b/proto/build.gradle index 323559c98c..ca5c47ea04 100644 --- a/proto/build.gradle +++ b/proto/build.gradle @@ -15,7 +15,7 @@ dependencies { libraries.grpc_protobuf, libraries.grpc_stub - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } animalsniffer { diff --git a/sdk-extensions/aws-v1-support/build.gradle b/sdk-extensions/aws-v1-support/build.gradle index 9ef583a4e4..6ac6d13bf8 100644 --- a/sdk-extensions/aws-v1-support/build.gradle +++ b/sdk-extensions/aws-v1-support/build.gradle @@ -22,5 +22,5 @@ dependencies { testImplementation 'com.github.tomakehurst:wiremock-jre8:2.26.3' - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle b/sdk-extensions/jaeger-remote-sampler/build.gradle index 077d9eb6e5..89f45ed430 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle @@ -25,7 +25,7 @@ dependencies { testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } animalsniffer { diff --git a/sdk-extensions/logging/build.gradle b/sdk-extensions/logging/build.gradle index ed6372bfc0..8764a67f6c 100644 --- a/sdk-extensions/logging/build.gradle +++ b/sdk-extensions/logging/build.gradle @@ -15,5 +15,5 @@ dependencies { annotationProcessor libraries.auto_value - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/sdk-extensions/otproto/build.gradle b/sdk-extensions/otproto/build.gradle index 9ebce93ec5..c006f23b08 100644 --- a/sdk-extensions/otproto/build.gradle +++ b/sdk-extensions/otproto/build.gradle @@ -19,5 +19,5 @@ dependencies { testImplementation "io.grpc:grpc-testing:${grpcVersion}" testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } diff --git a/sdk-extensions/resources/build.gradle b/sdk-extensions/resources/build.gradle index 0cc483c689..7574b6b347 100644 --- a/sdk-extensions/resources/build.gradle +++ b/sdk-extensions/resources/build.gradle @@ -14,5 +14,5 @@ dependencies { testImplementation libraries.junit_pioneer // TODO(anuraaga): Use reflection for RuntimeMXBean which is not included in Android. - // signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + // signature libraries.android_signature } diff --git a/sdk-extensions/tracing-incubator/build.gradle b/sdk-extensions/tracing-incubator/build.gradle index 7233cb2492..45d46a2d25 100644 --- a/sdk-extensions/tracing-incubator/build.gradle +++ b/sdk-extensions/tracing-incubator/build.gradle @@ -18,5 +18,5 @@ dependencies { annotationProcessor libraries.auto_value testImplementation project(':opentelemetry-sdk-testing') - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } \ No newline at end of file diff --git a/sdk/all/build.gradle b/sdk/all/build.gradle index 7f5faf6f13..6ee9da766b 100644 --- a/sdk/all/build.gradle +++ b/sdk/all/build.gradle @@ -33,7 +33,7 @@ dependencies { transitive = false } - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } sourceSets { diff --git a/sdk/common/build.gradle b/sdk/common/build.gradle index 3e338d4880..eda6cf7b45 100644 --- a/sdk/common/build.gradle +++ b/sdk/common/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } sourceSets { diff --git a/sdk/metrics/build.gradle b/sdk/metrics/build.gradle index 9ce36bc9b8..ba02aa8a71 100644 --- a/sdk/metrics/build.gradle +++ b/sdk/metrics/build.gradle @@ -26,7 +26,7 @@ dependencies { testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } sourceSets { diff --git a/sdk/tracing/build.gradle b/sdk/tracing/build.gradle index 7b290e1b04..50465681ef 100644 --- a/sdk/tracing/build.gradle +++ b/sdk/tracing/build.gradle @@ -26,7 +26,7 @@ dependencies { testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer - signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" + signature libraries.android_signature } sourceSets { diff --git a/settings.gradle b/settings.gradle index 4284a5b06f..db84c6d40a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ pluginManagement { id "nebula.release" version "15.1.0" id "net.ltgt.errorprone" version "1.3.0" id "org.unbroken-dome.test-sets" version "3.0.1" - id "ru.vyarus.animalsniffer" version "1.5.1" + id "ru.vyarus.animalsniffer" version "1.5.2" } repositories {