Refactoring internal communication for gradle

3 files changed, 49 insertions, 16 deletions

diff --git a/integration/build.gradle b/integration/build.gradle
index 2f6514cb..55ac9dca 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -9,4 +9,5 @@ apply plugin: 'kotlin'
 dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_for_gradle_version
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_version
+    compile 'com.github.yole:jkid:7d9c529c87'
 }
\ No newline at end of file
diff --git a/integration/src/main/kotlin/org/jetbrains/dokka/DokkaBootstrap.kt b/integration/src/main/kotlin/org/jetbrains/dokka/DokkaBootstrap.kt
index 845f86a6..b78eb9c6 100644
--- a/integration/src/main/kotlin/org/jetbrains/dokka/DokkaBootstrap.kt
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/DokkaBootstrap.kt
@@ -4,22 +4,7 @@ import java.util.function.BiConsumer
 
 interface DokkaBootstrap {
 
-    fun configure(logger: BiConsumer<String, String>,
-                  moduleName: String,
-                  classpath: List<String>,
-                  sources: List<String>,
-                  samples: List<String>,
-                  includes: List<String>,
-                  outputDir: String,
-                  format: String,
-                  includeNonPublic: Boolean,
-                  includeRootPackage: Boolean,
-                  reportUndocumented: Boolean,
-                  skipEmptyPackages: Boolean,
-                  skipDeprecated: Boolean,
-                  jdkVersion: Int,
-                  generateIndexPages: Boolean,
-                  sourceLinks: List<String>)
+    fun configure(logger: BiConsumer<String, String>, serializedConfigurationJSON: String)
 
     fun generate()
 }
\ 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
new file mode 100644
index 00000000..90ba41ce
--- /dev/null
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
@@ -0,0 +1,47 @@
+package org.jetbrains.dokka
+
+
+interface DokkaConfiguration {
+    val moduleName: String
+    val classpath: List<String>
+    val sourceRoots: List<SourceRoot>
+    val samples: List<String>
+    val includes: List<String>
+    val outputDir: String
+    val format: String
+    val includeNonPublic: Boolean
+    val includeRootPackage: Boolean
+    val reportUndocumented: Boolean
+    val skipEmptyPackages: Boolean
+    val skipDeprecated: Boolean
+    val jdkVersion: Int
+    val generateIndexPages: Boolean
+    val sourceLinks: List<SourceLinkDefinition>
+
+    interface SourceRoot {
+        val path: String
+        val defaultPlatforms: List<String>
+    }
+
+    interface SourceLinkDefinition {
+        val path: String
+        val url: String
+        val lineSuffix: String?
+    }
+}
+
+data class SerializeOnlyDokkaConfiguration(override val moduleName: String,
+                                           override val classpath: List<String>,
+                                           override val sourceRoots: List<DokkaConfiguration.SourceRoot>,
+                                           override val samples: List<String>,
+                                           override val includes: List<String>,
+                                           override val outputDir: String,
+                                           override val format: String,
+                                           override val includeNonPublic: Boolean,
+                                           override val includeRootPackage: Boolean,
+                                           override val reportUndocumented: Boolean,
+                                           override val skipEmptyPackages: Boolean,
+                                           override val skipDeprecated: Boolean,
+                                           override val jdkVersion: Int,
+                                           override val generateIndexPages: Boolean,
+                                           override val sourceLinks: List<DokkaConfiguration.SourceLinkDefinition>) : DokkaConfiguration