Skip to content

Commit 3fca430

Browse files
mikepenzmikepenz
authored
Merge pull request #261 from mikepenz/develop
dev -> main
2 parents db49977 + d1b8d2b commit 3fca430

File tree

17 files changed

+75
-80
lines changed

17 files changed

+75
-80
lines changed

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,8 @@ Markdown(
139139

140140
Starting with 0.16.0 the library includes support
141141
for [extended-spans](https://github.com/saket/extended-spans).
142-
> The library was integrated to to make it multiplatform compatible. All credits for its
143-
> functionality goes to [
144-
Saket Narayan](https://github.com/saket).
142+
> The library was integrated to make it multiplatform-compatible.
143+
> All credits for its functionality go to [Saket Narayan](https://github.com/saket).
145144

146145
It is not enabled by default, however you can enable it quickly by configuring the `extendedSpans`
147146
for your `Markdown` composeable.

‎app-desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
plugins {
44
kotlin("jvm")
55
application
6-
alias(libs.plugins.jetbrainsCompose)
6+
alias(libs.plugins.composeMultiplatform)
77
alias(libs.plugins.composeCompiler)
88
}
99

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,15 @@ This is an unordered list with asterisks:
123123
124124
--------
125125
126+
This is a markdown table:
127+
128+
| First Header | Second Header |
129+
| ------------- | ------------- |
130+
| Content Cell | Content Cell |
131+
| Content Cell | Content Cell |
132+
133+
--------
134+
126135
# Random
127136
128137
### Getting Started

‎app-wasm/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
22

33
plugins {
44
kotlin("multiplatform")
5-
alias(libs.plugins.jetbrainsCompose)
5+
alias(libs.plugins.composeMultiplatform)
66
alias(libs.plugins.composeCompiler)
77
id("com.mikepenz.aboutlibraries.plugin")
88
}

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎app-wasm/src/wasmJsMain/kotlin/Main.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,15 @@ This is an unordered list with asterisks:
172172
173173
--------
174174
175+
This is a markdown table:
176+
177+
| First Header | Second Header |
178+
| ------------- | ------------- |
179+
| Content Cell | Content Cell |
180+
| Content Cell | Content Cell |
181+
182+
--------
183+
175184
# Random
176185
177186
### Getting Started

‎app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.konan.properties.Properties
33
plugins {
44
kotlin("android")
55
alias(libs.plugins.androidApplication)
6-
alias(libs.plugins.jetbrainsCompose)
6+
alias(libs.plugins.composeMultiplatform)
77
alias(libs.plugins.composeCompiler)
88
alias(libs.plugins.screenshot)
99
}

‎build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
// this is necessary to avoid the plugins to be loaded multiple times in each subproject's classloader
33
alias(libs.plugins.androidApplication) apply false
44
alias(libs.plugins.androidLibrary) apply false
5-
alias(libs.plugins.jetbrainsCompose) apply false
65
alias(libs.plugins.composeCompiler) apply false
76
alias(libs.plugins.kotlinMultiplatform) apply false
87
alias(libs.plugins.dokka)

‎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.28.0
4-
VERSION_CODE=2800
3+
VERSION_NAME=0.29.0
4+
VERSION_CODE=2900
55

66
POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
77

‎gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
2-
agp = "8.7.2"
2+
agp = "8.7.3"
33
compileSdk = "35"
44
minSdk = "21"
55
targetSdk = "35"
66
androidx-activityCompose = "1.9.3"
77
androidx-material = "1.12.0"
8-
compose = "1.7.5"
9-
compose-plugin = "1.7.1"
10-
kotlin = "2.0.21"
8+
compose = "1.7.6"
9+
compose-multiplatform = "1.7.3"
10+
kotlin = "2.1.0"
1111
coroutines = "1.10.1"
12-
dokka = "2.0.0-Beta"
12+
dokka = "2.0.0"
1313
coil = "3.0.4"
1414
coil2 = "2.7.0"
15-
aboutlib = "11.3.0-rc01"
15+
aboutlib = "11.3.0-rc02"
1616
markdown = "0.7.3"
1717
detekt = "1.23.7"
1818
gradleMvnPublish = "0.30.0"
1919
screenshot = "0.0.1-alpha08"
20-
ktor = "3.0.1"
20+
ktor = "3.0.3"
2121
highlights = "1.0.0"
2222

2323
[libraries]
@@ -45,7 +45,7 @@ highlights = { module = "dev.snipme:highlights", version.ref = "highlights" }
4545
[plugins]
4646
androidApplication = { id = "com.android.application", version.ref = "agp" }
4747
androidLibrary = { id = "com.android.library", version.ref = "agp" }
48-
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
48+
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
4949
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5050
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
5151
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

‎kotlin-js-store/yarn.lock

Lines changed: 23 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -109,27 +109,6 @@
109109
dependencies:
110110
"@types/node" "*"
111111

112-
"@types/eslint-scope@^3.7.3":
113-
version "3.7.7"
114-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
115-
integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
116-
dependencies:
117-
"@types/eslint" "*"
118-
"@types/estree" "*"
119-
120-
"@types/eslint@*":
121-
version "9.6.1"
122-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
123-
integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
124-
dependencies:
125-
"@types/estree" "*"
126-
"@types/json-schema" "*"
127-
128-
"@types/estree@*":
129-
version "1.0.6"
130-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
131-
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
132-
133112
"@types/estree@^1.0.5":
134113
version "1.0.5"
135114
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -167,7 +146,7 @@
167146
dependencies:
168147
"@types/node" "*"
169148

170-
"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
149+
"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
171150
version "7.0.15"
172151
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
173152
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -913,7 +892,7 @@ engine.io@~6.5.2:
913892
engine.io-parser "~5.2.1"
914893
ws "~8.11.0"
915894

916-
enhanced-resolve@^5.17.0:
895+
enhanced-resolve@^5.17.1:
917896
version "5.18.0"
918897
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404"
919898
integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==
@@ -1586,10 +1565,10 @@ [email protected]:
15861565
minimatch "^9.0.3"
15871566
webpack-merge "^4.1.5"
15881567

1589-
[email protected].3:
1590-
version "6.4.3"
1591-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1592-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
1568+
[email protected].4:
1569+
version "6.4.4"
1570+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1571+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
15931572
dependencies:
15941573
"@colors/colors" "1.5.0"
15951574
body-parser "^1.19.0"
@@ -1621,6 +1600,13 @@ kind-of@^6.0.2:
16211600
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
16221601
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
16231602

1603+
[email protected]:
1604+
version "2.0.0"
1605+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1606+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1607+
dependencies:
1608+
format-util "^1.0.5"
1609+
16241610
launch-editor@^2.6.0:
16251611
version "2.8.1"
16261612
resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.8.1.tgz#3bda72af213ec9b46b170e39661916ec66c2f463"
@@ -1772,10 +1758,10 @@ mkdirp@^0.5.5:
17721758
dependencies:
17731759
minimist "^1.2.6"
17741760

1775-
[email protected].0:
1776-
version "10.7.0"
1777-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1778-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1761+
[email protected].3:
1762+
version "10.7.3"
1763+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1764+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
17791765
dependencies:
17801766
ansi-colors "^4.1.3"
17811767
browser-stdout "^1.3.1"
@@ -2684,12 +2670,11 @@ webpack-sources@^3.2.3:
26842670
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
26852671
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
26862672

2687-
webpack@5.93.0:
2688-
version "5.93.0"
2689-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
2690-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
2673+
webpack@5.94.0:
2674+
version "5.94.0"
2675+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
2676+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
26912677
dependencies:
2692-
"@types/eslint-scope" "^3.7.3"
26932678
"@types/estree" "^1.0.5"
26942679
"@webassemblyjs/ast" "^1.12.1"
26952680
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -2698,7 +2683,7 @@ [email protected]:
26982683
acorn-import-attributes "^1.9.5"
26992684
browserslist "^4.21.10"
27002685
chrome-trace-event "^1.0.2"
2701-
enhanced-resolve "^5.17.0"
2686+
enhanced-resolve "^5.17.1"
27022687
es-module-lexer "^1.2.1"
27032688
eslint-scope "5.1.1"
27042689
events "^3.2.0"
@@ -2766,12 +2751,7 @@ wrappy@1:
27662751
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
27672752
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
27682753

2769-
[email protected]:
2770-
version "8.5.0"
2771-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
2772-
integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
2773-
2774-
ws@^8.13.0:
2754+
[email protected], ws@^8.13.0:
27752755
version "8.18.0"
27762756
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
27772757
integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==

‎multiplatform-markdown-renderer-code/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55
plugins {
66
kotlin("multiplatform")
77
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.composeMultiplatform)
99
alias(libs.plugins.composeCompiler)
1010
alias(libs.plugins.dokka)
1111
alias(libs.plugins.mavenPublish)
@@ -60,8 +60,8 @@ kotlin {
6060
targets.all {
6161
compilations.all {
6262
compilerOptions.configure {
63-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
64-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
63+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
64+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
6565
}
6666
}
6767
}

‎multiplatform-markdown-renderer-coil2/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import com.vanniktech.maven.publish.SonatypeHost
22
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
43

54
plugins {
65
kotlin("multiplatform")
76
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
7+
alias(libs.plugins.composeMultiplatform)
98
alias(libs.plugins.composeCompiler)
109
alias(libs.plugins.dokka)
1110
alias(libs.plugins.mavenPublish)
@@ -60,8 +59,8 @@ kotlin {
6059
targets.all {
6160
compilations.all {
6261
compilerOptions.configure {
63-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
64-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
62+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
63+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
6564
}
6665
}
6766
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55
plugins {
66
kotlin("multiplatform")
77
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.composeMultiplatform)
99
alias(libs.plugins.composeCompiler)
1010
alias(libs.plugins.dokka)
1111
alias(libs.plugins.mavenPublish)
@@ -60,8 +60,8 @@ kotlin {
6060
targets.all {
6161
compilations.all {
6262
compilerOptions.configure {
63-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
64-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
63+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
64+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
6565
}
6666
}
6767
}

‎multiplatform-markdown-renderer-m2/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55
plugins {
66
kotlin("multiplatform")
77
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.composeMultiplatform)
99
alias(libs.plugins.composeCompiler)
1010
alias(libs.plugins.dokka)
1111
alias(libs.plugins.mavenPublish)
@@ -45,8 +45,8 @@ kotlin {
4545
targets.all {
4646
compilations.all {
4747
compilerOptions.configure {
48-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
49-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
48+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
49+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
5050
}
5151
}
5252
}

‎multiplatform-markdown-renderer-m3/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55
plugins {
66
kotlin("multiplatform")
77
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.composeMultiplatform)
99
alias(libs.plugins.composeCompiler)
1010
alias(libs.plugins.dokka)
1111
alias(libs.plugins.mavenPublish)
@@ -45,8 +45,8 @@ kotlin {
4545
targets.all {
4646
compilations.all {
4747
compilerOptions.configure {
48-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
49-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
48+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
49+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
5050
}
5151
}
5252
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
55
plugins {
66
kotlin("multiplatform")
77
alias(libs.plugins.androidLibrary)
8-
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.composeMultiplatform)
99
alias(libs.plugins.composeCompiler)
1010
alias(libs.plugins.dokka)
1111
alias(libs.plugins.mavenPublish)
@@ -60,8 +60,8 @@ kotlin {
6060
targets.all {
6161
compilations.all {
6262
compilerOptions.configure {
63-
languageVersion.set(KotlinVersion.KOTLIN_1_9)
64-
apiVersion.set(KotlinVersion.KOTLIN_1_9)
63+
languageVersion.set(KotlinVersion.KOTLIN_2_0)
64+
apiVersion.set(KotlinVersion.KOTLIN_2_0)
6565
}
6666
}
6767
}

0 commit comments

Comments
 (0)