Kotlin 1.4.31 (#13 )

* Kotlin 1.4.31 * Updated CI add-path disabled command to new more secure environment file. * Properly setting up Android in CI
Set version to 0.4.1
2021-03-08 16:50:25 +01:00 · 2020-09-16 10:40:37 +02:00 · 2020-09-10 20:21:58 +02:00 · 2020-09-09 11:00:04 +02:00
15 changed files with 107 additions and 36 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,6 +28,35 @@ jobs:
          path: ~/.gradle
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
          restore-keys: ${{ runner.os }}-gradle-
+      - name: Android environment
+        shell: bash
+        run: |
+          echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
+      - name: Cached Android NDK
+        uses: actions/cache@v2
+        with:
+          path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
+          key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
+      - name: Set up shell
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          rm.exe "C:/WINDOWS/system32/bash.EXE"
+      - 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"
+      - name: Setup Android
+        if: matrix.os == 'windows-latest'
+        shell: bash
+        run: |
+          $ANDROID_HOME\\tools\\bin\\sdkmanager.bat "ndk;$ANDROID_NDK_VERSION"
      - name: Set up JDK 11
        uses: actions/setup-java@v1
        with:
@@ -35,11 +64,6 @@ jobs:
      - name: Install Automake
        if: matrix.os == 'macOS-latest'
        run: brew install automake
-      - name: Set up shell
-        if: matrix.os == 'windows-latest'
-        run: |
-          echo ::add-path::C:\msys64\usr\bin\
-          rm.exe "C:/WINDOWS/system32/bash.EXE"
      - name: Check JVM
        shell: bash
        run: ./gradlew jvmTest
@@ -56,7 +80,7 @@ jobs:
        uses: reactivecircus/android-emulator-runner@v2
        with:
          api-level: 29
-          ndk: 21.3.6528147
+          ndk: ${{ env.ANDROID_NDK_VERSION }}
          cmake: 3.10.2.4988404
          script: ./gradlew connectedCheck
      - name: Publish Linux
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -36,6 +36,35 @@ jobs:
          path: ~/.gradle
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
          restore-keys: ${{ runner.os }}-gradle-
+      - name: Android environment
+        shell: bash
+        run: |
+          echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
+      - name: Cached Android NDK
+        uses: actions/cache@v2
+        with:
+          path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
+          key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
+      - name: Set up shell
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          rm.exe "C:/WINDOWS/system32/bash.EXE"
+      - 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"
+      - name: Setup Android
+        if: matrix.os == 'windows-latest'
+        shell: bash
+        run: |
+          $ANDROID_HOME\\tools\\bin\\sdkmanager.bat "ndk;$ANDROID_NDK_VERSION"
      - name: Set up JDK 11
        uses: actions/setup-java@v1
        with:
@@ -43,11 +72,6 @@ jobs:
      - name: Install Automake
        if: matrix.os == 'macOS-latest'
        run: brew install automake
-      - name: Set up shell
-        if: matrix.os == 'windows-latest'
-        run: |
-          echo ::add-path::C:\msys64\usr\bin\
-          rm.exe "C:/WINDOWS/system32/bash.EXE"
      - name: Check JVM
        shell: bash
        run: ./gradlew jvmTest
@@ -64,7 +88,7 @@ jobs:
        uses: reactivecircus/android-emulator-runner@v2
        with:
          api-level: 29
-          ndk: 21.3.6528147
+          ndk: ${{ env.ANDROID_NDK_VERSION }}
          cmake: 3.10.2.4988404
          script: ./gradlew connectedCheck
      - name: Publish Linux
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,6 +42,35 @@ jobs:
          path: ~/.gradle
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
          restore-keys: ${{ runner.os }}-gradle-
+      - name: Android environment
+        shell: bash
+        run: |
+          echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
+      - name: Cached Android NDK
+        uses: actions/cache@v2
+        with:
+          path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
+          key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
+      - name: Set up shell
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          rm.exe "C:/WINDOWS/system32/bash.EXE"
+      - 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"
+      - name: Setup Android
+        if: matrix.os == 'windows-latest'
+        shell: bash
+        run: |
+          $ANDROID_HOME\\tools\\bin\\sdkmanager.bat "ndk;$ANDROID_NDK_VERSION"
      - name: Set up JDK 11
        uses: actions/setup-java@v1
        with:
@@ -49,11 +78,6 @@ jobs:
      - name: Install Automake
        if: matrix.os == 'macOS-latest'
        run: brew install automake
-      - name: Set up shell
-        if: matrix.os == 'windows-latest'
-        run: |
-          echo ::add-path::C:\msys64\usr\bin\
-          rm.exe "C:/WINDOWS/system32/bash.EXE"
      - name: Check JVM
        shell: bash
        run: ./gradlew jvmTest
@@ -70,6 +94,6 @@ jobs:
        uses: reactivecircus/android-emulator-runner@v2
        with:
          api-level: 29
-          ndk: 21.3.6528147
+          ndk: ${{ env.ANDROID_NDK_VERSION }}
          cmake: 3.10.2.4988404
          script: ./gradlew connectedCheck
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,24 +8,24 @@ import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

 plugins {
-    kotlin("multiplatform") version "1.4.0"
+    kotlin("multiplatform") version "1.4.31"
    `maven-publish`
 }

 buildscript {
    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }

    dependencies {
-        classpath("com.android.tools.build:gradle:4.0.1")
+        classpath("com.android.tools.build:gradle:4.0.2")
    }
 }

 allprojects {
    group = "fr.acinq.secp256k1"
-    version = "0.3.0"
+    version = "0.5.0"

    repositories {
        jcenter()
@@ -66,7 +66,6 @@ kotlin {

    ios {
        secp256k1CInterop("ios")
-        // https://youtrack.jetbrains.com/issue/KT-39396
        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")
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/jni/android/build.gradle.kts
+++ b/jni/android/build.gradle.kts
@@ -51,7 +51,7 @@ afterEvaluate {
    publishing {
        publications {
            create<MavenPublication>("android") {
-                artifactId = "secp256k1-jni-android"
+                artifactId = "secp256k1-kmp-jni-android"
                from(components["release"])
            }
        }
--- a/jni/build.gradle.kts
+++ b/jni/build.gradle.kts
@@ -34,7 +34,7 @@ val generateHeaders by tasks.creating(JavaCompile::class) {
 publishing {
    publications {
        create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-common"
+            artifactId = "secp256k1-kmp-jni-common"
            from(components["java"])
        }
    }
--- a/jni/jvm/all/build.gradle.kts
+++ b/jni/jvm/all/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 publishing {
    publications {
        create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-jvm"
+            artifactId = "secp256k1-kmp-jni-jvm"
            from(components["java"])
        }
    }
--- a/jni/jvm/build.gradle.kts
+++ b/jni/jvm/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 publishing {
    publications {
        create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-jvm-extract"
+            artifactId = "secp256k1-kmp-jni-jvm-extract"
            from(components["java"])
        }
    }
--- a/jni/jvm/darwin/build.gradle.kts
+++ b/jni/jvm/darwin/build.gradle.kts
@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
 publishing {
    publications {
        val pub = create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-jvm-darwin"
+            artifactId = "secp256k1-kmp-jni-jvm-darwin"
            from(components["java"])
        }
        if (!org.gradle.internal.os.OperatingSystem.current().isMacOsX) {
--- a/jni/jvm/linux/build.gradle.kts
+++ b/jni/jvm/linux/build.gradle.kts
@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
 publishing {
    publications {
        val pub = create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-jvm-linux"
+            artifactId = "secp256k1-kmp-jni-jvm-linux"
            from(components["java"])
        }
        if (!org.gradle.internal.os.OperatingSystem.current().isLinux) {
--- a/jni/jvm/mingw/build.gradle.kts
+++ b/jni/jvm/mingw/build.gradle.kts
@@ -23,7 +23,7 @@ val copyJni by tasks.creating(Sync::class) {
 publishing {
    publications {
        val pub = create<MavenPublication>("jvm") {
-            artifactId = "secp256k1-jni-jvm-mingw"
+            artifactId = "secp256k1-kmp-jni-jvm-mingw"
            from(components["java"])
        }
        if (!org.gradle.internal.os.OperatingSystem.current().isWindows) {
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
        jcenter()
    }
 }
-rootProject.name = "secp256k1"
+rootProject.name = "secp256k1-kmp"

 include(
    ":native",
@@ -17,4 +17,4 @@ include(
    ":jni:jvm:mingw",
    ":jni:jvm:all",
    ":tests"
-)
+)
--- a/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt
+++ b/src/nativeMain/kotlin/fr/acinq/secp256k1/Secp256k1Native.kt
@@ -79,7 +79,7 @@ public object Secp256k1Native : Secp256k1 {
    }

    public override fun signatureNormalize(sig: ByteArray): Pair<ByteArray, Boolean> {
-        require(sig.size == 64 || sig.size in 70..73)
+        require(sig.size >= 64){ "invalid signature ${Hex.encode(sig)}" }
        memScoped {
            val nSig = allocSignature(sig)
            val isHighS = secp256k1_ecdsa_signature_normalize(ctx, nSig.ptr, nSig.ptr)
--- a/tests/build.gradle.kts
+++ b/tests/build.gradle.kts
@@ -38,8 +38,8 @@ kotlin {
        }
        sourceSets["androidTest"].dependencies {
            implementation(kotlin("test-junit"))
-            implementation("androidx.test.ext:junit:1.1.1")
-            implementation("androidx.test.espresso:espresso-core:3.2.0")
+            implementation("androidx.test.ext:junit:1.1.2")
+            implementation("androidx.test.espresso:espresso-core:3.3.0")
        }
    }
Author	SHA1	Message	Date
Salomon BRYS	7d22d835a5	Kotlin 1.4.31 (#13 ) * Kotlin 1.4.31 * Updated CI add-path disabled command to new more secure environment file. * Properly setting up Android in CI	2021-03-08 16:50:25 +01:00
sstone	bb25eb21b7	Set version to 0.4.1	2020-09-16 10:40:37 +02:00
sstone	6a67dbe9f6	signatureNormalize: relax check on signature size Checking that the sig size is >= 64 is enough, this is just a quick check before the actual library method is called.	2020-09-10 20:21:58 +02:00
Salomon BRYS	7272a55b8a	Changed deployment artifact-id to `secp256k1-kmp` (#12 ) Co-authored-by: Salomon BRYS <salomon@kodein.net>	2020-09-09 11:00:04 +02:00