From 49800d9c8276ec8851bcc3b181563cd6e0f8f4b9 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Mon, 8 Apr 2019 17:22:04 +0200 Subject: Implement Gradle Pass Configuration --- core/src/main/kotlin/DokkaBootstrapImpl.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'core/src') diff --git a/core/src/main/kotlin/DokkaBootstrapImpl.kt b/core/src/main/kotlin/DokkaBootstrapImpl.kt index 2077458a..b48b62d4 100644 --- a/core/src/main/kotlin/DokkaBootstrapImpl.kt +++ b/core/src/main/kotlin/DokkaBootstrapImpl.kt @@ -1,8 +1,6 @@ package org.jetbrains.dokka -import com.intellij.openapi.util.Pass -import kotlinx.serialization.* -import kotlinx.serialization.json.Json +import com.google.gson.Gson import org.jetbrains.dokka.DokkaConfiguration.PackageOptions import java.util.function.BiConsumer @@ -41,9 +39,7 @@ class DokkaBootstrapImpl : DokkaBootstrap { } lateinit var generator: DokkaGenerator - - override fun configure(logger: BiConsumer, serializedConfigurationJSON: String) - = configure(DokkaProxyLogger(logger), Json.parse(DokkaConfigurationImpl.serializer(), serializedConfigurationJSON)) + val gson = Gson() fun configure(logger: DokkaLogger, configuration: DokkaConfigurationImpl) = with(configuration) { @@ -73,5 +69,8 @@ class DokkaBootstrapImpl : DokkaBootstrap { generator = DokkaGenerator(configurationWithLinks, logger) } + override fun configure(logger: BiConsumer, serializedConfigurationJSON: String) + = configure(DokkaProxyLogger(logger), gson.fromJson(serializedConfigurationJSON, DokkaConfigurationImpl::class.java)) + override fun generate() = generator.generate() } -- cgit