Skip to content

Commit ffb00d6

Browse files
mikepenzmikepenz
authored
Merge pull request #463 from mikepenz/develop
dev -> main
2 parents 07bce3c + 5f28279 commit ffb00d6

File tree

27 files changed

+294
-112
lines changed

27 files changed

+294
-112
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v4
37+
uses: gradle/actions/setup-gradle@v5
3838

3939
- name: Cache konan
4040
uses: actions/cache@v4
@@ -75,13 +75,13 @@ jobs:
7575
java-version: '17'
7676

7777
- name: Validate gradle wrapper
78-
uses: gradle/actions/wrapper-validation@v4
78+
uses: gradle/actions/wrapper-validation@v5
7979

8080
- name: Copy CI gradle.properties
8181
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
8282

8383
- name: Setup Gradle
84-
uses: gradle/actions/setup-gradle@v4
84+
uses: gradle/actions/setup-gradle@v5
8585

8686
- name: Build Debug
8787
run: |
@@ -104,7 +104,7 @@ jobs:
104104
detailed_summary: true
105105

106106
- name: Archive Test Report
107-
uses: actions/upload-artifact@v4
107+
uses: actions/upload-artifact@v5
108108
with:
109109
name: "Test-Artifacts"
110110
path: "sample/android/build/reports/screenshotTest/preview/debug/"
@@ -152,7 +152,7 @@ jobs:
152152
153153
- name: Archive Artifacts
154154
if: startsWith(github.ref, 'refs/tags/')
155-
uses: actions/upload-artifact@v4
155+
uses: actions/upload-artifact@v5
156156
with:
157157
name: "App-Artifacts"
158158
path: artifacts/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2626

2727
- name: Setup Gradle & Submit dependency graphs
28-
uses: gradle/actions/setup-gradle@v4
28+
uses: gradle/actions/setup-gradle@v5
2929
with:
3030
dependency-graph: generate-and-submit

‎.github/workflows/static.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
11
4141
17
4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v4
43+
uses: gradle/actions/setup-gradle@v5
4444
- name: Build Page
4545
run: |
4646
./gradlew sample:web:wasmJsBrowserDistribution --no-configuration-cache

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,16 @@ Markdown(
444444
MarkdownHighlightedCodeBlock(
445445
content = it.content,
446446
node = it.node,
447-
highlightsBuilder = highlightsBuilder
447+
highlightsBuilder = highlightsBuilder,
448+
showHeader = true, // optional enable header with code language + copy button
448449
)
449450
},
450451
codeFence = {
451452
MarkdownHighlightedCodeFence(
452453
content = it.content,
453454
node = it.node,
454-
highlightsBuilder = highlightsBuilder
455+
highlightsBuilder = highlightsBuilder,
456+
showHeader = true, // optional enable header with code language + copy button
455457
)
456458
},
457459
)

‎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.37.0
4-
VERSION_CODE=3700
3+
VERSION_NAME=0.38.0
4+
VERSION_CODE=3800
55
#
66
POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
77
POM_SCM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer

‎gradle/wrapper/gradle-wrapper.jar‎

1.65 KB
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-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ public final class com/mikepenz/markdown/compose/elements/ComposableSingletons$M
66
}
77

88
public final class com/mikepenz/markdown/compose/elements/MarkdownHighlightedCodeKt {
9-
public static final fun MarkdownHighlightedCode (Ljava/lang/String;Ljava/lang/String;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
10-
public static final fun MarkdownHighlightedCodeBlock (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
11-
public static final fun MarkdownHighlightedCodeFence (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
9+
public static final fun MarkdownHighlightedCode (Ljava/lang/String;Ljava/lang/String;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
10+
public static final fun MarkdownHighlightedCodeBlock (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
11+
public static final fun MarkdownHighlightedCodeFence (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
1212
public static final fun getHighlightedCodeBlock ()Lkotlin/jvm/functions/Function3;
1313
public static final fun getHighlightedCodeFence ()Lkotlin/jvm/functions/Function3;
1414
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ public final class com/mikepenz/markdown/compose/elements/ComposableSingletons$M
66
}
77

88
public final class com/mikepenz/markdown/compose/elements/MarkdownHighlightedCodeKt {
9-
public static final fun MarkdownHighlightedCode (Ljava/lang/String;Ljava/lang/String;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
10-
public static final fun MarkdownHighlightedCodeBlock (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
11-
public static final fun MarkdownHighlightedCodeFence (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;Landroidx/compose/runtime/Composer;II)V
9+
public static final fun MarkdownHighlightedCode (Ljava/lang/String;Ljava/lang/String;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
10+
public static final fun MarkdownHighlightedCodeBlock (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
11+
public static final fun MarkdownHighlightedCodeFence (Ljava/lang/String;Lorg/intellij/markdown/ast/ASTNode;Landroidx/compose/ui/text/TextStyle;Ldev/snipme/highlights/Highlights$Builder;ZLandroidx/compose/runtime/Composer;II)V
1212
public static final fun getHighlightedCodeBlock ()Lkotlin/jvm/functions/Function3;
1313
public static final fun getHighlightedCodeFence ()Lkotlin/jvm/functions/Function3;
1414
}

0 commit comments

Comments
 (0)