Bump gradle to 6.4 to fix mac build problems

This commit is contained in:
Ugljesa Jovanovic 2020-05-16 22:38:18 +02:00 committed by Ugljesa Jovanovic
parent bf5e6b3b1a
commit ba90eae3cb
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 12 additions and 11 deletions

View File

@ -16,6 +16,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -83,14 +83,15 @@ kotlin {
println("Destination dir ${it.compileKotlinTask.destinationDir}") println("Destination dir ${it.compileKotlinTask.destinationDir}")
} }
} }
browser { //Until I figure out how to run headless chrome on travis
//Until I figure out how to run headless chrome on travis // browser {
//
// testTask { // testTask {
// useKarma { // useKarma {
// useChrome() // useChrome()
// } // }
// } // }
} // }
nodejs { nodejs {
testTask { testTask {
useMocha() { useMocha() {
@ -385,13 +386,13 @@ tasks {
} }
} }
val jsBrowserTest by getting(KotlinJsTest::class) { // val jsBrowserTest by getting(KotlinJsTest::class) {
//
testLogging { // testLogging {
events("PASSED", "FAILED", "SKIPPED") // events("PASSED", "FAILED", "SKIPPED")
showStandardStreams = true // showStandardStreams = true
} // }
} // }
} }