diff --git a/macBuild-mac-ios.sh b/macBuild-mac-ios.sh index 0e11f08..237ae0d 100644 --- a/macBuild-mac-ios.sh +++ b/macBuild-mac-ios.sh @@ -12,5 +12,7 @@ cd .. multiplatform-crypto-delegated:iosArm64MainKlibrary multiplatform-crypto-delegated:iosArm64TestKlibrary \ multiplatform-crypto-delegated:iosX64MainKlibrary multiplatform-crypto-delegated:iosX64TestKlibrary \ multiplatform-crypto-delegated:macosX64MainKlibrary multiplatform-crypto-delegated:macosX64TestKlibrary +./gradlew multiplatform-crypto-delegated:iosX64Test +./gradlew multiplatform-crypto-delegated:macosX64Test set +e diff --git a/macBuild-tvos.sh b/macBuild-tvos.sh index d07e1d7..5c6fcc7 100644 --- a/macBuild-tvos.sh +++ b/macBuild-tvos.sh @@ -9,4 +9,5 @@ cd sodiumWrapper cd .. ./gradlew multiplatform-crypto-delegated:tvosArm64MainKlibrary multiplatform-crypto-delegated:tvosArm64TestKlibrary \ multiplatform-crypto-delegated:tvosX64MainKlibrary multiplatform-crypto-delegated:tvosX64TestKlibrary +./gradlew multiplatform-crypto-delegated:tvosX64Test set +e \ No newline at end of file diff --git a/macBuild-watchos.sh b/macBuild-watchos.sh index 1741885..8187481 100644 --- a/macBuild-watchos.sh +++ b/macBuild-watchos.sh @@ -10,4 +10,5 @@ cd .. ./gradlew multiplatform-crypto-delegated:watchosArm32MainKlibrary multiplatform-crypto-delegated:watchosArm32TestKlibrary \ multiplatform-crypto-delegated:watchosArm64MainKlibrary multiplatform-crypto-delegated:watchosArm64TestKlibrary \ multiplatform-crypto-delegated:watchosX86MainKlibrary multiplatform-crypto-delegated:watchosX86TestKlibrary +./gradlew multiplatform-crypto-delegated:watchosX86Test set +e \ No newline at end of file diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index c7768a1..75c174a 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/multiplatform-crypto/build.gradle.kts @@ -52,15 +52,18 @@ kotlin { runningOnLinuxx86_64 { jvm() js { - //Until I figure out how to run headless chrome on travis -// browser { -// -// testTask { -// useKarma { -// useChrome() -// } -// } -// } + + browser { + + testTask { + isRunningInTravis { + enabled = false //Until I sort out testing on travis + } + useKarma { + useChrome() + } + } + } nodejs { testTask { useMocha() { @@ -78,28 +81,22 @@ kotlin { } } - - - } - - runningOnLinuxArm32 { - // Not supported in coroutines at the moment - linuxArm32Hfp() { - binaries { - staticLib { - } - } - } - } - - runningOnLinuxArm64 { - // Not supported in coroutines at the moment linuxArm64() { binaries { staticLib { } } } + + linuxArm32Hfp() { + binaries { + staticLib { + } + } + } + + + } runningOnMacos { @@ -258,10 +255,6 @@ kotlin { } } - } - - runningOnLinuxArm64 { - //Not supported in OFFICIAL coroutines at the moment, we're running a custom build val linuxArm64Main by getting { dependsOn(nativeMain) } @@ -270,9 +263,6 @@ kotlin { dependsOn(nativeTest) } - } - - runningOnLinuxArm32 { val linuxArm32HfpMain by getting { dependsOn(nativeMain) } @@ -280,8 +270,10 @@ kotlin { val linuxArm32HfpTest by getting { dependsOn(nativeTest) } + } + runningOnMacos{ val iosMain by getting {