diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-12-16 01:27:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 01:27:30 +0200 |
| commit | b7a5eac3fc848501735b3520fc12f6f5d21b9bd4 (patch) | |
| tree | 42c066549023a3d3ecb953b3c2ba71f07ae22e90 /runners/cli/src/main | |
| parent | f6ea66cf10f399208ba5c8b01ad5bf323350f651 (diff) | |
| download | dokka-b7a5eac3fc848501735b3520fc12f6f5d21b9bd4.tar.gz dokka-b7a5eac3fc848501735b3520fc12f6f5d21b9bd4.tar.bz2 dokka-b7a5eac3fc848501735b3520fc12f6f5d21b9bd4.zip | |
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
Diffstat (limited to 'runners/cli/src/main')
| -rw-r--r-- | runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt | 18 |
1 files changed, 9 insertions, 9 deletions
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) |