aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVsevolod Tolstopyatov <qwwdfsad@gmail.com>2023-03-27 03:01:34 -0700
committerGitHub <noreply@github.com>2023-03-27 13:01:34 +0300
commit9af0b307a14253a21d11d340a78dd9061abee359 (patch)
treecbd2af142d1833b32f657a2eb6b8ed7b6ba0e510
parentb9e9962f75bfd6b19c16eccf7d4d6608b8f5db1e (diff)
downloaddokka-9af0b307a14253a21d11d340a78dd9061abee359.tar.gz
dokka-9af0b307a14253a21d11d340a78dd9061abee359.tar.bz2
dokka-9af0b307a14253a21d11d340a78dd9061abee359.zip
Mark utilities.* API as Dokka-internal (#2937)
* Deprecate unused declaration, remove inline declaration (as it's binary compatible), opt-in into internal API at project level * Opt-in into DokkaInternalApi where applicable * Get rid of intermediate test-utils module
-rw-r--r--build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts2
-rw-r--r--build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts8
-rw-r--r--build.gradle.kts3
-rw-r--r--core/api/core.api1
-rw-r--r--core/build.gradle.kts6
-rw-r--r--core/src/main/kotlin/utilities/DokkaLogging.kt2
-rw-r--r--core/src/main/kotlin/utilities/Html.kt4
-rw-r--r--core/src/main/kotlin/utilities/ServiceLocator.kt7
-rw-r--r--core/src/main/kotlin/utilities/Uri.kt6
-rw-r--r--core/src/main/kotlin/utilities/associateWithNotNull.kt3
-rw-r--r--core/src/main/kotlin/utilities/cast.kt3
-rw-r--r--core/src/main/kotlin/utilities/parallelCollectionOperations.kt4
-rw-r--r--integration-tests/build.gradle.kts2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt17
-rw-r--r--integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt2
-rw-r--r--plugins/all-modules-page/build.gradle.kts1
-rw-r--r--plugins/android-documentation/build.gradle.kts1
-rw-r--r--plugins/base/base-test-utils/build.gradle.kts1
-rw-r--r--plugins/base/build.gradle.kts1
-rw-r--r--plugins/gfm/build.gradle.kts1
-rw-r--r--plugins/gfm/gfm-template-processing/build.gradle.kts1
-rw-r--r--plugins/javadoc/build.gradle.kts1
-rw-r--r--plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/Asserts.kt (renamed from test-utils/src/main/kotlin/org/jetbrains/dokka/test/assertIsInstance.kt)6
-rw-r--r--plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt1
-rw-r--r--plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt1
-rw-r--r--plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt1
-rw-r--r--plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt1
-rw-r--r--plugins/jekyll/build.gradle.kts1
-rw-r--r--plugins/jekyll/jekyll-template-processing/build.gradle.kts1
-rw-r--r--plugins/kotlin-as-java/build.gradle.kts1
-rw-r--r--plugins/mathjax/build.gradle.kts1
-rw-r--r--plugins/templating/build.gradle.kts1
-rw-r--r--plugins/versioning/build.gradle.kts1
-rw-r--r--runners/gradle-plugin/build.gradle.kts1
-rw-r--r--settings.gradle.kts2
-rw-r--r--test-utils/build.gradle.kts7
-rw-r--r--test-utils/src/main/kotlin/org/jetbrains/dokka/test/assumeAndroidSdkInstalled.kt8
-rw-r--r--test-utils/src/main/kotlin/org/jetbrains/dokka/test/environmentUtils.kt9
38 files changed, 54 insertions, 66 deletions
diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
index befec76f..0dbac364 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
@@ -43,4 +43,6 @@ dependencies {
// repetitive, but more declarative and clear), or some other solution.
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+ // kotlin-test asserts for all projects
+ testImplementation(kotlin("test-junit"))
}
diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
index c07fc092..28a8d76d 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
@@ -11,15 +11,21 @@ plugins {
configureDokkaVersion()
+val projectsWithoutOptInDependency = setOf(
+ ":integration-tests", ":integration-tests:gradle", ":integration-tests:maven", ":integration-tests:cli")
+
tasks.withType<KotlinCompile>().configureEach {
+ // By path because Dokka has multiple projects with the same name (i.e. 'cli')
+ if (project.path in projectsWithoutOptInDependency) return@configureEach
compilerOptions {
freeCompilerArgs.addAll(
listOf(
"-opt-in=kotlin.RequiresOptIn",
+ "-opt-in=org.jetbrains.dokka.InternalDokkaApi",
"-Xjsr305=strict",
"-Xskip-metadata-version-check",
// need 1.4 support, otherwise there might be problems with Gradle 6.x (it's bundling Kotlin 1.4)
- "-Xsuppress-version-warnings"
+ "-Xsuppress-version-warnings",
)
)
allWarningsAsErrors.set(true)
diff --git a/build.gradle.kts b/build.gradle.kts
index 5e46c365..69c44973 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
import org.jetbrains.ValidatePublications
+import org.jetbrains.kotlin.gradle.tasks.*
import org.jetbrains.publicationChannels
@Suppress("DSL_SCOPE_VIOLATION") // fixed in Gradle 8.1 https://github.com/gradle/gradle/pull/23639
@@ -50,7 +51,5 @@ apiValidation {
"gradle", // :integration-tests:gradle
"cli", // :integration-tests:cli
"maven", // integration-tests:maven
-
- "test-utils", // :test-utils
)
}
diff --git a/core/api/core.api b/core/api/core.api
index ddd77a5c..d66c5d9e 100644
--- a/core/api/core.api
+++ b/core/api/core.api
@@ -4580,7 +4580,6 @@ public final class org/jetbrains/dokka/utilities/DokkaConsoleLogger : org/jetbra
public fun debug (Ljava/lang/String;)V
public fun error (Ljava/lang/String;)V
public fun getErrorsCount ()I
- public final fun getMinLevel ()Lorg/jetbrains/dokka/utilities/LoggingLevel;
public fun getWarningsCount ()I
public fun info (Ljava/lang/String;)V
public fun progress (Ljava/lang/String;)V
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 49b022ef..ded27ec7 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -40,12 +40,6 @@ tasks {
}
}
-tasks.withType(KotlinCompile::class).all {
- kotlinOptions {
- freeCompilerArgs = freeCompilerArgs + listOf("-opt-in=org.jetbrains.dokka.InternalDokkaApi",)
- }
-}
-
registerDokkaArtifactPublication("dokkaCore") {
artifactId = "dokka-core"
}
diff --git a/core/src/main/kotlin/utilities/DokkaLogging.kt b/core/src/main/kotlin/utilities/DokkaLogging.kt
index 39529324..5cca6d53 100644
--- a/core/src/main/kotlin/utilities/DokkaLogging.kt
+++ b/core/src/main/kotlin/utilities/DokkaLogging.kt
@@ -39,7 +39,7 @@ fun interface MessageEmitter : (String) -> Unit {
}
class DokkaConsoleLogger(
- val minLevel: LoggingLevel = LoggingLevel.PROGRESS,
+ private val minLevel: LoggingLevel = LoggingLevel.PROGRESS,
private val emitter: MessageEmitter = MessageEmitter.consoleEmitter
) : DokkaLogger {
private val warningsCounter = AtomicInteger()
diff --git a/core/src/main/kotlin/utilities/Html.kt b/core/src/main/kotlin/utilities/Html.kt
index 874c9fb1..a1d8ecec 100644
--- a/core/src/main/kotlin/utilities/Html.kt
+++ b/core/src/main/kotlin/utilities/Html.kt
@@ -1,5 +1,6 @@
package org.jetbrains.dokka.utilities
+import org.jetbrains.dokka.*
import java.net.URLEncoder
@@ -7,9 +8,12 @@ import java.net.URLEncoder
* Replaces symbols reserved in HTML with their respective entities.
* Replaces & with &amp;, < with &lt; and > with &gt;
*/
+@InternalDokkaApi
fun String.htmlEscape(): String = replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
+@InternalDokkaApi
fun String.urlEncoded(): String = URLEncoder.encode(this, "UTF-8")
+@InternalDokkaApi
fun String.formatToEndWithHtml() =
if (endsWith(".html") || contains(Regex("\\.html#"))) this else "$this.html"
diff --git a/core/src/main/kotlin/utilities/ServiceLocator.kt b/core/src/main/kotlin/utilities/ServiceLocator.kt
index 3e515348..f86960ec 100644
--- a/core/src/main/kotlin/utilities/ServiceLocator.kt
+++ b/core/src/main/kotlin/utilities/ServiceLocator.kt
@@ -1,5 +1,6 @@
package org.jetbrains.dokka.utilities
+import org.jetbrains.dokka.*
import java.io.File
import java.net.URISyntaxException
import java.net.URL
@@ -7,10 +8,13 @@ import java.util.*
import java.util.jar.JarFile
import java.util.zip.ZipEntry
+@InternalDokkaApi
data class ServiceDescriptor(val name: String, val category: String, val description: String?, val className: String)
+@InternalDokkaApi
class ServiceLookupException(message: String) : Exception(message)
+@InternalDokkaApi
object ServiceLocator {
fun <T : Any> lookup(clazz: Class<T>, category: String, implementationName: String): T {
val descriptor = lookupDescriptor(category, implementationName)
@@ -81,9 +85,6 @@ object ServiceLocator {
}
}
-inline fun <reified T : Any> ServiceLocator.lookup(category: String, implementationName: String): T = lookup(T::class.java, category, implementationName)
-inline fun <reified T : Any> ServiceLocator.lookup(desc: ServiceDescriptor): T = lookup(T::class.java, desc)
-
private val ZipEntry.fileName: String
get() = name.substringAfterLast("/", name)
diff --git a/core/src/main/kotlin/utilities/Uri.kt b/core/src/main/kotlin/utilities/Uri.kt
index 089b3cff..67c81d98 100644
--- a/core/src/main/kotlin/utilities/Uri.kt
+++ b/core/src/main/kotlin/utilities/Uri.kt
@@ -1,8 +1,10 @@
package org.jetbrains.dokka.utilities
+import org.jetbrains.dokka.*
import java.net.URI
-
+@InternalDokkaApi
+@Deprecated("Deprecated for removal") // Unused in Dokka
fun URI.relativeTo(uri: URI): URI {
// Normalize paths to remove . and .. segments
val base = uri.normalize()
@@ -37,4 +39,4 @@ fun URI.relativeTo(uri: URI): URI {
append(it)
}
})
-} \ No newline at end of file
+}
diff --git a/core/src/main/kotlin/utilities/associateWithNotNull.kt b/core/src/main/kotlin/utilities/associateWithNotNull.kt
index ea2e8c3c..6c0bf4d8 100644
--- a/core/src/main/kotlin/utilities/associateWithNotNull.kt
+++ b/core/src/main/kotlin/utilities/associateWithNotNull.kt
@@ -1,5 +1,8 @@
package org.jetbrains.dokka.utilities
+import org.jetbrains.dokka.*
+
+@InternalDokkaApi
inline fun <K, V : Any> Iterable<K>.associateWithNotNull(valueSelector: (K) -> V?): Map<K, V> {
@Suppress("UNCHECKED_CAST")
return associateWith { valueSelector(it) }.filterValues { it != null } as Map<K, V>
diff --git a/core/src/main/kotlin/utilities/cast.kt b/core/src/main/kotlin/utilities/cast.kt
index d4a8d73d..784b7e2a 100644
--- a/core/src/main/kotlin/utilities/cast.kt
+++ b/core/src/main/kotlin/utilities/cast.kt
@@ -1,5 +1,8 @@
package org.jetbrains.dokka.utilities
+import org.jetbrains.dokka.*
+
+@InternalDokkaApi
inline fun <reified T> Any.cast(): T {
return this as T
}
diff --git a/core/src/main/kotlin/utilities/parallelCollectionOperations.kt b/core/src/main/kotlin/utilities/parallelCollectionOperations.kt
index 35ad48fd..d24aa7a6 100644
--- a/core/src/main/kotlin/utilities/parallelCollectionOperations.kt
+++ b/core/src/main/kotlin/utilities/parallelCollectionOperations.kt
@@ -1,15 +1,19 @@
package org.jetbrains.dokka.utilities
import kotlinx.coroutines.*
+import org.jetbrains.dokka.*
+@InternalDokkaApi
suspend inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> = coroutineScope {
map { async { f(it) } }.awaitAll()
}
+@InternalDokkaApi
suspend inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> = coroutineScope {
map { async { f(it) } }.awaitAll().filterNotNull()
}
+@InternalDokkaApi
suspend inline fun <A> Iterable<A>.parallelForEach(crossinline f: suspend (A) -> Unit): Unit = coroutineScope {
forEach { launch { f(it) } }
}
diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
index 7f3eee42..a3173af0 100644
--- a/integration-tests/build.gradle.kts
+++ b/integration-tests/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
}
dependencies {
- api(projects.testUtils)
+ implementation(kotlin("test-junit"))
implementation(libs.kotlinx.coroutines.core)
implementation(libs.jsoup)
implementation(libs.eclipse.jgit)
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
index 8874bc58..95eaf596 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
@@ -1,10 +1,11 @@
package org.jetbrains.dokka.it.gradle
import org.gradle.testkit.runner.TaskOutcome
-import org.jetbrains.dokka.test.assumeAndroidSdkInstalled
+import org.junit.*
import org.junit.runners.Parameterized.Parameters
import java.io.File
import kotlin.test.*
+import kotlin.test.Test
class Android0GradleIntegrationTest(override val versions: BuildVersions) : AbstractGradleIntegrationTest() {
@@ -12,6 +13,20 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
@get:JvmStatic
@get:Parameters(name = "{0}")
val versions = TestedVersions.ANDROID
+
+ /**
+ * Indicating whether or not the current machine executing the test is a CI
+ */
+ private val isCI: Boolean get() = System.getenv("CI") == "true"
+
+ private val isAndroidSdkInstalled: Boolean = System.getenv("ANDROID_SDK_ROOT") != null ||
+ System.getenv("ANDROID_HOME") != null
+
+ fun assumeAndroidSdkInstalled() {
+ if (isCI) return
+ Assume.assumeTrue(isAndroidSdkInstalled)
+ }
+
}
@BeforeTest
diff --git a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt
index 312ff21f..9c549ae2 100644
--- a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt
+++ b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt
@@ -34,7 +34,7 @@ fun AbstractIntegrationTest.applyGitDiffFromFile(diffFile: File) {
private fun removeGitFile(repository: Path) =
repository.toFile()
.listFiles().orEmpty()
- .filter { it.name.toLowerCase() == ".git" }
+ .filter { it.name.lowercase() == ".git" }
.forEach { it.delete() }
diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts
index 1f648932..d0778dc5 100644
--- a/plugins/all-modules-page/build.gradle.kts
+++ b/plugins/all-modules-page/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
implementation(libs.kotlinx.html)
implementation(libs.jsoup)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/android-documentation/build.gradle.kts b/plugins/android-documentation/build.gradle.kts
index 9a94a44c..5ef734b8 100644
--- a/plugins/android-documentation/build.gradle.kts
+++ b/plugins/android-documentation/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
testImplementation(projects.plugins.base)
testImplementation(projects.plugins.base.baseTestUtils)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/base/base-test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts
index 924a96c8..2645fbc3 100644
--- a/plugins/base/base-test-utils/build.gradle.kts
+++ b/plugins/base/base-test-utils/build.gradle.kts
@@ -17,7 +17,6 @@ dependencies {
implementation(libs.jsoup)
implementation(kotlin("test-junit"))
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index b8e63b17..98a929ae 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -30,7 +30,6 @@ dependencies {
implementation(libs.kotlinx.html)
testImplementation(projects.kotlinAnalysis)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 6cdadefb..da64c0e9 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
testImplementation(projects.plugins.base)
testImplementation(projects.plugins.base.baseTestUtils)
implementation(libs.jackson.kotlin)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/gfm/gfm-template-processing/build.gradle.kts b/plugins/gfm/gfm-template-processing/build.gradle.kts
index 75634ed2..021adae2 100644
--- a/plugins/gfm/gfm-template-processing/build.gradle.kts
+++ b/plugins/gfm/gfm-template-processing/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
implementation(libs.kotlinx.coroutines.core)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index 97e3a046..462e966f 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
implementation(libs.kotlinx.coroutines.core)
testImplementation(projects.plugins.base.baseTestUtils)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(libs.jsoup)
diff --git a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/assertIsInstance.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/Asserts.kt
index d646d385..9f48b1db 100644
--- a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/assertIsInstance.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/Asserts.kt
@@ -1,8 +1,8 @@
-package org.jetbrains.dokka.test
+package org.jetbrains.dokka.javadoc
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
+import kotlin.contracts.*
+// TODO replace with assertIs<T> from kotlin-test as part of #2924
@OptIn(ExperimentalContracts::class)
inline fun <reified T> assertIsInstance(obj: Any?): T {
contract {
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
index f62c1886..6bfd068a 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
@@ -4,7 +4,6 @@ import org.jetbrains.dokka.javadoc.pages.AllClassesPage
import org.jetbrains.dokka.javadoc.pages.LinkJavadocListEntry
import org.jetbrains.dokka.links.DRI
import org.jetbrains.dokka.pages.ContentKind
-import org.jetbrains.dokka.test.assertIsInstance
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
index 0f8d7e79..65fbd30f 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
@@ -3,7 +3,6 @@ package org.jetbrains.dokka.javadoc
import org.jetbrains.dokka.javadoc.pages.JavadocClasslikePageNode
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import org.jetbrains.dokka.test.assertIsInstance
internal class JavadocClasslikeTemplateMapTest : AbstractJavadocTemplateMapTest() {
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
index f6b8439f..b647cd6e 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
@@ -3,7 +3,6 @@ package org.jetbrains.dokka.javadoc
import org.jetbrains.dokka.javadoc.pages.JavadocModulePageNode
import org.jetbrains.dokka.javadoc.pages.RowJavadocListEntry
import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.test.assertIsInstance
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.io.File
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt
index 4a761ca6..a02b01fa 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt
@@ -4,7 +4,6 @@ import org.jetbrains.dokka.javadoc.pages.JavadocContentKind
import org.jetbrains.dokka.javadoc.pages.JavadocPackagePageNode
import org.jetbrains.dokka.javadoc.pages.RowJavadocListEntry
import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.test.assertIsInstance
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.io.File
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 489b5e00..ab99e220 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
implementation(projects.plugins.base)
implementation(projects.plugins.gfm)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/jekyll/jekyll-template-processing/build.gradle.kts b/plugins/jekyll/jekyll-template-processing/build.gradle.kts
index 354c4ee7..936c77bd 100644
--- a/plugins/jekyll/jekyll-template-processing/build.gradle.kts
+++ b/plugins/jekyll/jekyll-template-processing/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
implementation(libs.kotlinx.coroutines.core)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index cfebcfaa..471578db 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
testImplementation(libs.jsoup)
testImplementation(projects.kotlinAnalysis)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index d4e5979a..8b155862 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
testImplementation(kotlin("test-junit"))
testImplementation(projects.kotlinAnalysis)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/templating/build.gradle.kts b/plugins/templating/build.gradle.kts
index e4ed093e..1111bfad 100644
--- a/plugins/templating/build.gradle.kts
+++ b/plugins/templating/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
implementation(libs.jsoup)
testImplementation(projects.plugins.base.baseTestUtils)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts
index d2363429..2cb40708 100644
--- a/plugins/versioning/build.gradle.kts
+++ b/plugins/versioning/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
implementation(libs.jsoup)
implementation(libs.apache.mavenArtifact)
- testImplementation(projects.testUtils)
testImplementation(projects.core.testApi)
testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index 51645992..afb3c02c 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
compileOnly(libs.gradlePlugin.kotlin)
compileOnly(libs.gradlePlugin.android)
- testImplementation(projects.testUtils)
testImplementation(libs.gradlePlugin.kotlin)
testImplementation(libs.gradlePlugin.android)
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e3f493e3..42fc9fdd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -88,8 +88,6 @@ include(
":integration-tests:cli",
":integration-tests:maven",
- ":test-utils",
-
":mkdocs",
)
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
deleted file mode 100644
index 6bd501b7..00000000
--- a/test-utils/build.gradle.kts
+++ /dev/null
@@ -1,7 +0,0 @@
-plugins {
- id("org.jetbrains.conventions.kotlin-jvm")
-}
-
-dependencies {
- api(kotlin("test-junit"))
-}
diff --git a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/assumeAndroidSdkInstalled.kt b/test-utils/src/main/kotlin/org/jetbrains/dokka/test/assumeAndroidSdkInstalled.kt
deleted file mode 100644
index 0c0e6d31..00000000
--- a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/assumeAndroidSdkInstalled.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jetbrains.dokka.test
-
-import org.junit.Assume.assumeTrue
-
-fun assumeAndroidSdkInstalled() {
- if (isCI) return
- assumeTrue(isAndroidSdkInstalled)
-}
diff --git a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/environmentUtils.kt b/test-utils/src/main/kotlin/org/jetbrains/dokka/test/environmentUtils.kt
deleted file mode 100644
index e9b7be95..00000000
--- a/test-utils/src/main/kotlin/org/jetbrains/dokka/test/environmentUtils.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.jetbrains.dokka.test
-
-/**
- * Indicating whether or not the current machine executing the test is a CI
- */
-val isCI: Boolean get() = System.getenv("CI") == "true"
-
-val isAndroidSdkInstalled: Boolean = System.getenv("ANDROID_SDK_ROOT") != null ||
- System.getenv("ANDROID_HOME") != null