Kotlin 1.4-M3, fixed CI glitches & fixed build on Mac (#4)

* Kotlin 1.4-M3, fixed CI glitches & fixed build on Mac

* Fixes https://github.com/eskatos/gradle-command-action/issues/24

* Explicit mode requirements in Android tests

Co-authored-by: Salomon BRYS <salomon@kodein.net>

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Check
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: iosX64Test
       - name: Publish
         uses: eskatos/gradle-command-action@v1
@@ -37,6 +37,7 @@ jobs:
           BINTRAY_USER: ${{ secrets.bintray_user }}
           BINTRAY_APIKEY: ${{ secrets.bintray_apikey }}
         with:
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: publishIosArm64PublicationToBintrayRepository publishIosX64PublicationToBintrayRepository
 
   publish:
@@ -60,7 +61,7 @@ jobs:
       - name: Check
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: check
       - name: Publish
         uses: eskatos/gradle-command-action@v1
@@ -68,4 +69,5 @@ jobs:
           BINTRAY_USER: ${{ secrets.bintray_user }}
           BINTRAY_APIKEY: ${{ secrets.bintray_apikey }}
         with:
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: publishAllPublicationsToBintrayRepository

.github/workflows/snapshot.yml

@@ -8,8 +8,8 @@ on:
       - '**.md'
       - '**.adoc'
       - '**/.gitignore'
-      - './github/**'
+      - '.github/**'
-      - '!./github/workflow/snapshot.yml'
+      - '!.github/workflows/snapshot.yml'
 
 jobs:
 
@@ -36,7 +36,7 @@ jobs:
       - name: Check
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: iosX64Test
       - name: Publish
         uses: eskatos/gradle-command-action@v1
@@ -44,6 +44,7 @@ jobs:
           BINTRAY_USER: ${{ secrets.bintray_user }}
           BINTRAY_APIKEY: ${{ secrets.bintray_apikey }}
         with:
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: publishIosArm64PublicationToBintrayRepository publishIosX64PublicationToBintrayRepository -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }}  -PgitSha=${{ github.sha }}
 
   publish:
@@ -67,7 +68,7 @@ jobs:
       - name: Check
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: check
       - name: Publish
         uses: eskatos/gradle-command-action@v1
@@ -75,4 +76,5 @@ jobs:
           BINTRAY_USER: ${{ secrets.bintray_user }}
           BINTRAY_APIKEY: ${{ secrets.bintray_apikey }}
         with:
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
           arguments: publishAllPublicationsToBintrayRepository -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} -PgitSha=${{ github.sha }}

.github/workflows/test.yml

@@ -1,16 +1,22 @@
 name: Check
 
 on:
-  push:
+  pull_request:
-    branches:
-      - 'master'
-    pull_request:
     paths-ignore:
       - '**.md'
       - '**.adoc'
       - '**/.gitignore'
-      - './github/**'
+      - '.github/**'
-      - '!./github/workflow/test.yml'
+      - '!.github/workflows/test.yml'
+  push:
+    branches:
+      - 'master'
+    paths-ignore:
+      - '**.md'
+      - '**.adoc'
+      - '**/.gitignore'
+      - '.github/**'
+      - '!.github/workflows/test.yml'
 
 jobs:
 
@@ -35,12 +41,14 @@ jobs:
       - name: Check JNI
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
-          dependencies-cache-enabled: true
+          dependencies-cache-enabled: false
           arguments: jvmTest -PnoCrossCompile=true
       - name: Check Linux
         uses: eskatos/gradle-command-action@v1
         with:
+          wrapper-cache-enabled: false # https://github.com/eskatos/gradle-command-action/issues/24
+          dependencies-cache-enabled: false
           arguments: linuxTest -PnoCrossCompile=true
 
   macos:
@@ -66,8 +74,8 @@ jobs:
       - name: Check iOS
         uses: eskatos/gradle-command-action@v1
         with:
-          wrapper-cache-enabled: true
+          wrapper-cache-enabled: false  # https://github.com/eskatos/gradle-command-action/issues/24
-          dependencies-cache-enabled: true
+          dependencies-cache-enabled: false
           arguments: iosX64Test -PnoCrossCompile=true
       - name: Check Android
         uses: reactivecircus/android-emulator-runner@v2

README.md

@@ -4,7 +4,7 @@ Kotlin/Multiplatform wrapper for Bitcoin Core's secp256k1 library. Targets: JVM,
 
 ## Installation
 
-[ ![Download](https://api.bintray.com/packages/acinq/libs/secp256k1-kmp/images/download.svg) ](https://bintray.com/acinq/libs/secp256k1-kmp/0.1.0-1.4-M2/link)
+[ ![Download](https://api.bintray.com/packages/acinq/libs/secp256k1-kmp/images/download.svg) ](https://bintray.com/acinq/libs/secp256k1-kmp/)
 
 First, you need to add the ACINQ libraries repository:
 

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.4-M2-mt"
+    kotlin("multiplatform") version "1.4-M3"
     `maven-publish`
 }
 
@@ -17,7 +17,7 @@ buildscript {
 
 allprojects {
     group = "fr.acinq.secp256k1"
-    version = "0.1.1-1.4-M2"
+    version = "0.1.0-1.4-M3"
 
     repositories {
         jcenter()

jni/build.sh

@@ -14,13 +14,12 @@ JNI_HEADERS=$TARGET
 
 if [ "$TARGET" == "linux" ]; then
   OUTFILE=libsecp256k1-jni.so
+  [ "$CROSS" == "1" ] && sudo apt -y install libgmp-dev
   ADD_LIB=-lgmp
   CC_OPTS="-fPIC"
 elif [ "$TARGET" == "darwin" ]; then
   OUTFILE=libsecp256k1-jni.dylib
-  if [ -z "$CROSS_TRIPLE" ]; then
+  ADD_LIB=-lgmp
-    ADD_LIB=-lgmp
-  fi
 elif [ "$TARGET" == "mingw" ]; then
   OUTFILE=secp256k1-jni.dll
   CC=/usr/src/mxe/usr/bin/x86_64-w64-mingw32.static-gcc

src/nativeInterop/cinterop/libsecp256k1.def

@@ -3,10 +3,8 @@ package = secp256k1
 headers = secp256k1.h secp256k1_ecdh.h secp256k1_recovery.h
 headerFilter = secp256k1/** secp256k1_ecdh.h secp256k1_recovery.h secp256k1.h
 
-staticLibraries.linux = libsecp256k1.a
 libraryPaths.linux = c/secp256k1/build/linux/
 linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib -lgmp
 
-staticLibraries.ios = libsecp256k1.a
 libraryPaths.ios = c/secp256k1/build/ios/ /usr/local/lib
 linkerOpts.ios = -framework Security -framework Foundation

tests/src/androidMain/kotlin/fr/acinq/secp256k1/Placeholder.kt

@@ -1,4 +1,4 @@
 package fr.acinq.secp256k1
 
 
-class Placeholder
+public class Placeholder