diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f6ba47d..7afdc59 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -87,7 +87,7 @@ jobs: - name: Check JVM (Windows) if: matrix.os == 'windows-latest' shell: msys2 {0} - run: ./gradlew jvmTest + run: ./gradlew mingwX64Test jvmTest - name: Check Linux if: matrix.os == 'ubuntu-latest' shell: bash @@ -95,7 +95,7 @@ jobs: - name: Check iOS if: matrix.os == 'macOS-latest' shell: bash - run: ./gradlew iosX64Test + run: ./gradlew macosX64Test iosX64Test - name: Check Android if: matrix.os == 'macOS-latest' uses: reactivecircus/android-emulator-runner@v2 @@ -112,7 +112,7 @@ jobs: - name: Publish Windows if: matrix.os == 'windows-latest' shell: msys2 {0} - run: ./gradlew :jni:jvm:mingw:publishToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} + run: ./gradlew publishMingwX64PublicationToMavenLocal :jni:jvm:mingw:publishToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} - name: Publish MacOS if: matrix.os == 'macOS-latest' shell: bash diff --git a/build.gradle.kts b/build.gradle.kts index 4087897..960099f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,6 +58,18 @@ kotlin { secp256k1CInterop("host") } + macosX64 { + secp256k1CInterop("host") + } + + macosArm64 { + secp256k1CInterop("host") + } + + mingwX64 { + secp256k1CInterop("host") + } + iosX64 { secp256k1CInterop("ios") } diff --git a/publishing/secp256k1-kmp-snapshot-deploy.sh b/publishing/secp256k1-kmp-snapshot-deploy.sh index d26e942..016e7db 100755 --- a/publishing/secp256k1-kmp-snapshot-deploy.sh +++ b/publishing/secp256k1-kmp-snapshot-deploy.sh @@ -21,45 +21,55 @@ 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 jni-android jni-common jni-jvm-darwin jni-jvm-extract jni-jvm-linux jni-jvm-mingw jni-jvm jvm linuxx64; 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 macosarm64 macosx64 mingwx64; do cd fr/acinq/secp256k1/secp256k1-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-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 == 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,$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 + + case $i in + iosarm64 | iossimulatorarm64 | iosx64 | 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,$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 + ;; + + linuxx64 | mingwx64) + 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 + ;; + + jni-android) + 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 + ;; + + *) + 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