Add macos targets

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 val currentOs = org.gradle.internal.os.OperatingSystem.current()
 
 group = "fr.acinq.bitcoin"
-version = "0.18.0"
+version = "0.19.0-SNAPSHOT"
 
 repositories {
     google()
@@ -32,6 +32,10 @@ kotlin {
 
     linuxX64()
 
+    macosX64()
+
+    macosArm64()
+
     iosX64 {
         compilations["main"].cinterops.create("CoreCrypto")
     }
@@ -45,7 +49,7 @@ kotlin {
     }
 
     sourceSets {
-        val secp256k1KmpVersion = "0.14.0"
+        val secp256k1KmpVersion = "0.15.0"
 
         val commonMain by getting {
             dependencies {

publishing/bitcoin-kmp-snapshot-deploy.sh

@@ -21,36 +21,51 @@ mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/conte
   -Djavadoc=$ARTIFACT_ID_BASE-$VERSION-javadoc.jar
 popd
 pushd .
-for i in iosarm64 iossimulatorarm64 iosx64 jvm linuxx64; do
+for i in iosarm64 iossimulatorarm64 iosx64 macosarm64 macosx64 jvm linuxx64; do
   cd fr/acinq/bitcoin/bitcoin-kmp-$i/$VERSION
-  if [ $i == iosarm64 ] || [ $i == iossimulatorarm64 ] || [ $i == iosx64 ]; then
-    mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
-      -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
-      -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \
-      -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION-metadata.jar,$ARTIFACT_ID_BASE-$i-$VERSION.module,$ARTIFACT_ID_BASE-$i-$VERSION-cinterop-CoreCrypto.klib \
-      -Dtypes=jar,module,klib \
-      -Dclassifiers=metadata,,cinterop-CoreCrypto \
-      -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
-      -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
-  elif [ $i == linuxx64 ]; then
-    mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
-      -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
-      -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \
-      -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION.module \
-      -Dtypes=module \
-      -Dclassifiers= \
-      -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
-      -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
-  else
-    mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
-      -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
-      -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.jar \
-      -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION.module \
-      -Dtypes=module \
-      -Dclassifiers= \
-      -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
-      -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
-  fi
+
+  case $i in
+    iosarm64 |iossimulatorarm64 | iosx64)
+      mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
+        -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
+        -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \
+        -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION-metadata.jar,$ARTIFACT_ID_BASE-$i-$VERSION.module,$ARTIFACT_ID_BASE-$i-$VERSION-cinterop-CoreCrypto.klib \
+        -Dtypes=jar,module,klib \
+        -Dclassifiers=metadata,,cinterop-CoreCrypto \
+        -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
+        -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
+      ;;
+    macosarm64 | macosx64)
+      mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
+        -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
+        -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \
+        -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION-metadata.jar,$ARTIFACT_ID_BASE-$i-$VERSION.module \
+        -Dtypes=jar,module \
+        -Dclassifiers=metadata, \
+        -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
+        -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
+      ;;
+    linuxx64)
+      mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
+        -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
+        -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \
+        -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION.module \
+        -Dtypes=module \
+        -Dclassifiers= \
+        -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
+        -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
+      ;;
+    *)
+      mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
+        -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
+        -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.jar \
+        -Dfiles=$ARTIFACT_ID_BASE-$i-$VERSION.module \
+        -Dtypes=module \
+        -Dclassifiers= \
+        -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
+        -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
+      ;;
+  esac
   popd
   pushd .
 done

src/iosMain/kotlin/fr/acinq/bitcoin/crypto/pbkdf2Ios.kt → src/iosMain/kotlin/fr/acinq/bitcoin/crypto/pbkdf2.ios.kt

@@ -5,7 +5,6 @@ import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.refTo
 import platform.KCoreCrypto.KCCKeyDerivationPBKDF
 import platform.CoreCrypto.kCCPBKDF2
-import platform.CoreCrypto.kCCPRFHmacAlgSHA256
 import platform.CoreCrypto.kCCPRFHmacAlgSHA512
 
 

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/Digest.linux.kt

@@ -0,0 +1,6 @@
+package fr.acinq.bitcoin.crypto
+
+
+internal actual fun Sha1(): Digest = Sha1Native()
+internal actual fun Sha256(): Digest = Sha256Native()
+internal actual fun Sha512(): Digest = Sha512Native()

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/pbkdf2.linux.kt

@@ -0,0 +1,6 @@
+package fr.acinq.bitcoin.crypto
+
+public actual object Pbkdf2 {
+    public actual fun withHmacSha512(password: ByteArray, salt: ByteArray, count: Int, dkLen: Int): ByteArray =
+        Pbkdf2Native.withHmacSha512(password, salt, count, dkLen)
+}

src/macosMain/kotlin/fr/acinq/bitcoin/crypto/Digest.macos.kt

@@ -0,0 +1,7 @@
+package fr.acinq.bitcoin.crypto
+
+internal actual fun Sha1(): Digest = Sha1Native()
+
+internal actual fun Sha256(): Digest = Sha256Native()
+
+internal actual fun Sha512(): Digest = Sha512Native()

src/macosMain/kotlin/fr/acinq/bitcoin/crypto/Pbkdf2.macos.kt

@@ -0,0 +1,6 @@
+package fr.acinq.bitcoin.crypto
+
+public actual object Pbkdf2 {
+    public actual fun withHmacSha512(password: ByteArray, salt: ByteArray, count: Int, dkLen: Int): ByteArray =
+        Pbkdf2Native.withHmacSha512(password, salt, count, dkLen)
+}

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/Sha1Linux.kt → src/nativeMain/kotlin/fr/acinq/bitcoin/crypto/Sha1.native.kt

@@ -1,6 +1,6 @@
 package fr.acinq.bitcoin.crypto
 
-internal class Sha1Linux : Digest {
+internal class Sha1Native : Digest {
     private var H1 = 0
     private var H2 = 0
     private var H3 = 0

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/Sha256Linux.kt → src/nativeMain/kotlin/fr/acinq/bitcoin/crypto/Sha256.native.kt

@@ -16,7 +16,7 @@
 
 package fr.acinq.bitcoin.crypto
 
-public class Sha256Linux : Digest {
+public class Sha256Native : Digest {
     private val xBuf = ByteArray(4)
     private var xBufOff = 0
 

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/Sha512Linux.kt → src/nativeMain/kotlin/fr/acinq/bitcoin/crypto/Sha512.native.kt

@@ -16,7 +16,7 @@
 
 package fr.acinq.bitcoin.crypto
 
-public class Sha512Linux : Digest {
+public class Sha512Native : Digest {
 
     private val DIGEST_LENGTH = 64
 

src/linuxMain/kotlin/fr/acinq/bitcoin/crypto/pbkdf2Linux.kt → src/nativeMain/kotlin/fr/acinq/bitcoin/crypto/pbkdf2.native.kt

@@ -2,8 +2,7 @@ package fr.acinq.bitcoin.crypto
 
 import kotlin.experimental.xor
 
-
-public actual object Pbkdf2 {
+public object Pbkdf2Native {
 
     private interface Prf {
         fun outputLen(): Int
@@ -47,6 +46,6 @@ public actual object Pbkdf2 {
         return t
     }
 
-    public actual fun withHmacSha512(password: ByteArray, salt: ByteArray, count: Int, dkLen: Int): ByteArray =
+    public fun withHmacSha512(password: ByteArray, salt: ByteArray, count: Int, dkLen: Int): ByteArray =
         generate(salt, count, dkLen, Hmac512(password))
 }