Skip to content

Commit 6b3d3b9

Browse files
hugomdhugomd
authored
Upgrades dependencies (#12)
1 parent dc28206 commit 6b3d3b9

File tree

6 files changed

+32
-33
lines changed

6 files changed

+32
-33
lines changed

‎bin/.gradle-8.2.1.pkg renamed to ‎bin/.gradle-8.13.pkg

File renamed without changes.

‎bin/gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.gradle-8.2.1.pkg
1+
.gradle-8.13.pkg

‎build.gradle.kts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2+
import org.gradle.kotlin.dsl.support.kotlinCompilerOptions
23
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
5+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
6+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
47

58
plugins {
69
alias(libs.plugins.kotlinGradlePlugin) apply false
@@ -60,28 +63,22 @@ subprojects {
6063
apply(plugin = "version-catalog")
6164

6265
// Only apply if the project has the kotlin plugin added:
63-
plugins.withType<KotlinPluginWrapper> {
64-
val compileKotlin by tasks.getting(KotlinCompile::class) {
65-
kotlinOptions {
66-
jvmTarget = "11"
67-
allWarningsAsErrors = true
68-
}
66+
tasks.withType<KotlinJvmCompile>().configureEach {
67+
compilerOptions {
68+
jvmTarget.set(JvmTarget.JVM_17)
69+
allWarningsAsErrors.set(true)
6970
}
70-
val compileTestKotlin by tasks.getting(KotlinCompile::class) {
71-
kotlinOptions {
72-
jvmTarget = "11"
73-
allWarningsAsErrors = true
74-
}
71+
}
72+
73+
plugins.withType<KotlinPluginWrapper> {
74+
tasks.withType<GenerateModuleMetadata> {
75+
suppressedValidationErrors.add("enforced-platform")
7576
}
7677

7778
dependencies {
7879
add("testImplementation", project.rootProject.libs.junitApi)
7980
add("testRuntimeOnly", project.rootProject.libs.junitEngine)
8081
}
81-
82-
tasks.withType<GenerateModuleMetadata> {
83-
suppressedValidationErrors.add("enforced-platform")
84-
}
8582
}
8683

8784
tasks.withType<Test> {
@@ -108,7 +105,6 @@ subprojects {
108105
}
109106
}
110107
}
111-
112108
}
113109

114110
fun isNonStable(version: String): Boolean {

‎gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
2-
arrow = "1.2.0"
2+
arrow = "2.0.1"
33
bc = "1.75"
4-
bitcoinj = "0.16.2"
5-
guava = "32.1.1-jre"
6-
junit = "5.9.3"
7-
kotest = "5.6.2"
8-
kotestArrow = "1.3.3"
4+
bitcoinj = "0.17"
5+
guava = "33.4.6-jre"
6+
junit = "5.12.1"
7+
kotest = "5.9.1"
8+
kotestArrow = "2.0.0"
99
# @pin
10-
kotlin = "1.7.22"
11-
kotlinBinaryCompatibilityPlugin = "0.13.2"
12-
mavenPublishGradlePlugin = "0.25.3"
10+
kotlin = "2.1.20"
11+
kotlinBinaryCompatibilityPlugin = "0.17.0"
12+
mavenPublishGradlePlugin = "0.27.0"
1313
okio = "3.4.0"
14-
quiver = "0.3.0"
15-
slf4j = "2.0.7"
16-
versionCatalogUpdateGradlePlugin = "0.8.1"
17-
versionsGradlePlugin = "0.47.0"
14+
quiver = "1.0.0"
15+
slf4j = "2.0.17"
16+
versionCatalogUpdateGradlePlugin = "0.8.2"
17+
versionsGradlePlugin = "0.50.0"
1818

1919
[libraries]
2020
arrowCore = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
@@ -43,7 +43,7 @@ kotest = [
4343
]
4444

4545
[plugins]
46-
dokka = "org.jetbrains.dokka:1.8.20"
46+
dokka = "org.jetbrains.dokka:2.0.0"
4747
kotlinBinaryCompatibilityPlugin = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinBinaryCompatibilityPlugin" }
4848
kotlinGradlePlugin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
4949
mavenPublishGradlePlugin = { id = "com.vanniktech.maven.publish.base", version.ref = "mavenPublishGradlePlugin" }

‎lib/api/lib.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public final class app/cash/lninvoice/Bech32Data$Companion$Encoding : java/lang/
2323
public static final field BECH32 Lapp/cash/lninvoice/Bech32Data$Companion$Encoding;
2424
public static final field BECH32M Lapp/cash/lninvoice/Bech32Data$Companion$Encoding;
2525
public final fun getConst ()I
26+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
2627
public static fun valueOf (Ljava/lang/String;)Lapp/cash/lninvoice/Bech32Data$Companion$Encoding;
2728
public static fun values ()[Lapp/cash/lninvoice/Bech32Data$Companion$Encoding;
2829
}
@@ -77,6 +78,7 @@ public final class app/cash/lninvoice/FieldTags : java/lang/Enum {
7778
public static final field PAYEE_NODE Lapp/cash/lninvoice/FieldTags;
7879
public static final field PAYMENT_HASH Lapp/cash/lninvoice/FieldTags;
7980
public static final field SECRET Lapp/cash/lninvoice/FieldTags;
81+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
8082
public final fun getTag ()I
8183
public static fun valueOf (Ljava/lang/String;)Lapp/cash/lninvoice/FieldTags;
8284
public static fun values ()[Lapp/cash/lninvoice/FieldTags;
@@ -115,6 +117,7 @@ public final class app/cash/lninvoice/Network : java/lang/Enum {
115117
public static final field Companion Lapp/cash/lninvoice/Network$Companion;
116118
public static final field MAIN Lapp/cash/lninvoice/Network;
117119
public static final field TEST Lapp/cash/lninvoice/Network;
120+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
118121
public static fun valueOf (Ljava/lang/String;)Lapp/cash/lninvoice/Network;
119122
public static fun values ()[Lapp/cash/lninvoice/Network;
120123
}

‎lib/src/main/kotlin/app/cash/lninvoice/PaymentRequest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import arrow.core.toOption
3535
import okio.ByteString
3636
import okio.ByteString.Companion.encodeUtf8
3737
import okio.ByteString.Companion.toByteString
38-
import org.bitcoinj.core.ECKey
39-
import org.bitcoinj.core.Sha256Hash
38+
import org.bitcoinj.base.Sha256Hash
39+
import org.bitcoinj.crypto.ECKey
4040
import java.math.BigInteger
4141
import java.nio.ByteBuffer
4242
import java.time.Duration

0 commit comments

Comments
 (0)