dev -> main

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
-      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+      - uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: 'zulu'
           java-version: |
@@ -36,7 +36,7 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
 
       - name: Cache konan
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -74,21 +74,21 @@ jobs:
         with:
           fetch-depth: 100
 
-      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+      - uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: 'zulu'
           java-version: |
             17
             21
 
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/wrapper-validation@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
 
       - name: Build Debug
         run: |
@@ -101,7 +101,7 @@ jobs:
 
       - name: Publish Test Report
         if: false && (failure() || success()) && github.event_name == 'pull_request'
-        uses: mikepenz/action-junit-report@d9f48fc87bc235f7e214acf696ca5abc0a986f16 # v6.4.2
+        uses: mikepenz/action-junit-report@b7b80d7ac5b1da46d6aaff9fb57ad50d8453bcb3 # v6.6.0
         with:
           report_paths: '**/sample/android/build/test-results/testDebugUnitTest/TEST-*.xml'
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -134,8 +134,8 @@ jobs:
           done
 
       - name: Upload Lint SARIF
-        if: always() && github.event_name == 'pull_request'
-        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        if: always() && github.event_name == 'pull_request' && hashFiles('sarif-reports/*.sarif') != ''
+        uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           sarif_file: 'sarif-reports'
           category: android-lint
@@ -188,7 +188,7 @@ jobs:
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@c9bcd8238b6f41e05561348339429d360b1c0247 # v6.2.3
+        uses: mikepenz/release-changelog-builder-action@aa013739bbc8e7067dbbecd4525ff11aeb51a84b # v6.4.0
         with:
           configuration: ".github/config/configuration.json"
           ignorePreReleases: ${{ !contains(github.ref, '-') }}

.github/workflows/gradle-dependency-submission.yml

@@ -15,7 +15,7 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
-      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+      - uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: 'zulu'
           java-version: |
@@ -26,6 +26,6 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Setup Gradle & Submit dependency graphs
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
         with:
           dependency-graph: generate-and-submit

.github/workflows/scorecard.yml

@@ -31,6 +31,6 @@ jobs:
           publish_results: true
 
       - name: "Upload to code scanning"
-        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           sarif_file: results.sarif

.github/workflows/static.yml

@@ -33,14 +33,14 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - name: Setup Pages
         uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
-      - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+      - uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: 'zulu'
           java-version: |
             17
             21
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
       - name: Build Page
         run: |
           ./gradlew sample:web:wasmJsBrowserDistribution --no-configuration-cache
@@ -52,4 +52,4 @@ jobs:
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1

MIGRATION.md

@@ -1,5 +1,20 @@
 ### Upgrade Notes
 
+#### Unreleased
+
+- **New Feature**: GFM `==highlight==` spans render with theme-aware foreground and background
+  colors, including nested inline formatting. Configure `highlightText` and `highlightBackground`
+  through `markdownColor(...)` (M2 + M3), or override `highlightSpanStyle` in `annotatorSettings(...)`.
+- **Bug Fix**: Preserve literal equals signs parsed as `GFMTokenTypes.EQUALS` by JetBrains Markdown
+  0.7.15 and later.
+- **Breaking Change**: Custom `MarkdownColors` implementations must provide `highlightText` and
+  `highlightBackground`. Custom `AnnotatorSettings` implementations must provide `highlightSpanStyle`.
+  Direct callers of `DefaultMarkdownColors` and `DefaultAnnotatorSettings` must supply these values.
+- **Signature Changes**: The M2/M3 `markdownColor(...)` and `annotatorSettings(...)` functions gain
+  trailing highlight parameters. Recompile consumers against the updated API.
+- The deprecated `buildMarkdownAnnotatedString` overload keeps the base text style for highlights;
+  use the overload accepting `AnnotatorSettings` to configure a highlight background.
+
 #### Version 0.45.0
 
 - **Dependency Upgrade**: Coil 3.5.0 → 3.6.0
@@ -222,4 +237,4 @@ annotator = markdownAnnotator(
 
 Unfortunately no upgrade notes were provided for the releases prior to 0.32.0.
 See the release notes available on GitHub for more
-details: https://github.com/mikepenz/multiplatform-markdown-renderer/releases
+details: https://github.com/mikepenz/multiplatform-markdown-renderer/releases

gradle.properties

@@ -1,7 +1,7 @@
 # Maven stuff
 GROUP=com.mikepenz
-VERSION_NAME=0.45.0
-VERSION_CODE=4500
+VERSION_NAME=0.46.0
+VERSION_CODE=4600
 #
 POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
 POM_SCM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
@@ -25,7 +25,6 @@ org.gradle.caching=true
 android.useAndroidX=true
 #
 kotlin.mpp.stability.nowarn=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.enableKlibsCrossCompilation=true
 kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
@@ -43,4 +42,4 @@ com.mikepenz.version-catalog-update.enabled=true
 com.mikepenz.compatPatrouille.enabled=false
 com.mikepenz.kotlin.version=2.2
 com.mikepenz.kotlin.warningsAsErrors.enabled=false
-com.mikepenz.java.version=21
+com.mikepenz.java.version=21

gradle/libs.versions.toml

@@ -1,16 +1,15 @@
 [versions]
 androidx-activityCompose = "1.13.0"
-coil = "3.6.0"
+coil = "3.6.3"
 coil2 = "2.7.0"
-markdown = "0.7.9"
-ktor = "3.5.2"
+markdown = "0.7.17"
+ktor = "3.6.0"
 highlights = "1.1.0"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 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-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
 coil2-core = { module = "io.coil-kt:coil-compose", version.ref = "coil2" }
 markdown = { module = "org.jetbrains:markdown", version.ref = "markdown" }
@@ -19,9 +18,3 @@ ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "kto
 ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 highlights = { module = "dev.snipme:highlights", version.ref = "highlights" }
-
-[bundles]
-coil = [
-    "coil-core",
-    "coil-network-okhttp",
-]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

multiplatform-markdown-renderer-coil3/build.gradle.kts

@@ -11,10 +11,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(projects.multiplatformMarkdownRenderer)
-            api(libs.coil.core.get().toString()) {
-                exclude(group = "org.jetbrains.compose.runtime")
-            }
-            compileOnly(baseLibs.jetbrains.compose.runtime)
+            api(libs.coil.core)
         }
     }
 }

multiplatform-markdown-renderer-m2/api/jvm/multiplatform-markdown-renderer-m2.api

@@ -11,7 +11,7 @@ public final class com/mikepenz/markdown/m2/ComposableSingletons$MarkdownKt {
 }
 
 public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
-	public static final fun markdownColor-BI4oR5s (JJJJJZLcom/mikepenz/markdown/model/MarkdownAlertColors;Landroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/model/MarkdownColors;
+	public static final fun markdownColor-waQFBJk (JJJJJZLcom/mikepenz/markdown/model/MarkdownAlertColors;JJLandroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/model/MarkdownColors;
 }
 
 public final class com/mikepenz/markdown/m2/MarkdownKt {