Use kotlin 2.1.0

Author: sstone

build.gradle.kts

@@ -1,11 +1,12 @@
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.dokka.Platform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.*
 
 plugins {
-    kotlin("multiplatform") version "1.9.22"
-    id("org.jetbrains.dokka") version "1.9.10"
+    kotlin("multiplatform") version "2.1.10"
+    id("org.jetbrains.dokka") version "1.9.20"
     `maven-publish`
 }
 
@@ -17,7 +18,6 @@ buildscript {
 
     dependencies {
         classpath("com.android.tools.build:gradle:8.2.2")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
     }
 }
 
@@ -39,8 +39,8 @@ kotlin {
     val commonMain by sourceSets.getting
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_18)
         }
     }
 
@@ -102,7 +102,11 @@ allprojects {
                     compileTaskProvider { enabled = false }
                     tasks[processResourcesTaskName].enabled = false
                 }
-                binaries.all { linkTask.enabled = false }
+                binaries.all {
+                    linkTaskProvider.configure {
+                        enabled = false
+                    }
+                }
 
                 mavenPublication {
                     val publicationToDisable = this

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -42,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -741,7 +741,7 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
     CHECKRESULT((*penv)->GetArrayLength(penv, jauxrand32) != 32, "auxiliary random data must be 32 bytes");
   }
   seckey = (*penv)->GetByteArrayElements(penv, jseckey, 0);
-  result = secp256k1_keypair_create(ctx, &keypair, seckey);
+  result = secp256k1_keypair_create(ctx, &keypair, (const unsigned char*)seckey);
   (*penv)->ReleaseByteArrayElements(penv, jseckey, seckey, 0);
   CHECKRESULT(!result, "secp256k1_keypair_create failed");
 
@@ -751,7 +751,7 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
     auxrand32 = (*penv)->GetByteArrayElements(penv, jauxrand32, 0);
   }
 
-  result = secp256k1_schnorrsig_sign32(ctx, signature, (unsigned char *)msg, &keypair, auxrand32);
+  result = secp256k1_schnorrsig_sign32(ctx, signature, (unsigned char *)msg, &keypair, (const unsigned char*)auxrand32);
   (*penv)->ReleaseByteArrayElements(penv, jmsg, msg, 0);
   if (auxrand32 != 0)
   {
@@ -930,13 +930,13 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
     return NULL;
 
   seckey = (*penv)->GetByteArrayElements(penv, jseckey, 0);
-  result = secp256k1_keypair_create(ctx, &keypair, seckey);
+  result = secp256k1_keypair_create(ctx, &keypair, (const unsigned char*)seckey);
   (*penv)->ReleaseByteArrayElements(penv, jseckey, seckey, 0);
   CHECKRESULT(!result, "secp256k1_keypair_create failed");
 
   size = (*penv)->GetArrayLength(penv, jseckey);
   CHECKRESULT(size != 32, "invalid private key size");
-  copy_bytes_from_java(penv, jseckey, size, seckey);
+  copy_bytes_from_java(penv, jseckey, size, (unsigned char*)seckey);
 
   if (jmsg32 != NULL)
   {
@@ -1125,14 +1125,14 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
   CHECKRESULT((*penv)->GetArrayLength(penv, jtweak32) != 32, "tweak must be 32 bytes");
   tweak32 = (*penv)->GetByteArrayElements(penv, jtweak32, 0);
 
-  result = secp256k1_musig_pubkey_ec_tweak_add(ctx, &pubkey, &keyaggcache, tweak32);
+  result = secp256k1_musig_pubkey_ec_tweak_add(ctx, &pubkey, &keyaggcache, (const unsigned char*)tweak32);
   (*penv)->ReleaseByteArrayElements(penv, jtweak32, tweak32, 0);
   CHECKRESULT(!result, "secp256k1_musig_pubkey_ec_tweak_add failed");
 
   jpubkey = (*penv)->NewByteArray(penv, 65);
   pub = (*penv)->GetByteArrayElements(penv, jpubkey, 0);
   size = 65;
-  result = secp256k1_ec_pubkey_serialize(ctx, pub, &size, &pubkey, SECP256K1_EC_UNCOMPRESSED);
+  result = secp256k1_ec_pubkey_serialize(ctx, (unsigned char*)pub, &size, &pubkey, SECP256K1_EC_UNCOMPRESSED);
   (*penv)->ReleaseByteArrayElements(penv, jpubkey, pub, 0);
   CHECKRESULT(!result, "secp256k1_ec_pubkey_serialize failed");
 
@@ -1170,14 +1170,14 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
   CHECKRESULT((*penv)->GetArrayLength(penv, jtweak32) != 32, "tweak must be 32 bytes");
   tweak32 = (*penv)->GetByteArrayElements(penv, jtweak32, 0);
 
-  result = secp256k1_musig_pubkey_xonly_tweak_add(ctx, &pubkey, &keyaggcache, tweak32);
+  result = secp256k1_musig_pubkey_xonly_tweak_add(ctx, &pubkey, &keyaggcache, (const unsigned char*)tweak32);
   (*penv)->ReleaseByteArrayElements(penv, jtweak32, tweak32, 0);
   CHECKRESULT(!result, "secp256k1_musig_pubkey_xonly_tweak_add failed");
 
   jpubkey = (*penv)->NewByteArray(penv, 65);
   pub = (*penv)->GetByteArrayElements(penv, jpubkey, 0);
   size = 65;
-  result = secp256k1_ec_pubkey_serialize(ctx, pub, &size, &pubkey, SECP256K1_EC_UNCOMPRESSED);
+  result = secp256k1_ec_pubkey_serialize(ctx, (unsigned char*)pub, &size, &pubkey, SECP256K1_EC_UNCOMPRESSED);
   (*penv)->ReleaseByteArrayElements(penv, jpubkey, pub, 0);
   CHECKRESULT(!result, "secp256k1_ec_pubkey_serialize failed");
 
@@ -1218,7 +1218,7 @@ JNIEXPORT jbyteArray JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256
   CHECKRESULT((*penv)->GetArrayLength(penv, jkeyaggcache) != fr_acinq_secp256k1_Secp256k1CFunctions_SECP256K1_MUSIG_KEYAGG_CACHE_SIZE, "invalid keyagg cache size");
 
   ptr = (*penv)->GetByteArrayElements(penv, jaggnonce, 0);
-  result = secp256k1_musig_aggnonce_parse(ctx, &aggnonce, ptr);
+  result = secp256k1_musig_aggnonce_parse(ctx, &aggnonce, (const unsigned char*)ptr);
   (*penv)->ReleaseByteArrayElements(penv, jaggnonce, ptr, 0);
   CHECKRESULT(!result, "secp256k1_musig_aggnonce_parse failed");
 
@@ -1321,17 +1321,17 @@ JNIEXPORT jint JNICALL Java_fr_acinq_secp256k1_Secp256k1CFunctions_secp256k1_1mu
   CHECKRESULT((*penv)->GetArrayLength(penv, jsession) != fr_acinq_secp256k1_Secp256k1CFunctions_SECP256K1_MUSIG_SESSION_SIZE, "invalid session size");
 
   ptr = (*penv)->GetByteArrayElements(penv, jpsig, 0);
-  result = secp256k1_musig_partial_sig_parse(ctx, &psig, ptr);
+  result = secp256k1_musig_partial_sig_parse(ctx, &psig, (const unsigned char*)ptr);
   (*penv)->ReleaseByteArrayElements(penv, jpsig, ptr, 0);
   CHECKRESULT(!result, "secp256k1_musig_partial_sig_parse failed");
 
   ptr = (*penv)->GetByteArrayElements(penv, jpubnonce, 0);
-  result = secp256k1_musig_pubnonce_parse(ctx, &pubnonce, ptr);
+  result = secp256k1_musig_pubnonce_parse(ctx, &pubnonce, (const unsigned char*)ptr);
   (*penv)->ReleaseByteArrayElements(penv, jpubnonce, ptr, 0);
   CHECKRESULT(!result, "secp256k1_musig_pubnonce_parse failed");
 
   ptr = (*penv)->GetByteArrayElements(penv, jpubkey, 0);
-  result = secp256k1_ec_pubkey_parse(ctx, &pubkey, ptr, (*penv)->GetArrayLength(penv, jpubkey));
+  result = secp256k1_ec_pubkey_parse(ctx, &pubkey, (const unsigned char*)ptr, (*penv)->GetArrayLength(penv, jpubkey));
   (*penv)->ReleaseByteArrayElements(penv, jpubkey, ptr, 0);
   CHECKRESULT(!result, "secp256k1_musig_pubkey_parse failed");
 

jni/c/src/fr_acinq_secp256k1_Secp256k1CFunctions.c

@@ -26,7 +26,7 @@ internal object OSInfo {
 
    @JvmStatic val hardwareName: String get() =
        try {
-           val p = Runtime.getRuntime().exec("uname -m")
+           val p = Runtime.getRuntime().exec(arrayOf("uname", "-m"))
            p.waitFor()
            val input = p.inputStream
            input.use {
@@ -83,7 +83,7 @@ internal object OSInfo {
                    val javaHome = System.getProperty("java.home")
                    try {
                        // determine if first JVM found uses ARM hard-float ABI
-                       var exitCode = Runtime.getRuntime().exec("which readelf").waitFor()
+                       var exitCode = Runtime.getRuntime().exec(arrayOf("which", "readelf")).waitFor()
                        if (exitCode == 0) {
                            val cmdarray = arrayOf(
                                "/bin/sh", "-c", "find '" + javaHome +
@@ -119,7 +119,7 @@ internal object OSInfo {
            val javaHome = System.getProperty("java.home")
            try {
                // determine if first JVM found uses ARM hard-float ABI
-               var exitCode = Runtime.getRuntime().exec("which readelf").waitFor()
+               var exitCode = Runtime.getRuntime().exec(arrayOf("which", "readelf")).waitFor()
                if (exitCode == 0) {
                    val cmdarray = arrayOf(
                        "/bin/sh", "-c", "find '" + javaHome +

jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/OSInfo.kt

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeHostTest
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
@@ -29,8 +30,8 @@ kotlin {
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_18)
         }
         compilations["main"].dependencies {
             implementation(project(":jni:jvm:all"))
@@ -42,8 +43,8 @@ kotlin {
 
     if (includeAndroid) {
         androidTarget {
-            compilations.all {
-                kotlinOptions.jvmTarget = "1.8"
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_1_8)
             }
             sourceSets["androidMain"].dependencies {
                 implementation(project(":jni:android"))