diff --git a/bindings-macBuildAndPublishSnapshot.sh b/bindings-macBuildAndPublishSnapshot.sh new file mode 100755 index 0000000..57e2558 --- /dev/null +++ b/bindings-macBuildAndPublishSnapshot.sh @@ -0,0 +1,15 @@ +set -e +#!/bin/sh +./gradlew multiplatform-crypto-libsodium-bindings:publishMacosX64PublicationToSnapshotRepository + +./gradlew multiplatform-crypto-libsodium-bindings:publishIosArm32PublicationToSnapshotRepository \ +multiplatform-crypto-libsodium-bindings:publishIosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-libsodium-bindings:publishIosX64PublicationToSnapshotRepository + +./gradlew multiplatform-crypto-libsodium-bindings:publishWatchosArm32PublicationToSnapshotRepository \ +multiplatform-crypto-libsodium-bindings:publishWatchosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-libsodium-bindings:publishWatchosX86PublicationToSnapshotRepository + +./gradlew multiplatform-crypto-libsodium-bindings:publishTvosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-libsodium-bindings:publishTvosX64PublicationToSnapshotRepository +set +e diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index 96d7376..b026cce 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -56,7 +56,7 @@ object Deps { val apiProject = ":multiplatform-crypto-api" - val sharedModule = "com.ionspin.kotlin.crypto.sample:shared:${Versions.sharedModule}" + val libsodiumModule = "com.ionspin.kotlin:multiplatform-crypto-libsodium-bindings:${Versions.sharedModule}" val kodein = "org.kodein.di:kodein-di:${Versions.kodeinVersion}" } diff --git a/macBuild-buildLibsodium.sh b/macBuild-buildLibsodium.sh new file mode 100755 index 0000000..84546be --- /dev/null +++ b/macBuild-buildLibsodium.sh @@ -0,0 +1,11 @@ +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 +./makeIosWatchosTvos.sh +#now we can do the delegated build +cd .. +set +e \ No newline at end of file diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 5e76d7c..e54ab0b 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -42,6 +42,7 @@ repositories { mavenCentral() jcenter() maven("https://dl.bintray.com/terl/lazysodium-maven") + maven("https://oss.sonatype.org/content/repositories/snapshots/") } group = "com.ionspin.kotlin" @@ -118,7 +119,8 @@ kotlin { watchosArm32Target, watchosX86Target) ) { binaries.framework { - baseName = "sample" + baseName = "LibsodiumBindings" + export(Deps.Common.libsodiumModule) } } val mode = System.getenv("CONFIGURATION") ?: "DEBUG" @@ -158,7 +160,7 @@ kotlin { implementation(kotlin(Deps.Common.test)) implementation(Deps.Common.kotlinBigNum) implementation(Deps.Common.serialization) - implementation(project(":multiplatform-crypto-libsodium-bindings")) + api(Deps.Common.libsodiumModule) } } val commonTest by getting { diff --git a/sample/iosApp/iosApp.xcodeproj/project.pbxproj b/sample/iosApp/iosApp.xcodeproj/project.pbxproj index 6b849f5..84aaf76 100644 --- a/sample/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/sample/iosApp/iosApp.xcodeproj/project.pbxproj @@ -15,8 +15,6 @@ 7555FF8B242A565B00829871 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF89242A565B00829871 /* LaunchScreen.storyboard */; }; 7555FF96242A565B00829871 /* iosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF95242A565B00829871 /* iosAppTests.swift */; }; 7555FFA1242A565B00829871 /* iosAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FFA0242A565B00829871 /* iosAppUITests.swift */; }; - 7555FFB2242A642300829871 /* sample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7555FFB1242A642300829871 /* sample.framework */; }; - 7555FFB3242A642300829871 /* sample.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7555FFB1242A642300829871 /* sample.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -36,20 +34,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 7555FFB4242A642300829871 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 7555FFB3242A642300829871 /* sample.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF7E242A565900829871 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -73,7 +57,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7555FFB2242A642300829871 /* sample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -174,7 +157,6 @@ 7555FF77242A565900829871 /* Sources */, 7555FF78242A565900829871 /* Frameworks */, 7555FF79242A565900829871 /* Resources */, - 7555FFB4242A642300829871 /* Embed Frameworks */, ); buildRules = ( ); diff --git a/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/ionspin.xcuserdatad/UserInterfaceState.xcuserstate b/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/ionspin.xcuserdatad/UserInterfaceState.xcuserstate index 625e396..e7ba4d6 100644 Binary files a/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/ionspin.xcuserdatad/UserInterfaceState.xcuserstate and b/sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/ionspin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/sample/iosApp/iosApp/ContentView.swift b/sample/iosApp/iosApp/ContentView.swift index dfe33f9..e9437d7 100644 --- a/sample/iosApp/iosApp/ContentView.swift +++ b/sample/iosApp/iosApp/ContentView.swift @@ -1,8 +1,12 @@ import SwiftUI +import sample + struct ContentView: View { var body: some View { + Text("Hello, World!") + } }