diff --git a/build.gradle.kts b/build.gradle.kts index dcbba23296..2b3d1a1828 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") + } + } } } diff --git a/gradle.properties b/gradle.properties index cdec05d38a..bf8888b9d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/integration-tests/gradle/projects/template.root.gradle.kts b/integration-tests/gradle/projects/template.root.gradle.kts index f76d616be9..f63c28e754 100644 --- a/integration-tests/gradle/projects/template.root.gradle.kts +++ b/integration-tests/gradle/projects/template.root.gradle.kts @@ -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") + } + } } } diff --git a/integration-tests/maven/projects/biojava/biojava.diff b/integration-tests/maven/projects/biojava/biojava.diff index 84fbe50f60..8b27c4ffbb 100644 --- a/integration-tests/maven/projects/biojava/biojava.diff +++ b/integration-tests/maven/projects/biojava/biojava.diff @@ -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 @@ @@ -19,6 +19,10 @@ index 6cc9c6c9a..ef4f28225 100644 + jcenter + https://jcenter.bintray.com/ + ++ ++ space ++ https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/ ++ + + diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml index 8c027d72b6..cfc8ba6690 100644 --- a/integration-tests/maven/projects/it-maven/pom.xml +++ b/integration-tests/maven/projects/it-maven/pom.xml @@ -171,6 +171,11 @@ JCenter https://cache-redirector.jetbrains.com/jcenter.bintray.com/ + + Space + Space + https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/ + diff --git a/plugins/base/src/main/kotlin/renderers/html/Tags.kt b/plugins/base/src/main/kotlin/renderers/html/Tags.kt index 0da16a1aff..729fc966ec 100644 --- a/plugins/base/src/main/kotlin/renderers/html/Tags.kt +++ b/plugins/base/src/main/kotlin/renderers/html/Tags.kt @@ -17,7 +17,7 @@ open class WBR(initialAttributes: Map, 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)