From ba90eae3cbe54f10700ef8e57551b6d28c27daee Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 16 May 2020 22:38:18 +0200 Subject: [PATCH] Bump gradle to 6.4 to fix mac build problems --- gradle/wrapper/gradle-wrapper.properties | 2 +- multiplatform-crypto/build.gradle.kts | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c28bf7..65fa2e2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,6 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index 2dbad27..b4e42dd 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/multiplatform-crypto/build.gradle.kts @@ -83,14 +83,15 @@ kotlin { 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 { // useKarma { // useChrome() // } // } - } +// } nodejs { testTask { useMocha() { @@ -385,13 +386,13 @@ tasks { } } - val jsBrowserTest by getting(KotlinJsTest::class) { - - testLogging { - events("PASSED", "FAILED", "SKIPPED") - showStandardStreams = true - } - } +// val jsBrowserTest by getting(KotlinJsTest::class) { +// +// testLogging { +// events("PASSED", "FAILED", "SKIPPED") +// showStandardStreams = true +// } +// } }