open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #501 from DataDog/tyler/gradle-upgrade 

Upgrade gradle to 4.10.1
This commit is contained in:
Tyler Benson 2018-09-20 10:51:50 +10:00 committed by GitHub
parent 21f4806d08 ebcc2ef052
commit c84c83f168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
View File

@ -12,6 +12,11 @@ compileSlickTestGroovy {
dependsOn compileSlickTestScala dependsOn compileSlickTestScala
} }
// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
compileSlickTestScala {
analysisFiles.setFrom(files())
}
dependencies { dependencies {
compile project(':dd-trace-api') compile project(':dd-trace-api')
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')

5
dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
View File

@ -20,6 +20,11 @@ muzzle {
} }
} }
// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
compileLatestDepTestScala {
analysisFiles.setFrom(files())
}
dependencies { dependencies {
compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0' compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'

2
dd-trace-java.gradle
View File

@ -53,7 +53,7 @@ buildScan {
} }
} }
ext.gradleWrapperVersion = '4.9' ext.gradleWrapperVersion = '4.10.1'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = gradleWrapperVersion gradleVersion = gradleWrapperVersion
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists