Skip to content

Commit 2ac5ce2

Browse files
mikepenzmikepenz
authored
Merge pull request #398 from mikepenz/develop
dev -> main
2 parents b021c48 + 14ee4fd commit 2ac5ce2

File tree

60 files changed

+284
-117
lines changed

Some content is hidden

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

60 files changed

+284
-117
lines changed

‎MIGRATION.md

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

3+
#### Version 0.34.0
4+
5+
- **Dependency Upgrade**: Compose 1.8.0 / Compose Multiplatform 1.8.0
6+
- **Breaking Change**: Reordered arguments for `markdownAnnotator` to improve backwards comp.
7+
- **Behavior Change**: Handle empty lines in block quotes. (Using block quote text size as height)
8+
39
#### Version 0.33.0
410

511
- **Dependency Upgrade**: Kotlin 2.1.20

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ val markdownFlow = parseMarkdownFlow("# Markdown")
134134
.stateIn(lifecycleScope, SharingStarted.Eagerly, State.Loading())
135135

136136
// In the Composable use the flow
137-
val state by markdownFlow.collectAsStateWithLifecycle(State.Loading())
137+
val state by markdownFlow.collectAsStateWithLifecycle()
138138
Markdown(state)
139139
```
140140

‎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.33.0
4-
VERSION_CODE=3300
3+
VERSION_NAME=0.34.0
4+
VERSION_CODE=3400
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ androidx-activityCompose = "1.10.1"
33
coil = "3.1.0"
44
coil2 = "2.7.0"
55
markdown = "0.7.3"
6-
ktor = "3.1.2"
6+
ktor = "3.1.3"
77
highlights = "1.0.0"
88

99
[libraries]

‎gradle/wrapper/gradle-wrapper.jar

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

‎gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

‎gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ android {
1111

1212
dependencies {
1313
commonMainApi(projects.multiplatformMarkdownRenderer)
14-
commonMainApi(libs.coil.core)
14+
15+
// TODO reverse once coil3 was released based on compose 1.8.0
16+
commonMainApi(libs.coil.core) {
17+
exclude(group = "org.jetbrains.compose.runtime")
18+
}
1519
commonMainCompileOnly(compose.runtime)
20+
commonMainCompileOnly(compose.runtimeSaveable)
21+
commonMainCompileOnly("org.jetbrains.compose.ui:ui-backhandler:1.8.0-rc01")
1622
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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$-1353005456$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
5-
public final fun getLambda$-1446203683$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
6-
public final fun getLambda$1377101343$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
7-
public final fun getLambda$1562902692$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
8-
public final fun getLambda$208294801$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
9-
public final fun getLambda$311006291$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
4+
public final fun getLambda$1112484843$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
5+
public final fun getLambda$1405124674$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
6+
public final fun getLambda$1890655630$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
7+
public final fun getLambda$1996475994$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
8+
public final fun getLambda$598402550$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function5;
9+
public final fun getLambda$925370143$multiplatform_markdown_renderer_m2_release ()Lkotlin/jvm/functions/Function3;
1010
}
1111

1212
public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
@@ -15,9 +15,9 @@ public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
1515
}
1616

1717
public final class com/mikepenz/markdown/m2/MarkdownKt {
18-
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/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
19-
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/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 (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/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
18+
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
19+
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 (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
2121
}
2222

2323
public final class com/mikepenz/markdown/m2/MarkdownTypographyKt {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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$-1353005456$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
5-
public final fun getLambda$-1446203683$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
6-
public final fun getLambda$1377101343$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
7-
public final fun getLambda$1562902692$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
8-
public final fun getLambda$208294801$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function5;
9-
public final fun getLambda$311006291$multiplatform_markdown_renderer_m2 ()Lkotlin/jvm/functions/Function3;
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;
1010
}
1111

1212
public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
@@ -15,9 +15,9 @@ public final class com/mikepenz/markdown/m2/MarkdownColorsKt {
1515
}
1616

1717
public final class com/mikepenz/markdown/m2/MarkdownKt {
18-
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/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
19-
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/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 (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/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
18+
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
19+
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 (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
2121
}
2222

2323
public final class com/mikepenz/markdown/m2/MarkdownTypographyKt {

0 commit comments

Comments
 (0)