From 6c58621661e7e7e2b463308176e7733ccfb13fda Mon Sep 17 00:00:00 2001 From: sstone Date: Tue, 9 May 2023 12:08:16 +0200 Subject: [PATCH 1/2] Upgrade to Kotlin 1.8 --- build.gradle.kts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1d425ed..7fb4ef1 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.6.21" - id("org.jetbrains.dokka") version "1.6.21" + kotlin("multiplatform") version "1.8.21" + id("org.jetbrains.dokka") version "1.8.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.6.21") + classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10") } } allprojects { group = "fr.acinq.secp256k1" - version = "0.9.1-SNAPSHOT" + version = "0.10.0-SNAPSHOT" repositories { google() @@ -157,6 +157,7 @@ allprojects { Platform.js -> "js" Platform.native -> "native" Platform.common -> "common" + Platform.wasm -> "wasm" } displayName.set(platformName) From ba1ad11d76ea56405fc87bfe09c61bea7e6371da Mon Sep 17 00:00:00 2001 From: sstone Date: Tue, 9 May 2023 18:13:58 +0200 Subject: [PATCH 2/2] Update snapshot deployment script Kotlin 1.8 creates a new metadata jar for ios modules. --- publishing/secp256k1-kmp-snapshot-deploy.sh | 94 ++++++++++++--------- 1 file changed, 53 insertions(+), 41 deletions(-) diff --git a/publishing/secp256k1-kmp-snapshot-deploy.sh b/publishing/secp256k1-kmp-snapshot-deploy.sh index 56196bb..cf75525 100755 --- a/publishing/secp256k1-kmp-snapshot-deploy.sh +++ b/publishing/secp256k1-kmp-snapshot-deploy.sh @@ -2,52 +2,64 @@ GROUP_ID=fr.acinq.secp256k1 ARTIFACT_ID_BASE=secp256k1-kmp -VERSION=0.9.0-SNAPSHOT + +if [[ -z "${VERSION}" ]]; then + echo "VERSION is not defined" + exit 1 +fi cd snapshot pushd . cd fr/acinq/secp256k1/secp256k1-kmp/$VERSION mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \ - -DpomFile=$ARTIFACT_ID_BASE-$VERSION.pom \ - -Dfile=$ARTIFACT_ID_BASE-$VERSION.jar \ - -Dfiles=$ARTIFACT_ID_BASE-$VERSION.module,$ARTIFACT_ID_BASE-$VERSION-kotlin-tooling-metadata.json \ - -Dtypes=module,json \ - -Dclassifiers=,kotlin-tooling-metadata \ - -Dsources=$ARTIFACT_ID_BASE-$VERSION-sources.jar \ - -Djavadoc=$ARTIFACT_ID_BASE-$VERSION-javadoc.jar + -DpomFile=$ARTIFACT_ID_BASE-$VERSION.pom \ + -Dfile=$ARTIFACT_ID_BASE-$VERSION.jar \ + -Dfiles=$ARTIFACT_ID_BASE-$VERSION.module,$ARTIFACT_ID_BASE-$VERSION-kotlin-tooling-metadata.json \ + -Dtypes=module,json \ + -Dclassifiers=,kotlin-tooling-metadata \ + -Dsources=$ARTIFACT_ID_BASE-$VERSION-sources.jar \ + -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 - cd fr/acinq/secp256k1/secp256k1-kmp-$i/$VERSION - if [ $i == iosarm64 ] || [ $i == iosx64 ] || [ $i == linux ]; 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,$ARTIFACT_ID_BASE-$i-$VERSION-cinterop-libsecp256k1.klib \ - -Dtypes=module,klib \ - -Dclassifiers=,cinterop-libsecp256k1 \ - -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \ - -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar - elif [ $i == jni-android ]; 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.aar \ - -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 - 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 + cd fr/acinq/secp256k1/secp256k1-kmp-$i/$VERSION + if [ $i == iosarm64 ] || [ $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-libsecp256k1.klib \ + -Dtypes=jar,module,klib \ + -Dclassifiers=metadata,,cinterop-libsecp256k1 \ + -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \ + -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar + elif [ $i == linux ]; 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,$ARTIFACT_ID_BASE-$i-$VERSION-cinterop-libsecp256k1.klib \ + -Dtypes=module,klib \ + -Dclassifiers=,cinterop-libsecp256k1 \ + -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \ + -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar + elif [ $i == jni-android ]; 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.aar \ + -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 + popd + pushd . done