Skip to content

Commit bd4a78f

Browse files
committed
update dependencies and cleanup
1 parent 0414a73 commit bd4a78f

File tree

4 files changed

+18
-36
lines changed

4 files changed

+18
-36
lines changed

build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ kotlin {
9494
// api("dev.atsushieno:libremidi-javacpp-platform:_")
9595

9696
implementation("io.github.pdvrieze.xmlutil:serialization:_")
97-
// implementation("com.ryanharter.kotlinx.serialization:kotlinx-serialization-xml:_")
9897
implementation("io.github.xn32:json5k:_")
9998
implementation( "com.akuleshov7:ktoml-core:_")
10099

@@ -181,10 +180,10 @@ compose.desktop {
181180
application {
182181
buildTypes.release {
183182
proguard {
183+
// version = "7.7.0"
184184
// isEnabled = false
185-
version = "7.7.0"
186-
// optimize = false
187-
// obfuscate = false
185+
// optimize = false
186+
// obfuscate = false
188187

189188
configurationFiles.from(
190189
project.file("compose-desktop.pro")

compose-desktop.pro

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
-keep @kotlin.coroutines.jvm.internal.DebugMetadata class * { *; }
33
-keep @dev.reformator.stacktracedecoroutinator.provider.DecoroutinatorTransformed class * { *; }
44

5-
6-
75
# from: https://github.com/java-native-access/jna/issues/1187#issuecomment-626251894
86
-keep class com.sun.jna.** { *; }
97
-keep class * implements com.sun.jna.** { *; }
108

11-
12-
139
# from: https://github.com/JetBrains/compose-multiplatform/issues/4883#issuecomment-2156012785
1410
-keep class androidx.compose.runtime.** { *; }
1511
-keep class androidx.collection.** { *; }
@@ -20,9 +16,7 @@
2016
-dontwarn androidx.compose.material.**
2117

2218
# Kotlinx coroutines rules seems to be outdated with the latest version of Kotlin and Proguard
23-
-keep class kotlinx.coroutines.** { *; }
24-
25-
19+
### -keep class kotlinx.coroutines.** { *; }
2620

2721
# from: https://github.com/Kotlin/kotlinx.serialization/issues/2719#issuecomment-2189193638
2822
-keepclassmembers public class **$$serializer {
@@ -32,16 +26,9 @@
3226
# attempting to fix json5k
3327
-keep class io.github.xn32.json5k.** { *; }
3428

35-
# -keepattributes *Annotation*
36-
37-
# -keepclassmembers public class **$$serializer$annotationImpl$** {
38-
# private ** value;
39-
# private ** namespace;
40-
# private ** prefix;
41-
# }
42-
#
43-
#
44-
# -keep @nl.adaptivity.xmlutil.serialization.XmlSerialName public class *
29+
# Ktor
30+
-keep class io.ktor.client.engine.java.** { *; }
31+
-keep class io.ktor.serialization.kotlinx.json.** { *; }
4532

4633
## remove some stupid warnings for things we do not use
4734
-dontwarn jakarta.**

settings.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,5 @@ dependencyResolutionManagement {
3737
plugins {
3838
// See https://jmfayard.github.io/refreshVersions
3939
id("de.fayard.refreshVersions") version "0.60.5"
40-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
41-
//// # available:"0.6.0"
42-
//// # available:"0.7.0"
43-
//// # available:"0.8.0"
44-
//// # available:"0.9.0"
45-
//// # available:"0.10.0"
40+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
4641
}

versions.properties

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#### suppress inspection "SpellCheckingInspection" for whole file
88
#### suppress inspection "UnusedProperty" for whole file
99

10-
plugin.org.jetbrains.compose=1.8.0-beta02
10+
plugin.org.jetbrains.compose=1.8.0
1111

12-
plugin.dev.reformator.stacktracedecoroutinator=2.4.8
12+
plugin.dev.reformator.stacktracedecoroutinator=2.5.1
1313

1414
version.ch.qos.logback..logback-classic=1.5.18
1515

16-
version.com.akuleshov7..ktoml-core=0.6.0
16+
version.com.akuleshov7..ktoml-core=0.7.0
1717

1818
version.com.github.doyaaaaaken..kotlin-csv-jvm=1.10.0
1919

@@ -29,17 +29,18 @@ version.io.github.kdroidfilter..platformtools.permissionhandler=0.2.9
2929

3030
version.io.github.kdroidfilter..platformtools.releasefetcher=0.2.9
3131

32-
version.io.obs-websocket.community..client=2.0.0
33-
3432
version.io.projectreactor.tools..blockhound=1.0.11.RELEASE
3533

36-
version.kotlin=2.1.20
34+
version.kotlin=2.1.21
35+
## # available=2.2.0-Beta1
36+
## # available=2.2.0-Beta2
37+
## # available=2.2.0-RC
3738

3839
version.com.illposed.osc..javaosc-core=0.9
3940

40-
version.io.github.oshai..kotlin-logging=7.0.6
41+
version.io.github.oshai..kotlin-logging=7.0.7
4142

42-
version.io.github.pdvrieze.xmlutil..serialization=0.91.0
43+
version.io.github.pdvrieze.xmlutil..serialization=0.91.1
4344

4445
version.io.github.xn32..json5k=0.3.0
4546

@@ -49,4 +50,4 @@ version.kotlinx.datetime=0.6.2
4950

5051
version.kotlinx.serialization=1.8.1
5152

52-
version.ktor=3.1.2
53+
version.ktor=3.1.3

0 commit comments

Comments
 (0)