Upgrade to kotlin 2 (#117)

* Upgrade to gradle 8.7

* Use kotlin 2.1.0

* CI: use JDK 21

Author: sstone

.github/workflows/release.yml

@@ -78,10 +78,10 @@ jobs:
         if: matrix.os == 'macOS-latest'
         run: |
           echo "skip.android=true" > local.properties
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: Check JVM
         if: matrix.os != 'windows-latest'

.github/workflows/snapshot.yml

@@ -87,10 +87,10 @@ jobs:
         if: matrix.os == 'macOS-latest'
         run: |
           echo "skip.android=true" > local.properties
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: Check JVM
         if: matrix.os != 'windows-latest'

.github/workflows/test.yml

@@ -93,10 +93,10 @@ jobs:
         if: matrix.os == 'macOS-latest'
         run: |
           echo "skip.android=true" > local.properties
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: Check JVM
         if: matrix.os != 'windows-latest'

build.gradle.kts

@@ -1,10 +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`
 }
 
@@ -15,14 +17,13 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
+        classpath("com.android.tools.build:gradle:8.2.2")
     }
 }
 
 allprojects {
     group = "fr.acinq.secp256k1"
-    version = "0.16.0"
+    version = "0.17.0-SNAPSHOT"
 
     repositories {
         google()
@@ -38,16 +39,16 @@ kotlin {
     val commonMain by sourceSets.getting
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 
     fun KotlinNativeTarget.secp256k1CInterop(target: String) {
         compilations["main"].cinterops {
             val libsecp256k1 by creating {
                 includeDirs.headerFilterOnly(project.file("native/secp256k1/include/"))
-                tasks[interopProcessingTaskName].dependsOn(":native:buildSecp256k1${target.capitalize()}")
+                tasks[interopProcessingTaskName].dependsOn(":native:buildSecp256k1${target.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}")
             }
         }
     }
@@ -98,10 +99,14 @@ allprojects {
             configure(targets) {
                 compilations.all {
                     cinterops.all { tasks[interopProcessingTaskName].enabled = false }
-                    compileKotlinTask.enabled = false
+                    compileTaskProvider { enabled = false }
                     tasks[processResourcesTaskName].enabled = false
                 }
-                binaries.all { linkTask.enabled = false }
+                binaries.all {
+                    linkTaskProvider.configure {
+                        enabled = false
+                    }
+                }
 
                 mavenPublication {
                     val publicationToDisable = this
@@ -156,7 +161,7 @@ allprojects {
 
     if (project.name !in listOf("native", "tests")) {
         afterEvaluate {
-            val dokkaOutputDir = buildDir.resolve("dokka")
+            val dokkaOutputDir = layout.buildDirectory.dir("dokka").get().asFile
 
             tasks.dokkaHtml {
                 outputDirectory.set(file(dokkaOutputDir))
@@ -168,6 +173,7 @@ allprojects {
                             Platform.native -> "native"
                             Platform.common -> "common"
                             Platform.wasm -> "wasm"
+                            else -> error("invalid platform ${platform.get()}")
                         }
                         displayName.set(platformName)
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists