Skip to content

Commit

Permalink
Merge pull request #25 from mikepenz/develop
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
mikepenz authored Dec 3, 2021
2 parents aa73de8 + add5a48 commit 718f355
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ val markdown = """
""".trimIndent()

//
Markdown(markdown, Modifier.fillMaxSize())
Markdown(markdown)
```

## Dependency
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle:7.0.3")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1")
classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.31")
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.0.0-b01")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta6-dev474")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0")
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.0.0-b02")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
}
}

Expand All @@ -36,6 +36,6 @@ subprojects {
apply(from = "../detekt.gradle")

dependencies {
"detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.18.1")
"detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.19.0")
}
}
2 changes: 1 addition & 1 deletion compose-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = "com.mikepenz"
version = "1.0-SNAPSHOT"
version = "1.0.0"

repositories {
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maven stuff
GROUP=com.mikepenz
VERSION_NAME=0.2.2
VERSION_CODE=202
VERSION_NAME=0.3.0
VERSION_CODE=300

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

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import org.intellij.markdown.parser.MarkdownParser
@Composable
fun Markdown(
content: String,
modifier: Modifier = Modifier,
modifier: Modifier = Modifier.fillMaxSize(),
flavour: MarkdownFlavourDescriptor = GFMFlavourDescriptor()
) {
Column(modifier) {
Expand Down

0 comments on commit 718f355

Please sign in to comment.