Skip to content

Commit 767025e

Browse files
authored
Merge pull request #566 from mikepenz/develop
dev -> main
2 parents 265532f + 23c5c15 commit 767025e

97 files changed

Lines changed: 1379 additions & 268 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:1-21",
3+
"image": "mcr.microsoft.com/devcontainers/java:3-21@sha256:0efcd547d9d8c16c8a67b5331718d3ad0e12e29f416b6102bd5cf2cacd566bcd",
44
"features": {
55
"ghcr.io/devcontainers/features/java:1": {
66
"version": "none",

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/ci.yml

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

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

25-
- uses: actions/setup-java@v5
25+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2626
with:
2727
distribution: 'zulu'
2828
java-version: |
@@ -33,10 +33,10 @@ jobs:
3333
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3434

3535
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@v6
36+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
3737

3838
- name: Cache konan
39-
uses: actions/cache@v5
39+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4040
with:
4141
path: ~/.konan
4242
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -67,25 +67,25 @@ jobs:
6767
security-events: write
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@v6
70+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7171
with:
7272
fetch-depth: 100
7373

74-
- uses: actions/setup-java@v5
74+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
7575
with:
7676
distribution: 'zulu'
7777
java-version: |
7878
17
7979
21
8080
8181
- name: Validate gradle wrapper
82-
uses: gradle/actions/wrapper-validation@v6
82+
uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
8383

8484
- name: Copy CI gradle.properties
8585
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
8686

8787
- name: Setup Gradle
88-
uses: gradle/actions/setup-gradle@v6
88+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
8989

9090
- name: Build Debug
9191
run: |
@@ -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@v6
101+
uses: mikepenz/action-junit-report@bccf2e31636835cf0874589931c4116687171386 # v6.4.0
102102
with:
103103
report_paths: '**/sample/android/build/test-results/testDebugUnitTest/TEST-*.xml'
104104
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -108,7 +108,7 @@ jobs:
108108

109109
- name: Archive Test Report
110110
if: always()
111-
uses: actions/upload-artifact@v7
111+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
112112
with:
113113
name: "Test-Artifacts"
114114
path: "sample/android/build/reports/paparazzi/debug/"
@@ -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@v4
135+
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
136136
with:
137137
sarif_file: 'sarif-reports'
138138
category: android-lint
@@ -157,7 +157,7 @@ jobs:
157157
158158
- name: Archive Artifacts
159159
if: startsWith(github.ref, 'refs/tags/')
160-
uses: actions/upload-artifact@v7
160+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
161161
with:
162162
name: "App-Artifacts"
163163
path: artifacts/*
@@ -171,27 +171,27 @@ jobs:
171171
contents: write
172172
steps:
173173
- name: Checkout
174-
uses: actions/checkout@v6
174+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
175175
with:
176176
fetch-depth: 100
177177

178178
- name: Download Artifacts
179-
uses: actions/download-artifact@v8
179+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
180180
with:
181181
name: App-Artifacts
182182
path: artifacts
183183

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

193193
- name: Release
194-
uses: mikepenz/action-gh-release@v2
194+
uses: mikepenz/action-gh-release@2a00e201320fb618d8e705a736286b2e31aa48e2 # v3.0.0
195195
with:
196196
body: ${{steps.github_release.outputs.changelog}}
197197
prerelease: ${{ contains(github.ref, '-rc') || contains(github.ref, '-b') || contains(github.ref, '-a') }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
contents: write
1212
steps:
1313
- name: 'Checkout Repository'
14-
uses: actions/checkout@v6
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515

16-
- uses: actions/setup-java@v5
16+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1717
with:
1818
distribution: 'zulu'
1919
java-version: |
@@ -24,6 +24,6 @@ jobs:
2424
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2525

2626
- name: Setup Gradle & Submit dependency graphs
27-
uses: gradle/actions/setup-gradle@v6
27+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
2828
with:
2929
dependency-graph: generate-and-submit

.github/workflows/junie.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: PR Quality Gates
15-
uses: actions/github-script@v8
15+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
1616
with:
1717
script: |
1818
const { data: pr } = await github.rest.pulls.get({

.github/workflows/static.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v6
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434
- name: Setup Pages
35-
uses: actions/configure-pages@v6
36-
- uses: actions/setup-java@v5
35+
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
36+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3737
with:
3838
distribution: 'zulu'
3939
java-version: |
4040
17
4141
21
4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v6
43+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
4444
- name: Build Page
4545
run: |
4646
./gradlew sample:web:wasmJsBrowserDistribution --no-configuration-cache
4747
4848
- name: Upload artifact
49-
uses: actions/upload-pages-artifact@v4
49+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
5050
with:
5151
path: 'sample/web/build/dist/wasmJs/productionExecutable'
5252

5353
- name: Deploy to GitHub Pages
5454
id: deployment
55-
uses: actions/deploy-pages@v5
55+
uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0

MIGRATION.md

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

3+
#### Version 0.41.0
4+
5+
- **Breaking Change**: Dropped support for iosX64 and macosX64 targets (equal to compose
6+
multiplatform 1.11.0)
7+
- **Dependency Upgrade**: Compose 1.11.x / Compose Multiplatform 1.11.0-rc01
8+
- **Signature Changes**:
9+
- MarkdownInlineImage(String, ASTNode) → now takes an extra String alt-text arg (commit 4a2c560
10+
a11y semantics overhaul, #487).
11+
- MarkdownText(AnnotatedString, ASTNode, Modifier, TextStyle, ExtendedSpans) → adds trailing
12+
String (content-description) parameter.
13+
- MarkdownText(AnnotatedString, ASTNode, Modifier, TextStyle, Function2) → adds String and
14+
ExtendedSpans parameters.
15+
- MarkdownTableRow-OniuKJc(...) replaced by MarkdownTableRow-BvHgwxg(...) with an additional
16+
Int (row index) parameter (commit e0d55b7 GFM inline content in tables, #559).
17+
- MarkdownAnnotatorConfig interface gained three new members: inlineImageAsBlock,
18+
showImageAltTooltip, imageAltTooltipHoverDelayMs (default impls provided on JVM, but
19+
Kotlin/Native callers that implemented the interface must add overrides).
20+
- DefaultMarkdownAnnotatorConfig(Boolean) constructor → now (Boolean, Boolean, Boolean, Long);
21+
markdownAnnotatorConfig(Boolean) factory signature changed accordingly.
22+
323
#### Version 0.40.0
424

525
- **Breaking Change**: Due to Paparazzi requiring Java 21 - This project is now also compiled with

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.40.2
4-
VERSION_CODE=4002
3+
VERSION_NAME=0.41.0
4+
VERSION_CODE=4100
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

2.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)