Skip to content

Commit d367d50

Browse files
authored
Merge pull request #205 from mikepenz/develop
dev -> main
2 parents a43cce2 + 290bda0 commit d367d50

File tree

17 files changed

+324
-518
lines changed

17 files changed

+324
-518
lines changed

app-wasm/src/commonMain/composeResources/files/aboutlibraries.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maven stuff
22
GROUP=com.mikepenz
3-
VERSION_NAME=0.25.0
4-
VERSION_CODE=2500
3+
VERSION_NAME=0.26.0-rc02
4+
VERSION_CODE=2600
55

66
POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
77

gradle/libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
2-
agp = "8.5.1"
2+
agp = "8.5.2"
33
compileSdk = "34"
44
minSdk = "21"
55
targetSdk = "34"
6-
androidx-activityCompose = "1.9.0"
6+
androidx-activityCompose = "1.9.1"
77
androidx-material = "1.12.0"
88
compose = "1.6.8"
99
compose-plugin = "1.6.11"
10-
kotlin = "2.0.0"
10+
kotlin = "2.0.20"
1111
coroutines = "1.8.1"
1212
dokka = "1.9.20"
13-
coil = "3.0.0-alpha08"
14-
coil2 = "2.6.0"
15-
aboutlib = "11.2.2"
13+
coil = "3.0.0-alpha10"
14+
coil2 = "2.7.0"
15+
aboutlib = "11.2.3"
1616
markdown = "0.7.3"
1717
detekt = "1.23.6"
18-
gradleMvnPublish = "0.28.0"
19-
screenshot = "0.0.1-alpha02"
20-
ktor = "3.0.0-wasm2"
18+
gradleMvnPublish = "0.29.0"
19+
screenshot = "0.0.1-alpha05"
20+
ktor = "3.0.0-beta-2"
2121

2222
[libraries]
2323
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
@@ -32,7 +32,7 @@ aboutlibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", ve
3232
coil-core = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
3333
coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
3434
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
35-
coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
35+
coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
3636
coil2-core = { module = "io.coil-kt:coil-compose", version.ref = "coil2" }
3737
coil2-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil2" }
3838
markdown = { module = "org.jetbrains:markdown", version.ref = "markdown" }

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)