Merge pull request #523 from DataDog/mar-kolya/get-rid-of-gradle-4.10.1-hacks

Remove some hacks that were made for Gradle 4.10.1
This commit is contained in:
Nikolay Martynov 2018-10-01 14:56:37 -04:00 committed by GitHub
commit 9e5b9b334c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 11 deletions

View File

@ -12,11 +12,6 @@ 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')

View File

@ -20,11 +20,6 @@ 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'

View File

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