From b7a5eac3fc848501735b3520fc12f6f5d21b9bd4 Mon Sep 17 00:00:00 2001
From: Vadim Mishenev <vad-mishenev@yandex.ru>
Date: Fri, 16 Dec 2022 01:27:30 +0200
Subject: Display `SinceKotlin` everywhere (#2708)

* Introduce `extraOptions`

* Make 'SinceKotlin' option

* Display 'SinceKotlin' everywhere

* Dump API

* Fix CLI bug

* Show custom tags in property brief

* Show custom tags in extension brief

* Show `SinceKotlin` for TypeAlias

* Fix `stdlib.diff`

* Add a test

* Display doc for actual typealias

* Propagate SinceKotlin

* Refactor

* Refactor in `SinceKotlinTransformer`

* Revert "Introduce `extraOptions`"

This reverts commit b83fdf5da31a97e2ae037f46a735d34a2f84d2ec.

* Revert "Make 'SinceKotlin' option"

This reverts commit 69f4641d1776f3a4bcd361919212c2de7fa2364e.

* Introduce `dokka.SinceKotlin` system property instead of extra arg

* Fix API

* Fix tests

* Rename

* Spread on extensions

* Put doc and rename prop
---
 .../cli/src/main/kotlin/org/jetbrains/dokka/main.kt    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'runners/cli/src/main/kotlin/org/jetbrains')

diff --git a/runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt b/runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt
index aca57f7e..7fe782a9 100644
--- a/runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt
+++ b/runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt
@@ -408,18 +408,18 @@ fun parseLinks(links: List<String>): List<ExternalDocumentationLink> {
 }
 
 fun initializeConfiguration(globalArguments: GlobalArguments): DokkaConfiguration = if (globalArguments.json != null) {
-        val jsonContent = Paths.get(checkNotNull(globalArguments.json)).toFile().readText()
-        val globals = GlobalDokkaConfiguration(jsonContent)
-        val dokkaConfigurationImpl = DokkaConfigurationImpl(jsonContent)
+    val jsonContent = Paths.get(checkNotNull(globalArguments.json)).toFile().readText()
+    val globals = GlobalDokkaConfiguration(jsonContent)
+    val dokkaConfigurationImpl = DokkaConfigurationImpl(jsonContent)
 
-        dokkaConfigurationImpl.apply(globals).apply {
-            sourceSets.forEach {
-                it.externalDocumentationLinks.cast<MutableSet<ExternalDocumentationLink>>().addAll(defaultLinks(it))
-            }
+    dokkaConfigurationImpl.apply(globals).apply {
+        sourceSets.forEach {
+            it.externalDocumentationLinks.cast<MutableSet<ExternalDocumentationLink>>().addAll(defaultLinks(it))
         }
-    } else {
-        globalArguments
     }
+} else {
+    globalArguments
+}
 
 fun main(args: Array<String>) {
     val globalArguments = GlobalArguments(args)
-- 
cgit