From 5afe512c669e68aea3712ac37b67d005657cf60a Mon Sep 17 00:00:00 2001
From: Marcin Aman <marcin.aman@gmail.com>
Date: Tue, 6 Apr 2021 18:06:42 +0200
Subject: Suppress inherited members (#1814)

---
 .../src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt   | 4 ++++
 .../src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt  | 4 +++-
 .../src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt           | 1 +
 .../src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt    | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'runners/gradle-plugin/src/main/kotlin/org')

diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt
index ead7b978..c3217722 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt
@@ -47,6 +47,10 @@ abstract class AbstractDokkaTask : DefaultTask() {
     val suppressObviousFunctions: Property<Boolean> = project.objects.safeProperty<Boolean>()
         .safeConvention(DokkaDefaults.suppressObviousFunctions)
 
+    @Input
+    val suppressInheritedMembers: Property<Boolean> = project.objects.safeProperty<Boolean>()
+        .safeConvention(DokkaDefaults.suppressInheritedMembers)
+
     @Input
     val offlineMode: Property<Boolean> = project.objects.safeProperty<Boolean>()
         .safeConvention(DokkaDefaults.offlineMode)
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
index b0fc5f22..cfe56d52 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
@@ -17,7 +17,9 @@ abstract class DokkaCollectorTask : AbstractDokkaParentTask() {
             failOnWarning = failOnWarning.getSafe(),
             offlineMode = offlineMode.getSafe(),
             pluginsClasspath = plugins.resolve().toList(),
-            pluginsConfiguration = buildPluginsConfiguration()
+            pluginsConfiguration = buildPluginsConfiguration(),
+            suppressObviousFunctions = suppressObviousFunctions.getSafe(),
+            suppressInheritedMembers = suppressInheritedMembers.getSafe(),
         )
 
         val subprojectDokkaConfigurations = childDokkaTasks.map { dokkaTask -> dokkaTask.buildDokkaConfiguration() }
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 0d6f35da..eaf4f495 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
@@ -44,5 +44,6 @@ abstract class DokkaTask : AbstractDokkaTask() {
             pluginsConfiguration = buildPluginsConfiguration(),
             pluginsClasspath = plugins.resolve().toList(),
             suppressObviousFunctions = suppressObviousFunctions.getSafe(),
+            suppressInheritedMembers = suppressInheritedMembers.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 c2789c19..4513cfea 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
@@ -46,6 +46,7 @@ abstract class DokkaTaskPartial : AbstractDokkaTask() {
             pluginsClasspath = plugins.resolve().toList(),
             delayTemplateSubstitution = true,
             suppressObviousFunctions = suppressObviousFunctions.getSafe(),
+            suppressInheritedMembers = suppressInheritedMembers.getSafe(),
         )
     }
 }
\ No newline at end of file
-- 
cgit