From 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 Mon Sep 17 00:00:00 2001
From: Ignat Beresnev <ignat.beresnev@jetbrains.com>
Date: Fri, 10 Nov 2023 11:46:54 +0100
Subject: Restructure the project to utilize included builds (#3174)

* Refactor and simplify artifact publishing
* Update Gradle to 8.4
* Refactor and simplify convention plugins and build scripts

Fixes #3132

---------

Co-authored-by: Adam <897017+aSemy@users.noreply.github.com>
Co-authored-by: Oleg Yukhnevich <whyoleg@gmail.com>
---
 .../src/main/kotlin/utils/TestOutputWriter.kt      | 47 ----------------------
 .../utils/assertHtmlEqualsIgnoringWhitespace.kt    | 24 -----------
 2 files changed, 71 deletions(-)
 delete mode 100644 plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt
 delete mode 100644 plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt

(limited to 'plugins/base/base-test-utils/src/main/kotlin/utils')

diff --git a/plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt b/plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt
deleted file mode 100644
index 089a94ca..00000000
--- a/plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-package utils
-
-import org.jetbrains.dokka.base.DokkaBase
-import org.jetbrains.dokka.base.renderers.OutputWriter
-import org.jetbrains.dokka.plugability.DokkaPlugin
-import org.jetbrains.dokka.plugability.DokkaPluginApiPreview
-import org.jetbrains.dokka.plugability.Extension
-import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement
-import java.util.*
-
-public class TestOutputWriterPlugin(failOnOverwrite: Boolean = true) : DokkaPlugin() {
-    public val writer: TestOutputWriter = TestOutputWriter(failOnOverwrite)
-
-    private val dokkaBase by lazy { plugin<DokkaBase>() }
-
-    public val testWriter: Extension<OutputWriter, *, *> by extending {
-        (dokkaBase.outputWriter
-                with writer
-                override dokkaBase.fileWriter)
-    }
-
-    @OptIn(DokkaPluginApiPreview::class)
-    override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement =
-        PluginApiPreviewAcknowledgement
-}
-
-public class TestOutputWriter(
-    private val failOnOverwrite: Boolean = true
-) : OutputWriter {
-    public val contents: Map<String, String> get() = _contents
-    private val _contents = Collections.synchronizedMap(mutableMapOf<String, String>())
-
-    override suspend fun write(path: String, text: String, ext: String) {
-        val fullPath = "$path$ext"
-        _contents.putIfAbsent(fullPath, text)?.also {
-            if (failOnOverwrite) throw AssertionError("File $fullPath is being overwritten.")
-        }
-    }
-
-    override suspend fun writeResources(pathFrom: String, pathTo: String) {
-        write(pathTo, "*** content of $pathFrom ***", "")
-    }
-}
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
deleted file mode 100644
index 207ebb8a..00000000
--- a/plugins/base/base-test-utils/src/main/kotlin/utils/assertHtmlEqualsIgnoringWhitespace.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-package utils
-
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
-import kotlin.test.assertEquals
-
-/**
- * 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
- */
-public fun assertHtmlEqualsIgnoringWhitespace(expected: String, actual: String) {
-    val ignoreFormattingSettings = Document.OutputSettings().indentAmount(0).outline(true)
-    assertEquals(
-        Jsoup.parse(expected).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine(),
-        Jsoup.parse(actual).outputSettings(ignoreFormattingSettings).outerHtml().trimSpacesAtTheEndOfLine()
-    )
-}
-
-private fun String.trimSpacesAtTheEndOfLine(): String =
-    replace(" \n", "\n")
-- 
cgit