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 #972 from DataDog/mar-kolya/update-gradle 

Update gradle to 5.6.1
This commit is contained in:
Nikolay Martynov 2019-09-03 12:16:24 -04:00 committed by GitHub
parent 79c519e4fe acb90867a4
commit 02adf464e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gradle/dependencies.gradle
View File

@ -1,11 +1,11 @@
def groovyVer = "2.5.7" def groovyVer = "2.5.8"
def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '') def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '')
ext { ext {
versions = [ versions = [
opentracing: '0.31.0', opentracing: '0.31.0',
slf4j : "1.7.25", slf4j : "1.7.28",
guava : "20.0", // Last version to support Java 7 guava : "20.0", // Last version to support Java 7
// When upgrading for security fixes, ensure corresponding change is reflected in jmxfetch. // When upgrading for security fixes, ensure corresponding change is reflected in jmxfetch.
@ -15,11 +15,11 @@ ext {
groovy : groovyVer, groovy : groovyVer,
junit : "4.12", junit : "4.12",
logback : "1.2.3", logback : "1.2.3",
lombok : "1.18.4", lombok : "1.18.8",
bytebuddy : "1.10.0", bytebuddy : "1.10.0",
scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+) scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+)
kotlin : "1.3.11", kotlin : "1.3.50",
coroutines : "1.1.0" coroutines : "1.3.0"
] ]
deps = [ deps = [
@ -61,8 +61,8 @@ ext {
dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j), dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j),
dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j), dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j),
], ],
scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"), scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
kotlin : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"), kotlin : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"),
coroutines : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"), coroutines : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"),
] ]
} }

4
gradle/test-with-kotlin.gradle
View File

@ -1,10 +1,6 @@
// Enable testing kotlin code in groovy spock tests. // Enable testing kotlin code in groovy spock tests.
apply plugin: 'kotlin' apply plugin: 'kotlin'
kotlin {
copyClassesToJavaOutput = true
}
compileTestGroovy { compileTestGroovy {
classpath = classpath.plus(files(compileTestKotlin.destinationDir)) classpath = classpath.plus(files(compileTestKotlin.destinationDir))
dependsOn compileTestKotlin dependsOn compileTestKotlin

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-5.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
gradlew vendored
View File

@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`