From 9255bc44faebd95542776b79e6d6a9ff2a52137d Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ionspinf@gmail.com>
Date: Wed, 10 Jun 2020 18:28:27 +0200
Subject: [PATCH] Figuring out linux build with sodium

---
 .travis.yml   | 48 +++++++++++++++++++++++++-----------------------
 linuxBuild.sh | 14 +++++++++++++-
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9b6a1bc..cdef8c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,33 +13,35 @@ matrix:
       script:
         - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./linuxBuild.sh; fi'
         - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi'
-    - os: osx
-      osx_image: xcode11.4
-      language: java
-      jdk: openjdk12
+#    - os: osx
+#      osx_image: xcode11.4
+#      language: java
+#      jdk: openjdk12
+#      -------------------------
 #      before_script:
 #        - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
 #        - source install-jdk.sh --url 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&heap_size=normal&type=jdk'
 #        - java --version
-      env:
-        KBUILD=linux
-        JAVA_OPTS=-Xmx2g
-      script:
-        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild.sh; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish.sh; fi'
-    - os: windows
-      language: shell
-      jdk: openjdk12
-      env:
-        - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
-        - JAVA_OPTS=-Xmx2g
-        - JDK="adopt-openj9@1.11"
-      before_install:
-        - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
-        - source ~/.install-jdk-travis.sh
-      script:
-        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./gradlew build ; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew build publishMingwx64PublicationToSnapshotRepository; fi'
+#      -------------------------
+#      env:
+#        KBUILD=linux
+#        JAVA_OPTS=-Xmx2g
+#      script:
+#        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild.sh; fi'
+#        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish.sh; fi'
+#    - os: windows
+#      language: shell
+#      jdk: openjdk12
+#      env:
+#        - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
+#        - JAVA_OPTS=-Xmx2g
+#        - JDK="adopt-openj9@1.11"
+#      before_install:
+#        - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
+#        - source ~/.install-jdk-travis.sh
+#      script:
+#        - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./gradlew build ; fi'
+#        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew build publishMingwx64PublicationToSnapshotRepository; fi'
 cache:
   directories:
     - $HOME/.m2/
diff --git a/linuxBuild.sh b/linuxBuild.sh
index 6c1fb2c..b4870f1 100644
--- a/linuxBuild.sh
+++ b/linuxBuild.sh
@@ -1 +1,13 @@
-./gradlew build
\ No newline at end of file
+#!/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
+./makeLinux64.sh
+./makeLinuxArm64.sh
+#now we can do the delegated build
+./gradlew multiplatform-crypto-delegated:build
+#and finally pure build
+./gradlew multiplatform-crypto:build
+
+