From 6f40db680336e7f3b4b68a8d4ad7b8a7ffe33270 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 13 Aug 2020 19:39:05 +0200
Subject: Moving CompositeSourceSetID and ContentSourceSet into `.dokka.model`

---
 core/src/main/kotlin/model/CompositeSourceSetID.kt | 30 +++++++++++
 core/src/main/kotlin/model/ContentSourceSet.kt     | 32 ++++++++++++
 core/src/main/kotlin/pages/ContentNodes.kt         |  1 +
 core/src/main/kotlin/pages/ContentSourceSet.kt     | 60 ----------------------
 .../test/kotlin/model/CompositeSourceSetIDTest.kt  |  2 +-
 core/src/test/kotlin/model/ContentSourceSetTest.kt |  6 +--
 6 files changed, 67 insertions(+), 64 deletions(-)
 create mode 100644 core/src/main/kotlin/model/CompositeSourceSetID.kt
 create mode 100644 core/src/main/kotlin/model/ContentSourceSet.kt
 delete mode 100644 core/src/main/kotlin/pages/ContentSourceSet.kt

(limited to 'core/src')

diff --git a/core/src/main/kotlin/model/CompositeSourceSetID.kt b/core/src/main/kotlin/model/CompositeSourceSetID.kt
new file mode 100644
index 00000000..5eb106bf
--- /dev/null
+++ b/core/src/main/kotlin/model/CompositeSourceSetID.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.dokka.model
+
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.DokkaSourceSetID
+
+data class CompositeSourceSetID(
+    private val children: Set<DokkaSourceSetID>
+) {
+    constructor(sourceSetIDs: Iterable<DokkaSourceSetID>) : this(sourceSetIDs.toSet())
+    constructor(sourceSetId: DokkaSourceSetID) : this(setOf(sourceSetId))
+
+    init {
+        require(children.isNotEmpty()) { "Expected at least one source set id" }
+    }
+
+    val merged = DokkaSourceSetID(
+        moduleName = children.map { it.moduleName }.reduce { acc, s -> "$acc+$s" },
+        sourceSetName = children.map { it.sourceSetName }.reduce { acc, s -> "$acc+$s" }
+    )
+
+    val all: Set<DokkaSourceSetID> = setOf(merged, *children.toTypedArray())
+
+    operator fun contains(sourceSetId: DokkaSourceSetID): Boolean {
+        return sourceSetId in all
+    }
+
+    operator fun contains(sourceSet: DokkaConfiguration.DokkaSourceSet): Boolean {
+        return sourceSet.sourceSetID in this
+    }
+}
diff --git a/core/src/main/kotlin/model/ContentSourceSet.kt b/core/src/main/kotlin/model/ContentSourceSet.kt
new file mode 100644
index 00000000..6eee4c94
--- /dev/null
+++ b/core/src/main/kotlin/model/ContentSourceSet.kt
@@ -0,0 +1,32 @@
+package org.jetbrains.dokka.model
+
+import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
+import org.jetbrains.dokka.DokkaSourceSetID
+import org.jetbrains.dokka.Platform
+
+data class ContentSourceSet(
+    val sourceSetIDs: CompositeSourceSetID,
+    val displayName: String,
+    val analysisPlatform: Platform
+) {
+    constructor(sourceSet: DokkaSourceSet) : this(
+        sourceSetIDs = CompositeSourceSetID(sourceSet.sourceSetID),
+        displayName = sourceSet.displayName,
+        analysisPlatform = sourceSet.analysisPlatform
+    )
+
+    operator fun contains(sourceSetID: DokkaSourceSetID): Boolean {
+        return sourceSetID in sourceSetIDs
+    }
+
+    operator fun contains(sourceSet: DokkaSourceSet): Boolean {
+        return sourceSet.sourceSetID in this
+    }
+}
+
+
+fun DokkaSourceSet.toContentSourceSet(): ContentSourceSet = ContentSourceSet(this)
+
+fun Iterable<DokkaSourceSet>.toContentSourceSets(): Set<ContentSourceSet> = map { it.toContentSourceSet() }.toSet()
+
+val Iterable<ContentSourceSet>.sourceSetIDs: List<DokkaSourceSetID> get() = this.flatMap { it.sourceSetIDs.all }
diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt
index 02d6bf61..0d43d062 100644
--- a/core/src/main/kotlin/pages/ContentNodes.kt
+++ b/core/src/main/kotlin/pages/ContentNodes.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.dokka.pages
 
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.ContentSourceSet
 import org.jetbrains.dokka.model.WithChildren
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.properties.WithExtraProperties
diff --git a/core/src/main/kotlin/pages/ContentSourceSet.kt b/core/src/main/kotlin/pages/ContentSourceSet.kt
deleted file mode 100644
index f53cdb12..00000000
--- a/core/src/main/kotlin/pages/ContentSourceSet.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.jetbrains.dokka.pages
-
-import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
-import org.jetbrains.dokka.DokkaSourceSetID
-import org.jetbrains.dokka.Platform
-
-
-data class ContentSourceSet(
-    val sourceSetIDs: CompositeSourceSetID,
-    val displayName: String,
-    val analysisPlatform: Platform
-) {
-    constructor(sourceSet: DokkaSourceSet) : this(
-        sourceSetIDs = CompositeSourceSetID(sourceSet.sourceSetID),
-        displayName = sourceSet.displayName,
-        analysisPlatform = sourceSet.analysisPlatform
-    )
-
-    operator fun contains(sourceSetID: DokkaSourceSetID): Boolean {
-        return sourceSetID in sourceSetIDs
-    }
-
-    operator fun contains(sourceSet: DokkaSourceSet): Boolean {
-        return sourceSet.sourceSetID in this
-    }
-}
-
-
-data class CompositeSourceSetID(
-    private val children: Set<DokkaSourceSetID>
-) {
-    constructor(sourceSetIDs: Iterable<DokkaSourceSetID>) : this(sourceSetIDs.toSet())
-    constructor(sourceSetId: DokkaSourceSetID) : this(setOf(sourceSetId))
-
-    init {
-        require(children.isNotEmpty()) { "Expected at least one source set id" }
-    }
-
-    val merged = DokkaSourceSetID(
-        moduleName = children.map { it.moduleName }.reduce { acc, s -> "$acc+$s" },
-        sourceSetName = children.map { it.sourceSetName }.reduce { acc, s -> "$acc+$s" }
-    )
-
-    val all: List<DokkaSourceSetID> = listOf(merged, *children.toTypedArray())
-
-    operator fun contains(sourceSetId: DokkaSourceSetID): Boolean {
-        return sourceSetId in all
-    }
-
-    operator fun contains(sourceSet: DokkaSourceSet): Boolean {
-        return sourceSet.sourceSetID in this
-    }
-}
-
-
-fun DokkaSourceSet.toContentSourceSet(): ContentSourceSet = ContentSourceSet(this)
-
-fun Iterable<DokkaSourceSet>.toContentSourceSets(): Set<ContentSourceSet> = map { it.toContentSourceSet() }.toSet()
-
-val Iterable<ContentSourceSet>.sourceSetIDs: List<DokkaSourceSetID> get() = this.flatMap { it.sourceSetIDs.all }
diff --git a/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt b/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
index 68af259d..ab9a2ab1 100644
--- a/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
+++ b/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
@@ -1,7 +1,7 @@
 package model
 
 import org.jetbrains.dokka.DokkaSourceSetID
-import org.jetbrains.dokka.pages.CompositeSourceSetID
+import org.jetbrains.dokka.model.CompositeSourceSetID
 import kotlin.test.*
 
 class CompositeSourceSetIDTest {
diff --git a/core/src/test/kotlin/model/ContentSourceSetTest.kt b/core/src/test/kotlin/model/ContentSourceSetTest.kt
index cb17bcba..b96180a2 100644
--- a/core/src/test/kotlin/model/ContentSourceSetTest.kt
+++ b/core/src/test/kotlin/model/ContentSourceSetTest.kt
@@ -2,9 +2,9 @@ package model
 
 import org.jetbrains.dokka.DokkaSourceSetID
 import org.jetbrains.dokka.Platform
-import org.jetbrains.dokka.pages.CompositeSourceSetID
-import org.jetbrains.dokka.pages.ContentSourceSet
-import org.jetbrains.dokka.pages.sourceSetIDs
+import org.jetbrains.dokka.model.CompositeSourceSetID
+import org.jetbrains.dokka.model.ContentSourceSet
+import org.jetbrains.dokka.model.sourceSetIDs
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-- 
cgit