Split builds into more jobs as we are itting execution time limit on travis, it seems linking takes much longer on 1.4.0-rc

.travis.yml

@@ -15,9 +15,9 @@ matrix:
       script:
         - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./linuxBuild.sh; fi'
         - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi'
-#       OSX macos/ios
+    # OSX macos
     - os: osx
-      name: osx-mac-ios
+      name: osx-mac
       osx_image: xcode11.4
       language: java
       jdk: openjdk12
@@ -26,8 +26,21 @@ matrix:
         KBUILD=linux
         JAVA_OPTS=-Xmx2g
       script:
-        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-mac-ios.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-mac.sh; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-mac-ios.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-mac.sh; fi'
+    # OSX ios
+    - os: osx
+      name: osx-ios
+      osx_image: xcode11.4
+      language: java
+      jdk: openjdk12
+      install: true
+      env:
+        KBUILD=linux
+        JAVA_OPTS=-Xmx2g
+      script:
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-ios.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-ios.sh; fi'
     #   OSX watchos
     - os: osx
       name: osx-watchos
@@ -54,9 +67,10 @@ matrix:
       script:
         - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-tvos.sh; fi'
         - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-tvos.sh; fi'
-    #   OSX pure
+
+    # OSX macos PURE
     - os: osx
-      name: osx-pure
+      name: osx-mac-pure
       osx_image: xcode11.4
       language: java
       jdk: openjdk12
@@ -65,8 +79,48 @@ matrix:
         KBUILD=linux
         JAVA_OPTS=-Xmx2g
       script:
-        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure-mac.sh; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure-mac.sh; fi'
+    # OSX ios PURE
+    - os: osx
+      name: osx-ios-pure
+      osx_image: xcode11.4
+      language: java
+      jdk: openjdk12
+      install: true
+      env:
+        KBUILD=linux
+        JAVA_OPTS=-Xmx2g
+      script:
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure-ios.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure-ios.sh; fi'
+    #   OSX watchos PURE
+    - os: osx
+      name: osx-watchos-pure
+      osx_image: xcode11.4
+      language: java
+      jdk: openjdk12
+      install: true
+      env:
+        KBUILD=linux
+        JAVA_OPTS=-Xmx2g
+      script:
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure-watchos.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure-watchos.sh; fi'
+    #   OSX tvos PURE
+    - os: osx
+      name: osx-tvos-pure
+      osx_image: xcode11.4
+      language: java
+      jdk: openjdk12
+      install: true
+      env:
+        KBUILD=linux
+        JAVA_OPTS=-Xmx2g
+      script:
+        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure-tvos.sh; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure-tvos.sh; fi'
+
     - os: windows
       name: windows-pure
       language: shell

macBuild-ios.sh

@@ -10,16 +10,12 @@ cd sodiumWrapper
 cd ..
 ./gradlew multiplatform-crypto-delegated:iosArm32MainKlibrary multiplatform-crypto-delegated:iosArm32TestKlibrary \
 multiplatform-crypto-delegated:iosArm64MainKlibrary multiplatform-crypto-delegated:iosArm64TestKlibrary \
-multiplatform-crypto-delegated:iosX64MainKlibrary multiplatform-crypto-delegated:iosX64TestKlibrary \
+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
 
 ./gradlew multiplatform-crypto-libsodium-bindings:iosArm32MainKlibrary multiplatform-crypto-libsodium-bindings:iosArm32TestKlibrary \
 multiplatform-crypto-libsodium-bindings:iosArm64MainKlibrary multiplatform-crypto-libsodium-bindings:iosArm64TestKlibrary \
-multiplatform-crypto-libsodium-bindings:iosX64MainKlibrary multiplatform-crypto-libsodium-bindings:iosX64TestKlibrary \
+multiplatform-crypto-libsodium-bindings:iosX64MainKlibrary multiplatform-crypto-libsodium-bindings:iosX64TestKlibrary
-multiplatform-crypto-libsodium-bindings:macosX64MainKlibrary multiplatform-crypto-libsodium-bindings:macosX64TestKlibrary
 ./gradlew multiplatform-crypto-libsodium-bindings:iosX64Test
-./gradlew multiplatform-crypto-libsodium-bindings:macosX64Test
 set +e
 

macBuild-mac.sh

@@ -0,0 +1,17 @@
+set -e
+#!/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
+cd sodiumWrapper
+./makeMacosX86-64.sh
+./makeIos.sh
+#now we can do the delegated build of ios and macos libraries
+cd ..
+./gradlew multiplatform-crypto-delegated:macosX64MainKlibrary multiplatform-crypto-delegated:macosX64TestKlibrary
+./gradlew multiplatform-crypto-delegated:macosX64Test
+
+./gradlew multiplatform-crypto-libsodium-bindings:macosX64MainKlibrary multiplatform-crypto-libsodium-bindings:macosX64TestKlibrary
+./gradlew multiplatform-crypto-libsodium-bindings:macosX64Test
+set +e
+

macBuild-pure-ios.sh

@@ -0,0 +1,9 @@
+set -e
+#!/bin/sh
+./gradlew multiplatform-crypto-api:build
+./gradlew multiplatform-crypto:iosArm32MainKlibrary multiplatform-crypto:iosArm32TestKlibrary \
+multiplatform-crypto:iosArm64MainKlibrary multiplatform-crypto:iosArm64TestKlibrary \
+multiplatform-crypto:iosX64MainKlibrary multiplatform-crypto:iosX64TestKlibrary
+./gradlew multiplatform-crypto:iosX64Test
+
+set +e

macBuild-pure-mac.sh

@@ -0,0 +1,7 @@
+set -e
+#!/bin/sh
+./gradlew multiplatform-crypto-api:build
+./gradlew multiplatform-crypto:macosX64MainKlibrary multiplatform-crypto:macosX64TestKlibrary
+./gradlew multiplatform-crypto:macosX64Test
+
+set +e

macBuild-pure-tvos.sh

@@ -0,0 +1,7 @@
+set -e
+#!/bin/sh
+./gradlew multiplatform-crypto-api:build
+./gradlew multiplatform-crypto:tvosArm64MainKlibrary multiplatform-crypto:tvosArm64TestKlibrary \
+multiplatform-crypto:tvosX64MainKlibrary multiplatform-crypto:tvosX64TestKlibrary
+./gradlew multiplatform-crypto:tvosX64Test
+set +e

macBuild-pure-watchos.sh

@@ -0,0 +1,8 @@
+set -e
+#!/bin/sh
+./gradlew multiplatform-crypto-api:build
+./gradlew multiplatform-crypto:watchosArm32MainKlibrary multiplatform-crypto:watchosArm32TestKlibrary \
+multiplatform-crypto:watchosArm64MainKlibrary multiplatform-crypto:watchosArm64TestKlibrary \
+multiplatform-crypto:watchosX86MainKlibrary multiplatform-crypto:watchosX86TestKlibrary
+./gradlew multiplatform-crypto:watchosX86Test
+set +e

macBuild-pure.sh

@@ -1,5 +0,0 @@
-set -e
-#!/bin/sh
-./gradlew multiplatform-crypto-api:build
-./gradlew multiplatform-crypto:build
-set +e

macBuildAndPublish-ios.sh

@@ -10,11 +10,9 @@ cd sodiumWrapper
 cd ..
 ./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToSnapshotRepository \
 multiplatform-crypto-delegated:publishIosArm64PublicationToSnapshotRepository \
-multiplatform-crypto-delegated:publishIosX64PublicationToSnapshotRepository \
+multiplatform-crypto-delegated:publishIosX64PublicationToSnapshotRepository
-multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository
 
 ./gradlew multiplatform-crypto-libsodium-bindings:publishIosArm32PublicationToSnapshotRepository \
 multiplatform-crypto-libsodium-bindings:publishIosArm64PublicationToSnapshotRepository \
-multiplatform-crypto-libsodium-bindings:publishIosX64PublicationToSnapshotRepository \
+multiplatform-crypto-libsodium-bindings:publishIosX64PublicationToSnapshotRepository
-multiplatform-crypto-libsodium-bindings:publishMacosX64PublicationToSnapshotRepository
 set +e

macBuildAndPublish-mac.sh

@@ -0,0 +1,14 @@
+set -e
+#!/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
+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
+
+./gradlew multiplatform-crypto-libsodium-bindings:publishMacosX64PublicationToSnapshotRepository
+set +e

macBuildAndPublish-pure-ios.sh

@@ -0,0 +1,8 @@
+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:publishIos32ArmPublicationToSnapshotRepository \
+multiplatform-crypto:publishIos64ArmPublicationToSnapshotRepository \
+multiplatform-crypto:publishIosPublicationToSnapshotRepository
+set +e

macBuildAndPublish-pure-mac-ios.sh

@@ -0,0 +1,6 @@
+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:publishMacosX64PublicationToSnapshotRepository
+set +e

macBuildAndPublish-pure-tvos.sh

@@ -0,0 +1,8 @@
+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-delegated:publishTvosArm64PublicationToSnapshotRepository \
+multiplatform-crypto-delegated:publishTvosX64PublicationToSnapshotRepository
+
+set +e

macBuildAndPublish-pure-watchos.sh

@@ -0,0 +1,8 @@
+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:publishWatchosArm32PublicationToSnapshotRepository \
+multiplatform-crypto:publishWatchosArm64PublicationToSnapshotRepository \
+multiplatform-crypto:publishWatchosX86PublicationToSnapshotRepository
+set +e

macBuildAndPublish-pure.sh

@@ -1,14 +0,0 @@
-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:publishIos32ArmPublicationToSnapshotRepository \
-multiplatform-crypto:publishIos64ArmPublicationToSnapshotRepository \
-multiplatform-crypto:publishIosPublicationToSnapshotRepository \
-multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \
-multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \
-multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository \
-multiplatform-crypto:publishWatchosArm32PublicationToSnapshotRepository \
-multiplatform-crypto:publishWatchosArm64PublicationToSnapshotRepository \
-multiplatform-crypto:publishWatchosX86PublicationToSnapshotRepository
-set +e

macBuildAndPublish-tvos.sh

@@ -2,14 +2,7 @@ set -e
 #!/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
+./gradlew multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \
-cd sodiumWrapper
+multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository
-./makeTvos.sh
-#now we can do the delegated build of ios and macos libraries
-cd ..
-./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToSnapshotRepository \
-multiplatform-crypto-delegated:publishTvosX64PublicationToSnapshotRepository
 
-./gradlew multiplatform-crypto-libsodium-bindings:publishTvosArm64PublicationToSnapshotRepository \
-multiplatform-crypto-libsodium-bindings:publishTvosX64PublicationToSnapshotRepository
 set +e