New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle (version 4.10) #13

Merged
merged 2 commits into from Aug 28, 2018
Jump to file or symbol
Failed to load files and symbols.
+6 −6
Diff settings

Always

Just for now

View
@@ -58,11 +58,11 @@ kotlin {
experimental.coroutines = Coroutines.ENABLE
}
val test = tasks.withType(Test::class.java)["test"]!!.apply {
val test by tasks.existing(Test::class) {
useJUnitPlatform()
}
val jacocoMerge = tasks.create("jacocoMerge", JacocoMerge::class.java) {
val jacocoMerge by tasks.registering(JacocoMerge::class) {
gradle.afterProject {
val p = this
if (p.plugins.hasPlugin("jacoco")) {
@@ -73,9 +73,9 @@ val jacocoMerge = tasks.create("jacocoMerge", JacocoMerge::class.java) {
}
}
val jacocoMergedReport = tasks.create("jacocoMergedReport", JacocoReport::class.java) {
val jacocoMergedReport by tasks.registering(JacocoReport::class) {
dependsOn(jacocoMerge)
executionData(jacocoMerge.destinationFile)
executionData(jacocoMerge.get().destinationFile)
sourceDirectories = files()
classDirectories = files()
gradle.afterProject {
@@ -94,6 +94,6 @@ val jacocoMergedReport = tasks.create("jacocoMergedReport", JacocoReport::class.
}
}
tasks["check"].apply {
val check by tasks.existing {
dependsOn(jacocoMergedReport)
}
View
BIN +1.72 KB (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
ProTip! Use n and p to navigate between commits in a pull request.