From e3bf37c0ef8c88755f1d2d15d3ba6d07d649e005 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 13 Aug 2020 19:54:42 +0200
Subject: Use List for representing classpaths instead of Set

---
 core/src/main/kotlin/configuration.kt                        | 4 ++--
 core/src/main/kotlin/defaultConfiguration.kt                 | 4 ++--
 core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt
index f0e77f09..e0f973d7 100644
--- a/core/src/main/kotlin/configuration.kt
+++ b/core/src/main/kotlin/configuration.kt
@@ -80,14 +80,14 @@ interface DokkaConfiguration : Serializable {
     val failOnWarning: Boolean
     val sourceSets: List<DokkaSourceSet>
     val modules: List<DokkaModuleDescription>
-    val pluginsClasspath: Set<File>
+    val pluginsClasspath: List<File>
     val pluginsConfiguration: Map<String, String>
 
     interface DokkaSourceSet : Serializable {
         val sourceSetID: DokkaSourceSetID
         val displayName: String
         val moduleDisplayName: String
-        val classpath: Set<File>
+        val classpath: List<File>
         val sourceRoots: Set<File>
         val dependentSourceSets: Set<DokkaSourceSetID>
         val samples: Set<File>
diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt
index 4f70cfbb..f37c1add 100644
--- a/core/src/main/kotlin/defaultConfiguration.kt
+++ b/core/src/main/kotlin/defaultConfiguration.kt
@@ -9,7 +9,7 @@ data class DokkaConfigurationImpl(
     override val cacheRoot: File? = DokkaDefaults.cacheRoot,
     override val offlineMode: Boolean = DokkaDefaults.offlineMode,
     override val sourceSets: List<DokkaSourceSetImpl> = emptyList(),
-    override val pluginsClasspath: Set<File> = emptySet(),
+    override val pluginsClasspath: List<File> = emptyList(),
     override val pluginsConfiguration: Map<String, String> = emptyMap(),
     override val modules: List<DokkaModuleDescriptionImpl> = emptyList(),
     override val failOnWarning: Boolean = DokkaDefaults.failOnWarning
@@ -20,7 +20,7 @@ data class DokkaSourceSetImpl(
     override val moduleDisplayName: String,
     override val displayName: String = DokkaDefaults.sourceSetDisplayName,
     override val sourceSetID: DokkaSourceSetID,
-    override val classpath: Set<File> = emptySet(),
+    override val classpath: List<File> = emptyList(),
     override val sourceRoots: Set<File> = emptySet(),
     override val dependentSourceSets: Set<DokkaSourceSetID> = emptySet(),
     override val samples: Set<File> = emptySet(),
diff --git a/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt b/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
index e8135f96..8efc84c6 100644
--- a/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
+++ b/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
@@ -10,7 +10,7 @@ class DokkaConfigurationJsonTest {
     fun `simple configuration toJsonString then parseJson`() {
         val configuration = DokkaConfigurationImpl(
             outputDir = File("customOutputDir"),
-            pluginsClasspath = setOf(File("plugins/customPlugin.jar")),
+            pluginsClasspath = listOf(File("plugins/customPlugin.jar")),
             sourceSets = listOf(
                 DokkaSourceSetImpl(
                     moduleDisplayName = "customModuleDisplayName",
@@ -49,13 +49,13 @@ class DokkaConfigurationJsonTest {
         assertEquals(
             DokkaConfigurationImpl(
                 outputDir = File("customOutputDir"),
-                pluginsClasspath = setOf(File("plugins/customPlugin.jar")),
+                pluginsClasspath = listOf(File("plugins/customPlugin.jar")),
                 sourceSets = listOf(
                     DokkaSourceSetImpl(
                         moduleDisplayName = "customModuleDisplayName",
                         sourceRoots = setOf(File("customSourceRoot")),
                         sourceSetID = DokkaSourceSetID("customModuleName", "customSourceSetName"),
-                        classpath = setOf(File("classpath/custom1.jar"), File("classpath/custom2.jar"))
+                        classpath = listOf(File("classpath/custom1.jar"), File("classpath/custom2.jar"))
                     )
                 )
             ),
-- 
cgit