Skip to content

Commit 838bbd0

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 91fa699 + fc52ecb commit 838bbd0

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

app/src/androidMain/kotlin/com/daniebeler/pfpixelix/utils/KmpPlatform.android.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import android.net.Uri
66
import android.webkit.MimeTypeMap
77
import androidx.core.net.toUri
88
import coil3.PlatformContext
9+
import io.github.kdroidfilter.composemediaplayer.util.getUri
910
import io.github.vinceglb.filekit.PlatformFile
10-
import io.github.vinceglb.filekit.dialogs.uri
1111

1212
actual typealias KmpUri = Uri
1313
actual val EmptyKmpUri: KmpUri = Uri.EMPTY
1414
actual fun KmpUri.getPlatformUriObject(): Any = this
1515
actual fun String.toKmpUri(): KmpUri = this.toUri()
16-
actual fun PlatformFile.toKmpUri(): KmpUri = this.uri
16+
actual fun PlatformFile.toKmpUri(): KmpUri = this.getUri().toUri()
1717
actual fun KmpUri.toPlatformFile(): PlatformFile = PlatformFile(this)
1818

1919
actual typealias KmpContext = Context

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
[versions]
2-
kotlin = "2.3.0"
2+
kotlin = "2.3.10"
33
ksp = "2.3.2"
44
agp = "9.0.0"
55

66
#https://github.com/JetBrains/compose-multiplatform/releases
7-
composeMultiplatform = "1.9.3"
7+
composeMultiplatform = "1.10.0"
88
lifecycleMultiplatform = "2.9.6"
99
navigationMultiplatform = "2.9.1"
1010

1111
#JetBrains
1212
kotlinx-coroutines = "1.10.2"
1313
kotlinxCollectionsImmutable = "0.4.0"
14-
kotlinxSerializationJson = "1.9.0"
15-
ktor = "3.3.3"
14+
kotlinxSerializationJson = "1.10.0"
15+
ktor = "3.4.0"
1616
kotlinx-datetime = "0.7.1"
1717

1818
#multiplatform
1919
ksoup = "0.2.5"
2020
kermit = "2.0.8"
21-
ktorfit = "2.7.1"
21+
ktorfit = "2.7.2"
2222
kotlinInject = "0.9.0"
2323
androidx-annotation = "1.9.1"
2424
coil = "3.3.0"
2525
datastorePreferences = "1.2.0"
2626
multiplatformSettings = "1.3.0"
27-
filekitCompose = "0.10.0"
27+
filekitCompose = "0.12.0"
2828
krop = "0.2.0"
29-
composemediaplayer = "0.8.6"
29+
composemediaplayer = "0.8.7"
3030

3131
#android
3232
accompanistSystemuicontroller = "0.36.0"
33-
activityCompose = "1.12.2"
33+
activityCompose = "1.12.3"
3434
browser = "1.9.0"
3535
coreKtx = "1.17.0"
3636
glance = "1.1.1"
3737
material = "1.13.0"
3838
okio = "3.16.4"
39-
workRuntimeKtx = "2.11.0"
39+
workRuntimeKtx = "2.11.1"
4040

4141
#desktop
4242
slf4jSimple = "2.0.17"

0 commit comments

Comments
 (0)