From 1c210c3ad2844969f6d1125ad971468d09bbd063 Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ugljesa.jovanovic@ionspin.com>
Date: Sun, 9 Aug 2020 12:22:39 +0200
Subject: [PATCH] Don't compile ios libsodium on mac build and vice versa, use
 default target names

---
 macBuildAndPublish-ios.sh             | 1 -
 macBuildAndPublish-mac.sh             | 1 -
 multiplatform-crypto/build.gradle.kts | 6 +++---
 sample/build.gradle.kts               | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/macBuildAndPublish-ios.sh b/macBuildAndPublish-ios.sh
index d506639..a789f82 100755
--- a/macBuildAndPublish-ios.sh
+++ b/macBuildAndPublish-ios.sh
@@ -4,7 +4,6 @@ set -e
 ./gradlew multiplatform-crypto-api:build
 #now let's build linux deps
 cd sodiumWrapper
-./makeMacosX86-64.sh
 ./makeIos.sh
 #now we can do the delegated build of ios and macos libraries
 cd ..
diff --git a/macBuildAndPublish-mac.sh b/macBuildAndPublish-mac.sh
index b6227a2..c92cf58 100755
--- a/macBuildAndPublish-mac.sh
+++ b/macBuildAndPublish-mac.sh
@@ -5,7 +5,6 @@ set -e
 #now let's build linux deps
 cd sodiumWrapper
 ./makeMacosX86-64.sh
-./makeIos.sh
 #now we can do the delegated build of ios and macos libraries
 cd ..
 ./gradlew multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository
diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts
index 8b62eed..f2d64d1 100644
--- a/multiplatform-crypto/build.gradle.kts
+++ b/multiplatform-crypto/build.gradle.kts
@@ -101,14 +101,14 @@ kotlin {
     }
 
     runningOnMacos {
-        iosX64("ios") {
+        iosX64() {
             binaries {
                 framework {
                     optimized = true
                 }
             }
         }
-        iosArm64("iosArm64") {
+        iosArm64() {
             binaries {
                 framework {
                     optimized = true
@@ -116,7 +116,7 @@ kotlin {
             }
         }
 
-        iosArm32("iosArm32") {
+        iosArm32() {
             binaries {
                 framework {
                     optimized = true
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 5884386..48c078c 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -96,14 +96,14 @@ kotlin {
     }
 
     runningOnMacos {
-        iosX64("ios") {
+        iosX64() {
             binaries {
                 framework {
 
                 }
             }
         }
-        iosArm64("iosArm64") {
+        iosArm64() {
             binaries {
                 framework {
 
@@ -111,7 +111,7 @@ kotlin {
             }
         }
 
-        iosArm32("iosArm32") {
+        iosArm32() {
             binaries {
                 framework {