Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump kotlinx html to 0.7.3 #1819

Merged
merged 2 commits into from Apr 8, 2021
Merged

Bump kotlinx html to 0.7.3 #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb7a8c9
Bump kotlinx html to 0.7.3
MarcinAman Apr 2, 2021
ed87016
Update repositories
MarcinAman Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Expand Up @@ -36,6 +36,11 @@ allprojects {
mavenCentral()
maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
maven(url = "https://dl.bintray.com/kotlin/kotlin-dev")
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") {
content {
includeGroup("org.jetbrains.kotlinx")
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ dokka_integration_test_parallelism=2
# Versions
kotlin_version=1.4.32
coroutines_version=1.4.1
kotlinx_html_version=0.7.2
kotlinx_html_version=0.7.3
kotlin_plugin_version=212-1.4.32-release-IJ1314
idea_version=202.7660.26
language_version=1.4
Expand Down
5 changes: 5 additions & 0 deletions integration-tests/gradle/projects/template.root.gradle.kts
View file
Open in desktop
Expand Up @@ -6,6 +6,11 @@ allprojects {
google()
maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap")
maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev")
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") {
content {
includeGroup("org.jetbrains.kotlinx")
}
}
}
}

Expand Down
6 changes: 5 additions & 1 deletion integration-tests/maven/projects/biojava/biojava.diff
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9a..ef4f28225 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -22,9 +22,36 @@
@@ -26,9 +26,40 @@
</license>
</licenses>

Expand All @@ -19,6 +19,10 @@ index 6cc9c6c9a..ef4f28225 100644
+ <id>jcenter</id>
+ <url>https://jcenter.bintray.com/</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>space</id>
+ <url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
Expand Down
5 changes: 5 additions & 0 deletions integration-tests/maven/projects/it-maven/pom.xml
View file
Open in desktop
Expand Up @@ -171,6 +171,11 @@
<name>JCenter</name>
<url>https://cache-redirector.jetbrains.com/jcenter.bintray.com/</url>
</pluginRepository>
<pluginRepository>
<id>Space</id>
<name>Space</name>
<url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plugins/base/src/main/kotlin/renderers/html/Tags.kt
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ open class WBR(initialAttributes: Map<String, String>, consumer: TagConsumer<*>)
HTMLTag("wbr", consumer, initialAttributes, namespace = null, inlineTag = true, emptyTag = false),
HtmlBlockInlineTag

fun FlowOrPhrasingOrMetaDataContent.templateCommand(data: Command, block: TemplateBlock = {}): Unit =
fun FlowOrMetaDataContent.templateCommand(data: Command, block: TemplateBlock = {}): Unit =
(consumer as? ImmediateResolutionTagConsumer)?.processCommand(data, block)
?: TemplateCommand(attributesMapOf("data", toJsonString(data)), consumer).visit(block)

Expand Down