Merge pull request #180 from mikepenz/develop

dev -> main

Author: mikepenz

app-desktop/build.gradle.kts

@@ -18,11 +18,15 @@ repositories {
 dependencies {
     implementation(projects.multiplatformMarkdownRenderer)
     implementation(projects.multiplatformMarkdownRendererM2)
-    implementation(projects.multiplatformMarkdownRendererCoil2)
+    implementation(projects.multiplatformMarkdownRendererCoil3)
 
     implementation(compose.desktop.currentOs)
     implementation(compose.foundation)
     implementation(compose.material)
+
+    // required for coil
+    implementation(libs.coil.network.ktor)
+    implementation(libs.kotlinx.coroutines.swing)
 }
 
 application {

app-desktop/src/main/kotlin/main.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import com.mikepenz.markdown.coil2.Coil2ImageTransformerImpl
+import com.mikepenz.markdown.coil3.Coil3ImageTransformerImpl
 import com.mikepenz.markdown.compose.extendedspans.ExtendedSpans
 import com.mikepenz.markdown.compose.extendedspans.RoundedCornerSpanPainter
 import com.mikepenz.markdown.compose.extendedspans.SquigglyUnderlineSpanPainter
@@ -32,7 +32,7 @@ fun main() = application {
 
                 Markdown(
                     MARKDOWN,
-                    imageTransformer = Coil2ImageTransformerImpl,
+                    imageTransformer = Coil3ImageTransformerImpl,
                     extendedSpans = markdownExtendedSpans {
                         val animator = rememberSquigglyUnderlineAnimator()
                         remember {

app-wasm/build.gradle.kts

@@ -39,6 +39,10 @@ kotlin {
                 implementation(projects.multiplatformMarkdownRenderer)
                 implementation(projects.multiplatformMarkdownRendererM3)
                 implementation(projects.multiplatformMarkdownRendererCoil3)
+
+                // required for coil
+                implementation(libs.coil.network.ktor)
+                implementation(libs.ktor.client.core)
             }
         }
     }

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

@@ -1,7 +1,7 @@
 # Maven stuff
 GROUP=com.mikepenz
-VERSION_NAME=0.23.0
-VERSION_CODE=2300
+VERSION_NAME=0.24.0
+VERSION_CODE=2400
 
 POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
 

gradle.properties

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.5.1"
 compileSdk = "34"
 minSdk = "21"
 targetSdk = "34"
@@ -8,14 +8,16 @@ androidx-material = "1.12.0"
 compose = "1.6.8"
 compose-plugin = "1.6.11"
 kotlin = "2.0.0"
+coroutines = "1.8.1"
 dokka = "1.9.20"
-coil = "3.0.0-alpha07"
+coil = "3.0.0-alpha08"
 coil2 = "2.6.0"
-aboutlib = "11.2.1"
+aboutlib = "11.2.2"
 markdown = "0.7.3"
 detekt = "1.23.6"
 gradleMvnPublish = "0.28.0"
-screenshot = "0.0.1-alpha01"
+screenshot = "0.0.1-alpha02"
+ktor = "3.0.0-wasm2"
 
 [libraries]
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
@@ -29,10 +31,13 @@ aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref
 aboutlibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib" }
 coil-core = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
-coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
+coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil" }
 coil2-core = { module = "io.coil-kt:coil-compose", version.ref = "coil2" }
 coil2-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil2" }
 markdown = { module = "org.jetbrains:markdown", version.ref = "markdown" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
@@ -44,9 +49,9 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlib" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "gradleMvnPublish" }
-screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}
+screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot" }
 
 [bundles]
-coil = ["coil-core", "coil-network"]
+coil = ["coil-core", "coil-network-okhttp"]
 coil2 = ["coil-core"]
 aboutlibs = ["aboutlibraries-core", "aboutlibraries-compose"]

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.jar

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradle/wrapper/gradle-wrapper.properties

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################