Format gradle files (#1070)
This commit is contained in:
parent
5dbb16d71a
commit
269b3575ef
|
@ -40,7 +40,7 @@ ext {
|
||||||
opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-otlp', version: versions.opentelemetryOther),
|
opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-otlp', version: versions.opentelemetryOther),
|
||||||
opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-zipkin', version: versions.opentelemetryOther),
|
opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-zipkin', version: versions.opentelemetryOther),
|
||||||
opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-logging', version: versions.opentelemetryOther),
|
opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-logging', version: versions.opentelemetryOther),
|
||||||
opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther),
|
opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther),
|
||||||
|
|
||||||
// General
|
// General
|
||||||
slf4j : "org.slf4j:slf4j-api:${versions.slf4j}",
|
slf4j : "org.slf4j:slf4j-api:${versions.slf4j}",
|
||||||
|
|
|
@ -40,7 +40,7 @@ configurations {
|
||||||
canBeResolved = false
|
canBeResolved = false
|
||||||
canBeConsumed = false
|
canBeConsumed = false
|
||||||
}
|
}
|
||||||
[library, testLibrary].each {configuration ->
|
[library, testLibrary].each { configuration ->
|
||||||
// We use whenObjectAdded and copy into the real configurations instead of extension to allow
|
// We use whenObjectAdded and copy into the real configurations instead of extension to allow
|
||||||
// mutating the version for latest dep tests.
|
// mutating the version for latest dep tests.
|
||||||
configuration.dependencies.whenObjectAdded {
|
configuration.dependencies.whenObjectAdded {
|
||||||
|
|
|
@ -7,5 +7,5 @@ allprojects {
|
||||||
omitVisitors = ["FindDeadLocalStores"]
|
omitVisitors = ["FindDeadLocalStores"]
|
||||||
effort = "max"
|
effort = "max"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
apply from: "$rootDir/gradle/instrumentation.gradle"
|
apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
|
compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
|
||||||
implementation project(':javaagent-tooling')
|
implementation project(':javaagent-tooling')
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
apply from: "$rootDir/gradle/instrumentation.gradle"
|
apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
minJavaVersionForTests = JavaVersion.VERSION_1_8
|
minJavaVersionForTests = JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
muzzle {
|
muzzle {
|
||||||
pass {
|
pass {
|
||||||
group = "io.kubernetes"
|
group = "io.kubernetes"
|
||||||
module = "client-java-api"
|
module = "client-java-api"
|
||||||
versions = "[7.0.0,)"
|
versions = "[7.0.0,)"
|
||||||
assertInverse = true
|
assertInverse = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0')
|
library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0')
|
||||||
|
|
||||||
implementation project(':javaagent-tooling')
|
implementation project(':javaagent-tooling')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
apply from: "$rootDir/gradle/instrumentation.gradle"
|
apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||||
|
|
||||||
muzzle {
|
muzzle {
|
||||||
pass {
|
pass {
|
||||||
group = "com.squareup.okhttp3"
|
group = "com.squareup.okhttp3"
|
||||||
module = "okhttp"
|
module = "okhttp"
|
||||||
versions = "[3.0,)"
|
versions = "[3.0,)"
|
||||||
assertInverse = true
|
assertInverse = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -19,14 +19,14 @@ because it looks like exclusions using configurations excludes dependency even i
|
||||||
not transitive.
|
not transitive.
|
||||||
*/
|
*/
|
||||||
dependencies {
|
dependencies {
|
||||||
library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
|
library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
|
||||||
|
|
||||||
implementation project(':javaagent-tooling')
|
implementation project(':javaagent-tooling')
|
||||||
|
|
||||||
testImplementation(project(':testing-common')) {
|
testImplementation(project(':testing-common')) {
|
||||||
exclude module: 'okhttp'
|
exclude module: 'okhttp'
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4.x.x-alpha has been released and it looks like there are lots of incompatible changes
|
// 4.x.x-alpha has been released and it looks like there are lots of incompatible changes
|
||||||
latestDepTestLibrary group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
|
latestDepTestLibrary group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,8 @@ muzzle {
|
||||||
pass {
|
pass {
|
||||||
group = 'com.twilio.sdk'
|
group = 'com.twilio.sdk'
|
||||||
module = 'twilio'
|
module = 'twilio'
|
||||||
versions = "[6.6.9,)" // this is first version in maven central (there's a 0.0.1 but that is really 7.14.4)
|
// this is first version in maven central (there's a 0.0.1 but that is really 7.14.4)
|
||||||
|
versions = "[6.6.9,)"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,5 +13,6 @@ dependencies {
|
||||||
library group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9'
|
library group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9'
|
||||||
|
|
||||||
testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
|
testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
|
||||||
testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7
|
// Last version to support Java7
|
||||||
|
testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue