Skip to content

Commit 2f98ff0

Browse files
mikepenzmikepenz
authored
Merge pull request #586 from mikepenz/develop
dev -> main
2 parents 767025e + a872e24 commit 2f98ff0

41 files changed

Lines changed: 1423 additions & 235 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Java",
3-
"image": "mcr.microsoft.com/devcontainers/java:3-21@sha256:0efcd547d9d8c16c8a67b5331718d3ad0e12e29f416b6102bd5cf2cacd566bcd",
3+
"image": "mcr.microsoft.com/devcontainers/java:3-21@sha256:1e8bc687983da0d516d1c8d53c15abef59a5c83c0e829331ba145d9910ff4d9c",
44
"features": {
55
"ghcr.io/devcontainers/features/java:1": {
66
"version": "none",

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout the repo
23-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
23+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2424

2525
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2626
with:
@@ -67,7 +67,7 @@ jobs:
6767
security-events: write
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
70+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7171
with:
7272
fetch-depth: 100
7373

@@ -98,7 +98,7 @@ jobs:
9898
9999
- name: Publish Test Report
100100
if: false && (failure() || success()) && github.event_name == 'pull_request'
101-
uses: mikepenz/action-junit-report@bccf2e31636835cf0874589931c4116687171386 # v6.4.0
101+
uses: mikepenz/action-junit-report@3a81627bfac62268172037048872e8ebd4207e6d # v6.4.1
102102
with:
103103
report_paths: '**/sample/android/build/test-results/testDebugUnitTest/TEST-*.xml'
104104
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -132,7 +132,7 @@ jobs:
132132
133133
- name: Upload Lint SARIF
134134
if: always() && github.event_name == 'pull_request'
135-
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
135+
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
136136
with:
137137
sarif_file: 'sarif-reports'
138138
category: android-lint
@@ -171,7 +171,7 @@ jobs:
171171
contents: write
172172
steps:
173173
- name: Checkout
174-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
174+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
175175
with:
176176
fetch-depth: 100
177177

@@ -183,7 +183,7 @@ jobs:
183183

184184
- name: Build Changelog
185185
id: github_release
186-
uses: mikepenz/release-changelog-builder-action@bcae7115752d4ed746ff92feb666574428a79415 # v6.2.1
186+
uses: mikepenz/release-changelog-builder-action@348e88fab4c37338b1e803ceb2d4a7a5db6c0833 # v6.2.2
187187
with:
188188
configuration: ".github/config/configuration.json"
189189
ignorePreReleases: ${{ !contains(github.ref, '-') }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
contents: write
1212
steps:
1313
- name: 'Checkout Repository'
14-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
14+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1515

1616
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1717
with:

‎.github/workflows/static.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
33+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3434
- name: Setup Pages
3535
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
3636
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0

‎MIGRATION.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
### Upgrade Notes
22

3+
#### Version 0.42.0
4+
5+
- **Dependency Upgrade**: Kotlin 2.3.21 → 2.4.0
6+
- **Dependency Upgrade**: Android `compileSdk` / `targetSdk` 36 → 37
7+
- **Dependency Upgrade**: JetBrains `markdown` 0.7.3 → 0.7.5
8+
- **Dependency Upgrade**: Ktor 3.4.2 → 3.5.0 (affects the coil2 / coil3 network image integrations)
9+
- **Dependency Upgrade**: Compose Multiplatform 1.11.0 → 1.11.1 (androidx Compose 1.11.1 → 1.11.3)
10+
- **Behavior Change**: Default M2/M3 `inlineCode` typography no longer pins a font size
11+
(`fontSize = TextUnit.Unspecified`); inline code now inherits the surrounding text size.
12+
- **New Feature**: `StreamingMarkdownState` — append-only streaming markdown, purpose-built for LLM
13+
token streams (incremental output without re-parsing the whole document on every emission).
14+
- `rememberStreamingMarkdownState(immediate, flavour, referenceLinkHandler)` to create state.
15+
- `Flow<String>.collectAsStreamingMarkdownState(...)` to drive it from a `Flow`.
16+
- New `Markdown(streamingMarkdownState, ...)` composable overload (core, M2 and M3 modules); its
17+
`success` slot receives a `StreamingMarkdownState.Snapshot` instead of `State.Success`.
18+
- New `StreamingMarkdownSuccess(...)` and `LazyMarkdownSuccess(streamingMarkdownState, snapshot,
19+
...)` render entry points.
20+
- This is **additive** — existing `Markdown(String)` / `Markdown(MarkdownState)` usage is
21+
unchanged. Prefer `StreamingMarkdownState` over `Flow<String>.asMarkdownState()` for
22+
append-only streams (the latter re-parses every emitted String).
23+
324
#### Version 0.41.0
425

526
- **Breaking Change**: Dropped support for iosX64 and macosX64 targets (equal to compose

‎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.41.0
4-
VERSION_CODE=4100
3+
VERSION_NAME=0.42.0
4+
VERSION_CODE=4200
55
#
66
POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
77
POM_SCM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
androidx-activityCompose = "1.13.0"
33
coil = "3.4.0"
44
coil2 = "2.7.0"
5-
markdown = "0.7.3"
6-
ktor = "3.4.2"
5+
markdown = "0.7.5"
6+
ktor = "3.5.0"
77
highlights = "1.1.0"
88

99
[libraries]

‎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-9.5.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

‎multiplatform-markdown-renderer-code/api/jvm/multiplatform-markdown-renderer-code.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
public final class com/mikepenz/markdown/compose/elements/ComposableSingletons$MarkdownHighlightedCodeKt {
22
public static final field INSTANCE Lcom/mikepenz/markdown/compose/elements/ComposableSingletons$MarkdownHighlightedCodeKt;
33
public fun <init> ()V
4-
public final fun getLambda$-621386773$multiplatform_markdown_renderer_code ()Lkotlin/jvm/functions/Function3;
5-
public final fun getLambda$986930703$multiplatform_markdown_renderer_code ()Lkotlin/jvm/functions/Function3;
4+
public final fun getLambda$-621386773$com_mikepenz_multiplatform_markdown_renderer_code ()Lkotlin/jvm/functions/Function3;
5+
public final fun getLambda$986930703$com_mikepenz_multiplatform_markdown_renderer_code ()Lkotlin/jvm/functions/Function3;
66
}
77

88
public final class com/mikepenz/markdown/compose/elements/MarkdownHighlightedCodeKt {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
public final class com/mikepenz/markdown/m2/ComposableSingletons$MarkdownKt {
22
public static final field INSTANCE Lcom/mikepenz/markdown/m2/ComposableSingletons$MarkdownKt;
33
public fun <init> ()V
4-
public final fun getLambda$1112484843$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
5-
public final fun getLambda$1405124674$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
6-
public final fun getLambda$1890655630$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
7-
public final fun getLambda$1996475994$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
8-
public final fun getLambda$598402550$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
9-
public final fun getLambda$925370143$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
4+
public final fun getLambda$-1669617445$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
5+
public final fun getLambda$1112484843$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
6+
public final fun getLambda$1405124674$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
7+
public final fun getLambda$1890655630$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
8+
public final fun getLambda$1996475994$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
9+
public final fun getLambda$598402550$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
10+
public final fun getLambda$925370143$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
1011
}
1112

1213
public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
@@ -16,6 +17,7 @@ public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
1617
public final class com/mikepenz/markdown/m2/MarkdownKt {
1718
public static final fun Markdown (Lcom/mikepenz/markdown/model/MarkdownState;Lcom/mikepenz/markdown/model/MarkdownColors;Lcom/mikepenz/markdown/model/MarkdownTypography;Landroidx/compose/ui/Modifier;Lcom/mikepenz/markdown/model/MarkdownPadding;Lcom/mikepenz/markdown/model/MarkdownDimens;Lcom/mikepenz/markdown/model/ImageTransformer;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/MarkdownExtendedSpans;Lcom/mikepenz/markdown/model/MarkdownInlineContent;Lcom/mikepenz/markdown/compose/components/MarkdownComponents;Lcom/mikepenz/markdown/model/MarkdownAnimations;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
1819
public static final fun Markdown (Lcom/mikepenz/markdown/model/State;Lcom/mikepenz/markdown/model/MarkdownColors;Lcom/mikepenz/markdown/model/MarkdownTypography;Landroidx/compose/ui/Modifier;Lcom/mikepenz/markdown/model/MarkdownPadding;Lcom/mikepenz/markdown/model/MarkdownDimens;Lcom/mikepenz/markdown/model/ImageTransformer;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/MarkdownExtendedSpans;Lcom/mikepenz/markdown/model/MarkdownInlineContent;Lcom/mikepenz/markdown/compose/components/MarkdownComponents;Lcom/mikepenz/markdown/model/MarkdownAnimations;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
20+
public static final fun Markdown (Lcom/mikepenz/markdown/model/StreamingMarkdownState;Lcom/mikepenz/markdown/model/MarkdownColors;Lcom/mikepenz/markdown/model/MarkdownTypography;Landroidx/compose/ui/Modifier;Lcom/mikepenz/markdown/model/MarkdownPadding;Lcom/mikepenz/markdown/model/MarkdownDimens;Lcom/mikepenz/markdown/model/ImageTransformer;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/MarkdownExtendedSpans;Lcom/mikepenz/markdown/model/MarkdownInlineContent;Lcom/mikepenz/markdown/compose/components/MarkdownComponents;Lcom/mikepenz/markdown/model/MarkdownAnimations;Lkotlin/jvm/functions/Function5;Landroidx/compose/runtime/Composer;III)V
1921
public static final fun Markdown (Ljava/lang/String;Lcom/mikepenz/markdown/model/MarkdownColors;Lcom/mikepenz/markdown/model/MarkdownTypography;Landroidx/compose/ui/Modifier;Lcom/mikepenz/markdown/model/MarkdownPadding;Lcom/mikepenz/markdown/model/MarkdownDimens;Lorg/intellij/markdown/flavours/MarkdownFlavourDescriptor;Lorg/intellij/markdown/parser/MarkdownParser;Lcom/mikepenz/markdown/model/ImageTransformer;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/MarkdownExtendedSpans;Lcom/mikepenz/markdown/model/MarkdownInlineContent;Lcom/mikepenz/markdown/compose/components/MarkdownComponents;Lcom/mikepenz/markdown/model/MarkdownAnimations;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
2022
}
2123

@@ -26,7 +28,7 @@ public final class com/mikepenz/markdown/m2/MarkdownTypographyKt {
2628
public final class com/mikepenz/markdown/m2/elements/ComposableSingletons$MarkdownCheckBoxKt {
2729
public static final field INSTANCE Lcom/mikepenz/markdown/m2/elements/ComposableSingletons$MarkdownCheckBoxKt;
2830
public fun <init> ()V
29-
public final fun getLambda$-1027770773$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function4;
31+
public final fun getLambda$-1027770773$com_mikepenz_multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function4;
3032
}
3133

3234
public final class com/mikepenz/markdown/m2/elements/MarkdownCheckBoxKt {

0 commit comments

Comments
 (0)