From 0e8733ead6d5c4c6db7e4fe8a1f34b7598823290 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 11 May 2017 16:31:04 +0300
Subject: Add external documentation links argument to gradle, maven, ant

---
 core/src/main/kotlin/Generation/configurationImpl.kt | 14 ++------------
 core/src/main/kotlin/Kotlin/DocumentationBuilder.kt  |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'core/src')

diff --git a/core/src/main/kotlin/Generation/configurationImpl.kt b/core/src/main/kotlin/Generation/configurationImpl.kt
index 425b016b..b51857e7 100644
--- a/core/src/main/kotlin/Generation/configurationImpl.kt
+++ b/core/src/main/kotlin/Generation/configurationImpl.kt
@@ -3,7 +3,6 @@ package org.jetbrains.dokka
 import org.jetbrains.dokka.DokkaConfiguration.SourceLinkDefinition
 import org.jetbrains.dokka.DokkaConfiguration.SourceRoot
 import java.io.File
-import java.net.URL
 
 
 data class SourceLinkDefinitionImpl(override val path: String,
@@ -35,16 +34,6 @@ data class PackageOptionsImpl(override val prefix: String,
                               override val reportUndocumented: Boolean = true,
                               override val skipDeprecated: Boolean = false) : DokkaConfiguration.PackageOptions
 
-data class ExternalDocumentationLinkImpl(override val url: URL,
-                                         override val packageListUrl: URL) : DokkaConfiguration.ExternalDocumentationLink {
-    constructor(root: URL) : this(root, URL(root, "package-list"))
-
-    constructor(root: String) : this(URL(root))
-
-    constructor(root: String, packageListUrl: String) : this(URL(root), URL(packageListUrl))
-
-}
-
 data class DokkaConfigurationImpl(override val moduleName: String,
                                   override val classpath: List<String>,
                                   override val sourceRoots: List<SourceRootImpl>,
@@ -61,4 +50,5 @@ data class DokkaConfigurationImpl(override val moduleName: String,
                                   override val generateIndexPages: Boolean,
                                   override val sourceLinks: List<SourceLinkDefinitionImpl>,
                                   override val impliedPlatforms: List<String>,
-                                  override val perPackageOptions: List<PackageOptionsImpl>) : DokkaConfiguration
\ No newline at end of file
+                                  override val perPackageOptions: List<PackageOptionsImpl>,
+                                  override val externalDocumentationLinks: List<ExternalDocumentationLinkImpl>) : DokkaConfiguration
\ No newline at end of file
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 6a18bf26..5049f42d 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -56,7 +56,7 @@ class DocumentationOptions(val outputDir: String,
     fun effectivePackageOptions(pack: String): PackageOptions = perPackageOptions.firstOrNull { pack.startsWith(it.prefix + ".") } ?: rootPackageOptions
     fun effectivePackageOptions(pack: FqName): PackageOptions = effectivePackageOptions(pack.asString())
 
-    val externalDocumentationLinks = listOf(ExternalDocumentationLinkImpl("http://docs.oracle.com/javase/$jdkVersion/docs/api/")) + externalDocumentationLinks
+    val externalDocumentationLinks = listOf(ExternalDocumentationLink.Builder("http://docs.oracle.com/javase/$jdkVersion/docs/api/").build()) + externalDocumentationLinks
 }
 
 private fun isExtensionForExternalClass(extensionFunctionDescriptor: DeclarationDescriptor,
-- 
cgit