aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2021-04-06 15:45:25 +0200
committerGitHub <noreply@github.com>2021-04-06 15:45:25 +0200
commitcd071a5e07c8202c66db2e077ea43bea76d55511 (patch)
tree92521ce567712085748acb5411be645e196dd0ef /plugins
parentb7011e857a0a8c110791d2109458fe9fd7fdaaab (diff)
downloaddokka-cd071a5e07c8202c66db2e077ea43bea76d55511.tar.gz
dokka-cd071a5e07c8202c66db2e077ea43bea76d55511.tar.bz2
dokka-cd071a5e07c8202c66db2e077ea43bea76d55511.zip
Bump jsoup from 1.12.1 to 1.13.1 (#1783)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/all-modules-page/build.gradle.kts2
-rw-r--r--plugins/base/base-test-utils/build.gradle.kts2
-rw-r--r--plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt6
-rw-r--r--plugins/base/build.gradle.kts2
-rw-r--r--plugins/kotlin-as-java/build.gradle.kts2
-rw-r--r--plugins/mathjax/build.gradle.kts2
-rw-r--r--plugins/templating/build.gradle.kts2
-rw-r--r--plugins/versioning/build.gradle.kts2
8 files changed, 11 insertions, 9 deletions
diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts
index 0fe46579..dd423949 100644
--- a/plugins/all-modules-page/build.gradle.kts
+++ b/plugins/all-modules-page/build.gradle.kts
@@ -20,5 +20,5 @@ dependencies {
val kotlinx_html_version: String by project
implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
- implementation("org.jsoup:jsoup:1.12.1")
+ implementation("org.jsoup:jsoup:1.13.1")
} \ No newline at end of file
diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts
index 8be9a0db..3ae15b3e 100644
--- a/plugins/base/base-test-utils/build.gradle.kts
+++ b/plugins/base/base-test-utils/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.registerDokkaArtifactPublication
dependencies {
compileOnly(project(":plugins:base"))
implementation(project(":core:test-api"))
- implementation("org.jsoup:jsoup:1.12.1")
+ implementation("org.jsoup:jsoup:1.13.1")
implementation(kotlin("test-junit"))
}
diff --git a/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt b/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt
index f8ef8a41..95dcae4e 100644
--- a/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt
@@ -2,15 +2,17 @@ package utils
import junit.framework.Assert.assertEquals
import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
/**
* Parses it using JSOUP, trims whitespace at the end of the line and asserts if they are equal
* parsing is required to unify the formatting
*/
fun assertHtmlEqualsIgnoringWhitespace(expected: String, actual: String) {
+ val ignoreFormattingSettings = Document.OutputSettings().indentAmount(0).outline(true)
assertEquals(
- Jsoup.parse(expected).outerHtml().trimSpacesAtTheEndOfLine(),
- Jsoup.parse(actual).outerHtml().trimSpacesAtTheEndOfLine()
+ Jsoup.parse(expected).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine(),
+ Jsoup.parse(actual).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine()
)
}
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 8794925a..1281ac3f 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
api(project(":kotlin-analysis"))
- implementation("org.jsoup:jsoup:1.12.1")
+ implementation("org.jsoup:jsoup:1.13.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1")
testImplementation(project(":plugins:base:base-test-utils"))
testImplementation(project(":core:content-matcher-test-utils"))
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index 2c7f1e01..4cbce45a 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -5,7 +5,7 @@ dependencies {
testImplementation(project(":plugins:base"))
testImplementation(project(":plugins:base:base-test-utils"))
testImplementation(project(":core:content-matcher-test-utils"))
- testImplementation("org.jsoup:jsoup:1.12.1")
+ testImplementation("org.jsoup:jsoup:1.13.1")
}
registerDokkaArtifactPublication("kotlinAsJavaPlugin") {
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 448d9e6d..1d92c0be 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,7 +1,7 @@
import org.jetbrains.registerDokkaArtifactPublication
dependencies {
- testImplementation("org.jsoup:jsoup:1.12.1")
+ testImplementation("org.jsoup:jsoup:1.13.1")
testImplementation(project(":plugins:base"))
testImplementation(project(":plugins:base:base-test-utils"))
testImplementation(project(":core:content-matcher-test-utils"))
diff --git a/plugins/templating/build.gradle.kts b/plugins/templating/build.gradle.kts
index 6c160a9f..f62944fd 100644
--- a/plugins/templating/build.gradle.kts
+++ b/plugins/templating/build.gradle.kts
@@ -13,6 +13,6 @@ dependencies {
val kotlinx_html_version: String by project
implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
- implementation("org.jsoup:jsoup:1.12.1")
+ implementation("org.jsoup:jsoup:1.13.1")
testImplementation(project(":plugins:base:base-test-utils"))
} \ No newline at end of file
diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts
index 39cc0bdf..54249b90 100644
--- a/plugins/versioning/build.gradle.kts
+++ b/plugins/versioning/build.gradle.kts
@@ -14,6 +14,6 @@ dependencies {
val kotlinx_html_version: String by project
implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
- implementation("org.jsoup:jsoup:1.12.1")
+ implementation("org.jsoup:jsoup:1.13.1")
implementation("org.apache.maven:maven-artifact:3.6.3")
} \ No newline at end of file