From 074c7df66e929fb3c47bafd1d3cf0a282816ea30 Mon Sep 17 00:00:00 2001 From: sstone Date: Mon, 11 Dec 2023 15:56:40 +0100 Subject: [PATCH 1/2] Use kotlin 1.9 --- .github/workflows/release.yml | 4 +-- .github/workflows/snapshot.yml | 4 +-- .github/workflows/test.yml | 2 +- build.gradle.kts | 34 ++++++++++--------- .../jni/NativeSecp256k1AndroidLoader.kt | 4 +-- native/build-ios.sh | 5 ++- native/xconfigure.sh | 17 ++++++++-- publishing/secp256k1-kmp-snapshot-deploy.sh | 6 ++-- src/nativeInterop/cinterop/libsecp256k1.def | 8 +++-- .../fr/acinq/secp256k1/Secp256k1Native.kt | 4 +-- tests/build.gradle.kts | 16 ++++----- 11 files changed, 62 insertions(+), 42 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6856c44..086b9f3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,7 +86,7 @@ jobs: - name: Check Linux if: matrix.os == 'ubuntu-latest' shell: bash - run: ./gradlew linuxTest + run: ./gradlew linuxX64Test - name: Check iOS if: matrix.os == 'macOS-latest' shell: bash @@ -103,7 +103,7 @@ jobs: - name: Publish Linux if: matrix.os == 'ubuntu-latest' shell: bash - run: ./gradlew publishLinuxPublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal + run: ./gradlew publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal - name: Publish Windows if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index dd788d2..daf2582 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -95,7 +95,7 @@ jobs: - name: Check Linux if: matrix.os == 'ubuntu-latest' shell: bash - run: ./gradlew linuxTest + run: ./gradlew linuxX64Test - name: Check iOS if: matrix.os == 'macOS-latest' shell: bash @@ -112,7 +112,7 @@ jobs: - name: Publish Linux if: matrix.os == 'ubuntu-latest' shell: bash - run: ./gradlew publishLinuxPublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} + run: ./gradlew publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} - name: Publish Windows if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6add186..e06cf05 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,7 +101,7 @@ jobs: - name: Check Linux if: matrix.os == 'ubuntu-latest' shell: bash - run: ./gradlew linuxTest + run: ./gradlew linuxX64Test - name: Check iOS if: matrix.os == 'macOS-latest' shell: bash diff --git a/build.gradle.kts b/build.gradle.kts index f2aea2a..4c2c306 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.dokka.Platform plugins { - kotlin("multiplatform") version "1.8.21" - id("org.jetbrains.dokka") version "1.8.10" + kotlin("multiplatform") version "1.9.22" + id("org.jetbrains.dokka") version "1.9.10" `maven-publish` } @@ -16,13 +16,13 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10") + classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") } } allprojects { group = "fr.acinq.secp256k1" - version = "0.12.1-SNAPSHOT" + version = "0.13.0-SNAPSHOT" repositories { google() @@ -52,20 +52,22 @@ kotlin { } } - val nativeMain by sourceSets.creating { dependsOn(commonMain) } + val nativeMain by sourceSets.creating - linuxX64("linux") { + linuxX64 { secp256k1CInterop("host") - compilations["main"].defaultSourceSet.dependsOn(nativeMain) - // https://youtrack.jetbrains.com/issue/KT-39396 - compilations["main"].kotlinOptions.freeCompilerArgs += listOf("-include-binary", "$rootDir/native/build/linux/libsecp256k1.a") } - ios { + iosX64 { + secp256k1CInterop("ios") + } + + iosArm64 { + secp256k1CInterop("ios") + } + + iosSimulatorArm64 { secp256k1CInterop("ios") - compilations["main"].defaultSourceSet.dependsOn(nativeMain) - // https://youtrack.jetbrains.com/issue/KT-39396 - compilations["main"].kotlinOptions.freeCompilerArgs += listOf("-include-binary", "$rootDir/native/build/ios/libsecp256k1.a") } sourceSets.all { @@ -80,9 +82,9 @@ allprojects { val currentOs = OperatingSystem.current() val targets = when { currentOs.isLinux -> listOf() - currentOs.isMacOsX -> listOf("linux") - currentOs.isWindows -> listOf("linux") - else -> listOf("linux") + currentOs.isMacOsX -> listOf("linuxX64") + currentOs.isWindows -> listOf("linuxX64") + else -> listOf("linuxX64") }.mapNotNull { kotlin.targets.findByName(it) as? KotlinNativeTarget } configure(targets) { diff --git a/jni/android/src/main/java/fr/acinq/secp256k1/jni/NativeSecp256k1AndroidLoader.kt b/jni/android/src/main/java/fr/acinq/secp256k1/jni/NativeSecp256k1AndroidLoader.kt index 6c66508..cbb179b 100644 --- a/jni/android/src/main/java/fr/acinq/secp256k1/jni/NativeSecp256k1AndroidLoader.kt +++ b/jni/android/src/main/java/fr/acinq/secp256k1/jni/NativeSecp256k1AndroidLoader.kt @@ -6,11 +6,10 @@ import fr.acinq.secp256k1.NativeSecp256k1 import java.util.* public object NativeSecp256k1AndroidLoader { - @JvmStatic @Synchronized @Throws(Exception::class) - fun load(): Secp256k1 { + public fun load(): Secp256k1 { try { System.loadLibrary("secp256k1-jni") return NativeSecp256k1 @@ -27,5 +26,4 @@ public object NativeSecp256k1AndroidLoader { } } - } diff --git a/native/build-ios.sh b/native/build-ios.sh index 2588133..3cf2b25 100755 --- a/native/build-ios.sh +++ b/native/build-ios.sh @@ -9,7 +9,10 @@ cd secp256k1 sh xconfigure.sh --enable-experimental --enable-module_ecdh --enable-module-recovery --enable-module-schnorrsig --enable-benchmark=no --enable-shared=no --enable-exhaustive-tests=no --enable-tests=no mkdir -p ../build/ios -cp -v _build/universal/* ../build/ios/ +cp -v _build/universal/ios/* ../build/ios/ + +mkdir -p ../build/iosSimulatorArm64 +cp -v _build/universal/iosSimulatorArm64/* ../build/iosSimulatorArm64/ rm -rf _build make clean diff --git a/native/xconfigure.sh b/native/xconfigure.sh index bafc7c1..37c2932 100644 --- a/native/xconfigure.sh +++ b/native/xconfigure.sh @@ -69,9 +69,22 @@ HOST_FLAGS="${ARCH_FLAGS} -mios-simulator-version-min=${MIN_IOS_VERSION} -isysro CHOST="x86_64-apple-darwin" Build "$@" +## Build for iphone M1/M2/Mx simulators +SDK="iphonesimulator" +PLATFORM="arm64-sim" +PLATFORM_SIM_ARM=${PLATFORM} +ARCH_FLAGS="-arch arm64" +HOST_FLAGS="${ARCH_FLAGS} -mios-simulator-version-min=${MIN_IOS_VERSION} -isysroot $(xcrun --sdk ${SDK} --show-sdk-path)" +CHOST="arm-apple-darwin" +Build "$@" + # Create universal binary cd "${PLATFORMS}/${PLATFORM_ARM}/lib" LIB_NAME=`find . -iname *.a` cd - -mkdir -p "${UNIVERSAL}" &> /dev/null -lipo -create -output "${UNIVERSAL}/${LIB_NAME}" "${PLATFORMS}/${PLATFORM_ARM}/lib/${LIB_NAME}" "${PLATFORMS}/${PLATFORM_ISIM}/lib/${LIB_NAME}" +mkdir -p "${UNIVERSAL}/ios" &> /dev/null +mkdir -p "${UNIVERSAL}/iosSimulatorArm64" &> /dev/null +lipo -create -output "${UNIVERSAL}/ios/${LIB_NAME}" "${PLATFORMS}/${PLATFORM_ARM}/lib/${LIB_NAME}" "${PLATFORMS}/${PLATFORM_ISIM}/lib/${LIB_NAME}" + +# create a specific library for arm64 simulator: it cannot be included in the lib above which already contains an arm64 lib +lipo -create -output "${UNIVERSAL}/iosSimulatorArm64/${LIB_NAME}" "${PLATFORMS}/${PLATFORM_SIM_ARM}/lib/${LIB_NAME}" \ No newline at end of file diff --git a/publishing/secp256k1-kmp-snapshot-deploy.sh b/publishing/secp256k1-kmp-snapshot-deploy.sh index cf75525..d26e942 100755 --- a/publishing/secp256k1-kmp-snapshot-deploy.sh +++ b/publishing/secp256k1-kmp-snapshot-deploy.sh @@ -21,9 +21,9 @@ 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 iosx64 jni-android jni-common jni-jvm-darwin jni-jvm-extract jni-jvm-linux jni-jvm-mingw jni-jvm jvm linux; do +for i in iosarm64 iossimulatorarm64 iosx64 jni-android jni-common jni-jvm-darwin jni-jvm-extract jni-jvm-linux jni-jvm-mingw jni-jvm jvm linuxx64; do cd fr/acinq/secp256k1/secp256k1-kmp-$i/$VERSION - if [ $i == iosarm64 ] || [ $i == iosx64 ]; then + 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 \ @@ -32,7 +32,7 @@ for i in iosarm64 iosx64 jni-android jni-common jni-jvm-darwin jni-jvm-extract j -Dclassifiers=metadata,,cinterop-libsecp256k1 \ -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \ -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar - elif [ $i == linux ]; then + 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 \ diff --git a/src/nativeInterop/cinterop/libsecp256k1.def b/src/nativeInterop/cinterop/libsecp256k1.def index 5063ce6..cdf1c79 100644 --- a/src/nativeInterop/cinterop/libsecp256k1.def +++ b/src/nativeInterop/cinterop/libsecp256k1.def @@ -3,8 +3,12 @@ package = secp256k1 headers = secp256k1.h secp256k1_ecdh.h secp256k1_recovery.h secp256k1_extrakeys.h secp256k1_schnorrsig.h headerFilter = secp256k1/** secp256k1_ecdh.h secp256k1_recovery.h secp256k1_extrakeys.h secp256k1_schnorrsig.h secp256k1.h -libraryPaths.linux = c/secp256k1/build/linux/ +staticLibraries.linux = libsecp256k1.a +libraryPaths.linux = c/secp256k1/build/linux/ native/build/linux/ native/build/darwin/ linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib -libraryPaths.ios = c/secp256k1/build/ios/ /usr/local/lib +staticLibraries.ios = libsecp256k1.a +libraryPaths.ios_x64 = c/secp256k1/build/ios/ /usr/local/lib native/build/ios/ +libraryPaths.ios_arm64 = c/secp256k1/build/ios/ /usr/local/lib native/build/ios/ +libraryPaths.ios_simulator_arm64 = c/secp256k1/build/ios/ /usr/local/lib native/build/iosSimulatorArm64/ linkerOpts.ios = -framework Security -framework Foundation diff --git a/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt b/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt index 2f0db83..a06fde7 100644 --- a/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt +++ b/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt @@ -4,7 +4,7 @@ import kotlinx.cinterop.* import platform.posix.size_tVar import secp256k1.* -@OptIn(ExperimentalUnsignedTypes::class) +@OptIn(ExperimentalUnsignedTypes::class, ExperimentalForeignApi::class) public object Secp256k1Native : Secp256k1 { private val ctx: CPointer by lazy { @@ -238,7 +238,7 @@ public object Secp256k1Native : Secp256k1 { secp256k1_xonly_pubkey_parse(ctx, pubkey.ptr, nPub).requireSuccess("secp256k1_xonly_pubkey_parse() failed") val nData = toNat(data) val nSig = toNat(signature) - return secp256k1_schnorrsig_verify(ctx, nSig, nData, 32, pubkey.ptr) == 1 + return secp256k1_schnorrsig_verify(ctx, nSig, nData, 32u, pubkey.ptr) == 1 } } diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index a50d3e5..60005e5 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("multiplatform") if (System.getProperty("includeAndroid")?.toBoolean() == true) { @@ -36,14 +35,14 @@ kotlin { } if (includeAndroid) { - android { + androidTarget { compilations.all { kotlinOptions.jvmTarget = "1.8" } sourceSets["androidMain"].dependencies { implementation(project(":jni:android")) } - sourceSets["androidTest"].dependencies { + sourceSets["androidUnitTest"].dependencies { implementation(kotlin("test-junit")) implementation("androidx.test.ext:junit:1.1.2") implementation("androidx.test.espresso:espresso-core:3.3.0") @@ -51,17 +50,18 @@ kotlin { } } - linuxX64("linux") - - ios() + linuxX64() + iosX64() + iosArm64() + iosSimulatorArm64() } val includeAndroid = System.getProperty("includeAndroid")?.toBoolean() ?: true if (includeAndroid) { extensions.configure("android") { defaultConfig { - compileSdkVersion(30) - minSdkVersion(21) + compileSdk = 30 + minSdk = 21 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } From 843d7febae4313254498b46b6601b38354a0a80b Mon Sep 17 00:00:00 2001 From: sstone Date: Fri, 12 Jan 2024 11:42:04 +0100 Subject: [PATCH 2/2] Update github action scripts --- .github/workflows/release.yml | 6 +----- .github/workflows/snapshot.yml | 6 +----- .github/workflows/test.yml | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 086b9f3..9847fe6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,15 +58,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index daf2582..f6ba47d 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -67,15 +67,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e06cf05..fc3a042 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,15 +73,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0}