Don't compile ios libsodium on mac build and vice versa, use default target names

This commit is contained in:
Ugljesa Jovanovic 2020-08-09 12:22:39 +02:00
parent b5547758be
commit 1c210c3ad2
No known key found for this signature in database
GPG Key ID: 33A5F353387711A5
4 changed files with 6 additions and 8 deletions

View File

@ -4,7 +4,6 @@ set -e
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
#now let's build linux deps #now let's build linux deps
cd sodiumWrapper cd sodiumWrapper
./makeMacosX86-64.sh
./makeIos.sh ./makeIos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..

View File

@ -5,7 +5,6 @@ set -e
#now let's build linux deps #now let's build linux deps
cd sodiumWrapper cd sodiumWrapper
./makeMacosX86-64.sh ./makeMacosX86-64.sh
./makeIos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..
./gradlew multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository ./gradlew multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository

View File

@ -101,14 +101,14 @@ kotlin {
} }
runningOnMacos { runningOnMacos {
iosX64("ios") { iosX64() {
binaries { binaries {
framework { framework {
optimized = true optimized = true
} }
} }
} }
iosArm64("iosArm64") { iosArm64() {
binaries { binaries {
framework { framework {
optimized = true optimized = true
@ -116,7 +116,7 @@ kotlin {
} }
} }
iosArm32("iosArm32") { iosArm32() {
binaries { binaries {
framework { framework {
optimized = true optimized = true

View File

@ -96,14 +96,14 @@ kotlin {
} }
runningOnMacos { runningOnMacos {
iosX64("ios") { iosX64() {
binaries { binaries {
framework { framework {
} }
} }
} }
iosArm64("iosArm64") { iosArm64() {
binaries { binaries {
framework { framework {
@ -111,7 +111,7 @@ kotlin {
} }
} }
iosArm32("iosArm32") { iosArm32() {
binaries { binaries {
framework { framework {