From da87bb4f17f3808713706ab38c00617d8d795fff Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 18:52:06 +0200 Subject: [PATCH 1/5] Fix windows build task name and shell env for publish script --- .travis.yml | 2 +- windowsBuildAndPublish-delegated.sh | 2 +- windowsBuildAndPublish-pure.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index be423d2..112f209 100644 --- a/.travis.yml +++ b/.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/ diff --git a/windowsBuildAndPublish-delegated.sh b/windowsBuildAndPublish-delegated.sh index fbef035..6434ff4 100755 --- a/windowsBuildAndPublish-delegated.sh +++ b/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 \ No newline at end of file diff --git a/windowsBuildAndPublish-pure.sh b/windowsBuildAndPublish-pure.sh index 7da4fd6..f1f2c00 100755 --- a/windowsBuildAndPublish-pure.sh +++ b/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 \ No newline at end of file From b05bf70cffa28669131691b9002de43591592d03 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 19:17:16 +0200 Subject: [PATCH 2/5] Arm32 -> 32Arm --- macBuildAndPublish-pure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh index fe9bac0..7c9284b 100755 --- a/macBuildAndPublish-pure.sh +++ b/macBuildAndPublish-pure.sh @@ -2,7 +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 -./gradlew multiplatform-crypto:publishIosArm32PublicationToSnapshotRepository \ +./gradlew multiplatform-crypto:publishIos32ArmPublicationToSnapshotRepository \ multiplatform-crypto:publishIosArm64PublicationToSnapshotRepository \ multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \ multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \ From 90748d632350bd7c103199ae9ea82e2952ae930a Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 20:10:51 +0200 Subject: [PATCH 3/5] Arm64 -> 64Arm --- macBuildAndPublish-pure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh index 7c9284b..c7c675a 100755 --- a/macBuildAndPublish-pure.sh +++ b/macBuildAndPublish-pure.sh @@ -3,7 +3,7 @@ set -e #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:publishIosArm64PublicationToSnapshotRepository \ +multiplatform-crypto:publishIos64ArmPublicationToSnapshotRepository \ multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \ multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \ multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \ From d261ed2396df504a87678add0d623c191699d5a6 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 20:37:33 +0200 Subject: [PATCH 4/5] X64 -> --- macBuildAndPublish-pure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh index c7c675a..945a8cb 100755 --- a/macBuildAndPublish-pure.sh +++ b/macBuildAndPublish-pure.sh @@ -4,7 +4,7 @@ set -e ./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto:publishIos32ArmPublicationToSnapshotRepository \ multiplatform-crypto:publishIos64ArmPublicationToSnapshotRepository \ -multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \ +multiplatform-crypto:publishIosPublicationToSnapshotRepository \ multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \ multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \ multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository \ From f246acc7450ae4760d090e1c5ed05107c4408902 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 21:04:49 +0200 Subject: [PATCH 5/5] Add watchos and tvos targets to pure variant --- multiplatform-crypto/build.gradle.kts | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index 81084a3..f11341a 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/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 {