Implement Gradle Pass Configuration

3 files changed, 6 insertions, 33 deletions

diff --git a/integration/build.gradle b/integration/build.gradle
index ce95844c..3f4297ee 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -3,12 +3,10 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
     }
 }
 
 apply plugin: 'kotlin'
-apply plugin: 'kotlinx-serialization'
 
 sourceCompatibility = 1.8
 
@@ -23,5 +21,5 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 dependencies {
     compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_for_gradle_runtime_version
     compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_runtime_version
-    compile "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.10.0"
+    implementation 'com.google.code.gson:gson:2.8.5'
 }
\ No newline at end of file
diff --git a/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt b/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
index 717fa477..49481089 100644
--- a/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
@@ -1,26 +1,7 @@
 package org.jetbrains.dokka
 
-import kotlinx.serialization.*
-import kotlinx.serialization.internal.StringDescriptor
 import java.net.URL
 
-
-@Serializer(forClass = URL::class)
-object UrlSerializer: KSerializer<URL> {
-
-    override val descriptor: SerialDescriptor =
-        StringDescriptor.withName("WithCustomDefault")
-
-    override fun deserialize(decoder: Decoder): URL {
-        return URL(decoder.decodeString())
-    }
-
-    override fun serialize(encoder: Encoder, obj: URL) {
-        encoder.encodeString(obj.toExternalForm())
-    }
-}
-
-
 enum class Platform(val key: String) {
     jvm("jvm"),
     js("js"),
@@ -97,8 +78,8 @@ interface DokkaConfiguration {
     }
 
     interface ExternalDocumentationLink {
-        @Serializable(with = UrlSerializer::class) val url: URL
-        @Serializable(with = UrlSerializer::class) val packageListUrl: URL
+        val url: URL
+        val packageListUrl: URL
 
         open class Builder(open var url: URL? = null,
                            open var packageListUrl: URL? = null) {
diff --git a/integration/src/main/kotlin/org/jetbrains/dokka/defaultConfiguration.kt b/integration/src/main/kotlin/org/jetbrains/dokka/defaultConfiguration.kt
index 615f0215..6d754ebc 100644
--- a/integration/src/main/kotlin/org/jetbrains/dokka/defaultConfiguration.kt
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/defaultConfiguration.kt
@@ -1,10 +1,8 @@
 package org.jetbrains.dokka
 
-import kotlinx.serialization.Serializable
 import java.io.File
 import java.net.URL
 
-@Serializable
 data class DokkaConfigurationImpl(
     override val outputDir: String,
     override val format: String,
@@ -14,7 +12,6 @@ data class DokkaConfigurationImpl(
     override val passesConfigurations: List<PassConfigurationImpl>
 ) : DokkaConfiguration
 
-@Serializable
 data class PassConfigurationImpl (
     override val moduleName: String,
     override val classpath: List<String>,
@@ -41,12 +38,11 @@ data class PassConfigurationImpl (
     override val sinceKotlin: String
 ) : DokkaConfiguration.PassConfiguration
 
-@Serializable
+
 data class SourceRootImpl(
     override val path: String
 ): DokkaConfiguration.SourceRoot
 
-@Serializable
 data class SourceLinkDefinitionImpl(
     override val path: String,
     override val url: String,
@@ -63,7 +59,6 @@ data class SourceLinkDefinitionImpl(
     }
 }
 
-@Serializable
 data class PackageOptionsImpl(
     override val prefix: String,
     override val includeNonPublic: Boolean,
@@ -73,7 +68,6 @@ data class PackageOptionsImpl(
 ): DokkaConfiguration.PackageOptions
 
 
-@Serializable
-data class ExternalDocumentationLinkImpl(@Serializable(with = UrlSerializer::class) override val url: URL,
-                                         @Serializable(with = UrlSerializer::class) override val packageListUrl: URL
+data class ExternalDocumentationLinkImpl(override val url: URL,
+                                         override val packageListUrl: URL
 ) : DokkaConfiguration.ExternalDocumentationLink
\ No newline at end of file