Update linux and publish script, make initializer blocking in linux

This commit is contained in:
Ugljesa Jovanovic 2020-06-10 22:18:27 +02:00 committed by Ugljesa Jovanovic
parent 93a3ac5782
commit 2f84c2dbf3
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 23 additions and 5 deletions

View File

@ -1 +1,20 @@
./gradlew build publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxPublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository
#!/bin/sh
#this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build
#now let's build linux deps
export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin
cd sodiumWrapper
./makeLinuxX86-64.sh
#Workaround for travis using wrong ld
if [ "$TRAVIS" = "true" ]
then
sudo mv /usr/bin/ld /usr/bin/ld.bck
sudo ln -s $CLANG_BIN/ld.lld /usr/bin/ld
fi
./makeLinuxArm64.sh
#now we can do the delegated build
cd ..
./gradlew multiplatform-crypto-delegated:build
#and finally pure build
./gradlew multiplatform-crypto:build
./gradlew publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxX64PublicationToSnapshotRepository publishLinuxArm64PublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository

View File

@ -12,12 +12,11 @@ actual object Initializer {
private var isPlatformInitialized : AtomicInt = AtomicInt(0)
actual suspend fun initialize() {
GlobalScope.launch() {
if (isPlatformInitialized.compareAndSet(0, 1)) {
sodium_init()
}
if (isPlatformInitialized.compareAndSet(0, 1)) {
sodium_init()
}
}
actual fun initializeWithCallback(done: () -> Unit) {