Skip to content

Commit dd6376c

Browse files
committed
Upgrade to gradle 8.7
1 parent e283031 commit dd6376c

File tree

16 files changed

+213
-156
lines changed

16 files changed

+213
-156
lines changed

build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.gradle.internal.os.OperatingSystem
22
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
33
import org.jetbrains.dokka.Platform
4+
import java.util.*
45

56
plugins {
67
kotlin("multiplatform") version "1.9.22"
@@ -15,14 +16,14 @@ buildscript {
1516
}
1617

1718
dependencies {
18-
classpath("com.android.tools.build:gradle:7.3.1")
19+
classpath("com.android.tools.build:gradle:8.2.2")
1920
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
2021
}
2122
}
2223

2324
allprojects {
2425
group = "fr.acinq.secp256k1"
25-
version = "0.16.0"
26+
version = "0.17.0-SNAPSHOT"
2627

2728
repositories {
2829
google()
@@ -47,7 +48,7 @@ kotlin {
4748
compilations["main"].cinterops {
4849
val libsecp256k1 by creating {
4950
includeDirs.headerFilterOnly(project.file("native/secp256k1/include/"))
50-
tasks[interopProcessingTaskName].dependsOn(":native:buildSecp256k1${target.capitalize()}")
51+
tasks[interopProcessingTaskName].dependsOn(":native:buildSecp256k1${target.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}")
5152
}
5253
}
5354
}
@@ -98,7 +99,7 @@ allprojects {
9899
configure(targets) {
99100
compilations.all {
100101
cinterops.all { tasks[interopProcessingTaskName].enabled = false }
101-
compileKotlinTask.enabled = false
102+
compileTaskProvider { enabled = false }
102103
tasks[processResourcesTaskName].enabled = false
103104
}
104105
binaries.all { linkTask.enabled = false }
@@ -156,7 +157,7 @@ allprojects {
156157

157158
if (project.name !in listOf("native", "tests")) {
158159
afterEvaluate {
159-
val dokkaOutputDir = buildDir.resolve("dokka")
160+
val dokkaOutputDir = layout.buildDirectory.dir("dokka").get().asFile
160161

161162
tasks.dokkaHtml {
162163
outputDirectory.set(file(dokkaOutputDir))
@@ -168,6 +169,7 @@ allprojects {
168169
Platform.native -> "native"
169170
Platform.common -> "common"
170171
Platform.wasm -> "wasm"
172+
else -> error("invalid platform ${platform.get()}")
171173
}
172174
displayName.set(platformName)
173175

gradle/wrapper/gradle-wrapper.jar

1.52 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
4-
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
54
zipStoreBase=GRADLE_USER_HOME
65
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)