Extract properties to AbstractDokkaLeafTask (#1922)

3 files changed, 17 insertions, 36 deletions

diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaLeafTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaLeafTask.kt
index 96f43c77..f10f32ec 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaLeafTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaLeafTask.kt
@@ -3,8 +3,9 @@ package org.jetbrains.dokka.gradle;
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.internal.plugins.DslObject
 import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Nested
 
-abstract class AbstractDokkaLeafTask() : AbstractDokkaTask() {
+abstract class AbstractDokkaLeafTask : AbstractDokkaTask() {
 
     @get:Internal
     val dokkaSourceSets: NamedDomainObjectContainer<GradleDokkaSourceSetBuilder> =
@@ -17,4 +18,16 @@ abstract class AbstractDokkaLeafTask() : AbstractDokkaTask() {
                     }
                 }
             }
+
+    /**
+     * Only contains source sets that are marked with `isDocumented`.
+     * Non documented source sets are not relevant for Gradle's UP-TO-DATE mechanism, as well
+     * as task dependency graph.
+     */
+    @get:Nested
+    protected val unsuppressedSourceSets: List<GradleDokkaSourceSetBuilder>
+        get() = dokkaSourceSets
+                .toList()
+                .also(::checkSourceSetDependencies)
+                .filterNot { it.suppress.getSafe() }
 }
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
index 48584786..682b2591 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
@@ -1,25 +1,9 @@
 package org.jetbrains.dokka.gradle
 
-import org.gradle.api.NamedDomainObjectContainer
-import org.gradle.api.internal.plugins.DslObject
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.Nested
-import org.jetbrains.dokka.*
+import org.jetbrains.dokka.DokkaConfigurationImpl
+import org.jetbrains.dokka.build
 
 abstract class DokkaTask : AbstractDokkaLeafTask() {
-
-    /**
-     * Only contains source sets that are marked with `isDocumented`.
-     * Non documented source sets are not relevant for Gradle's UP-TO-DATE mechanism, as well
-     * as task dependency graph.
-     */
-    @get:Nested
-    protected val unsuppressedSourceSets: List<GradleDokkaSourceSetBuilder>
-        get() = dokkaSourceSets
-            .toList()
-            .also(::checkSourceSetDependencies)
-            .filterNot { it.suppress.getSafe() }
-
     override fun buildDokkaConfiguration(): DokkaConfigurationImpl =
         DokkaConfigurationImpl(
             moduleName = moduleName.getSafe(),
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt
index 39c0bab2..ce779c99 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt
@@ -1,26 +1,10 @@
 package org.jetbrains.dokka.gradle
 
-import org.gradle.api.NamedDomainObjectContainer
-import org.gradle.api.internal.plugins.DslObject
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.Nested
 import org.jetbrains.dokka.DokkaConfigurationImpl
 import org.jetbrains.dokka.build
 
 abstract class DokkaTaskPartial : AbstractDokkaLeafTask() {
 
-    /**
-     * Only contains source sets that are marked with `isDocumented`.
-     * Non documented source sets are not relevant for Gradle's UP-TO-DATE mechanism, as well
-     * as task dependency graph.
-     */
-    @get:Nested
-    protected val unsuppressedSourceSets: List<GradleDokkaSourceSetBuilder>
-        get() = dokkaSourceSets
-            .toList()
-            .also(::checkSourceSetDependencies)
-            .filterNot { it.suppress.getSafe() }
-
     override fun buildDokkaConfiguration(): DokkaConfigurationImpl {
         return DokkaConfigurationImpl(
             moduleName = moduleName.getSafe(),
@@ -37,4 +21,4 @@ abstract class DokkaTaskPartial : AbstractDokkaLeafTask() {
             suppressInheritedMembers = suppressInheritedMembers.getSafe(),
         )
     }
-}
\ No newline at end of file
+}