Merge branch 'master' into delegated-aes

.travis.yml

@@ -130,7 +130,7 @@ matrix:
         - $msys2 pacman --sync --clean --noconfirm
       script:
         - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then $shell ./windowsBuild-delegated.sh; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish-delegated.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then $shell ./windowsBuildAndPublish-delegated.sh; fi'
 cache:
   directories:
     - $HOME/.m2/

macBuildAndPublish-pure.sh

@@ -2,9 +2,9 @@ set -e
 #!/bin/sh
 #this will hopefully download all konan dependancies that we use in the build scripts
 ./gradlew multiplatform-crypto-api:build
-./gradlew multiplatform-crypto:publishIosArm32PublicationToSnapshotRepository \
+./gradlew multiplatform-crypto:publishIos32ArmPublicationToSnapshotRepository \
-multiplatform-crypto:publishIosArm64PublicationToSnapshotRepository \
+multiplatform-crypto:publishIos64ArmPublicationToSnapshotRepository \
-multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \
+multiplatform-crypto:publishIosPublicationToSnapshotRepository \
 multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \
 multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \
 multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository \

multiplatform-crypto/build.gradle.kts

@@ -130,6 +130,45 @@ kotlin {
                 }
             }
         }
+        tvosX64() {
+            binaries {
+                framework {
+                    optimized = true
+                }
+            }
+        }
+
+        tvosArm64() {
+            binaries {
+                framework {
+                    optimized = true
+                }
+            }
+        }
+
+        watchosArm64() {
+            binaries {
+                framework {
+                    optimized = true
+                }
+            }
+        }
+
+        watchosArm32() {
+            binaries {
+                framework {
+                    optimized = true
+                }
+            }
+        }
+
+        watchosX86() {
+            binaries {
+                framework {
+                    optimized = true
+                }
+            }
+        }
     }
     runningOnWindows {
 

windowsBuildAndPublish-delegated.sh

@@ -14,5 +14,5 @@ echo "completed libsodium build"
 #now we can do the delegated build
 cd ..
 ./gradlew multiplatform-crypto-delegated:build
-./gradlew multiplatform-crypto-delegated:publishMingwX64PublicationToSnapshotMavenRepository
+./gradlew multiplatform-crypto-delegated:publishMingwX64PublicationToSnapshotRepository
 set +e

windowsBuildAndPublish-pure.sh

@@ -4,5 +4,5 @@ set -e
 
 ./gradlew multiplatform-crypto-api:build
 ./gradlew multiplatform-crypto:build
-./gradlew multiplatform-crypto:publishMingwX64PublicationToSnapshotMavenRepository
+./gradlew multiplatform-crypto:publishMingwX64PublicationToSnapshotRepository
 set +e