Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to kotlin 2.0.20 #112

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Upgrade to kotlin 2.0.20 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c835508
upgrade to kotlin 2.0.20
pm47 Sep 17, 2024
80ce666
fixup! upgrade to kotlin 2.0.20
pm47 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle
build/
.cxx
.kotlin

# this file is local to the dev environment and must not be pushed!
local.properties
Expand All @@ -24,23 +25,8 @@ gradle-app.setting
*.class
*.log

# sbt specific
.cache/
.history/
.lib/
dist/*
target/
lib_managed/
src_managed/
project/boot/
project/plugins/project/

# Scala-IDE specific
.scala_dependencies
.worksheet

.idea
*.iml
target/
project/target
DeleteMe*.scala

8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
object Versions {
val kotlin = "1.9.23"
val kotlin = "2.0.20"
val lightningKmp = "1.7.3-FEECREDIT-11"
val sqlDelight = "2.0.1"
val okio = "3.8.0"
val clikt = "4.2.2"
val ktor = "2.3.8"
val okio = "3.9.1"
val clikt = "4.4.0"
val ktor = "2.3.12"
fun ktor(module: String) = "io.ktor:ktor-$module:$ktor"
}
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/fr/acinq/lightning/bin/json/JsonSerializers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import kotlinx.serialization.UseSerializers
sealed class ApiType {

@Serializable
data class Channel internal constructor(
data class Channel(
val state: String,
val channelId: ByteVector32? = null,
val balanceSat: Satoshi? = null,
Expand Down