YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added testing tasks to osx builds, cleaned up pure variant build.gradle.kts

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-06-11 19:48:10 +02:00 committed by Ugljesa Jovanovic
parent add5480850
commit 4eb8970fd3
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
4 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macBuild-mac-ios.sh
View File

@ -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

1
macBuild-tvos.sh
View File

@ -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

1
macBuild-watchos.sh
View File

@ -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

56
multiplatform-crypto/build.gradle.kts
View File

@ -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 {