aboutsummaryrefslogtreecommitdiff
path: root/runners
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-03-26 20:00:46 +0100
committerGitHub <noreply@github.com>2021-03-26 20:00:46 +0100
commit4ddaafb8ec1a45d2696833d1a441f7dbdbb319dd (patch)
treed1309e1f32ececdcf298137d5ecdfd2d55ba65f1 /runners
parent8166370d57dcc5f8f2af15648761d733200a092b (diff)
downloaddokka-4ddaafb8ec1a45d2696833d1a441f7dbdbb319dd.tar.gz
dokka-4ddaafb8ec1a45d2696833d1a441f7dbdbb319dd.tar.bz2
dokka-4ddaafb8ec1a45d2696833d1a441f7dbdbb319dd.zip
Fix configuration for suppressing obvious functions (#1789)
* Fix suppressObviousFunctions not being present in task configuration * Docs
Diffstat (limited to 'runners')
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt4
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt3
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTaskPartial.kt3
-rw-r--r--runners/maven-plugin/src/main/kotlin/DokkaMojo.kt15
4 files changed, 17 insertions, 8 deletions
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 6c1e6ab6..ead7b978 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
@@ -44,6 +44,10 @@ abstract class AbstractDokkaTask : DefaultTask() {
.safeConvention(DokkaDefaults.failOnWarning)
@Input
+ val suppressObviousFunctions: Property<Boolean> = project.objects.safeProperty<Boolean>()
+ .safeConvention(DokkaDefaults.suppressObviousFunctions)
+
+ @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/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
index 078ef925..0d6f35da 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
@@ -42,6 +42,7 @@ abstract class DokkaTask : AbstractDokkaTask() {
failOnWarning = failOnWarning.getSafe(),
sourceSets = unsuppressedSourceSets.build(),
pluginsConfiguration = buildPluginsConfiguration(),
- pluginsClasspath = plugins.resolve().toList()
+ pluginsClasspath = plugins.resolve().toList(),
+ suppressObviousFunctions = suppressObviousFunctions.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 0f509d3b..c2789c19 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
@@ -44,7 +44,8 @@ abstract class DokkaTaskPartial : AbstractDokkaTask() {
sourceSets = unsuppressedSourceSets.build(),
pluginsConfiguration = buildPluginsConfiguration(),
pluginsClasspath = plugins.resolve().toList(),
- delayTemplateSubstitution = true
+ delayTemplateSubstitution = true,
+ suppressObviousFunctions = suppressObviousFunctions.getSafe(),
)
}
} \ No newline at end of file
diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
index 6ed433d0..3e1916a6 100644
--- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
+++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
@@ -118,9 +118,6 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
var reportUndocumented: Boolean = DokkaDefaults.reportUndocumented
@Parameter
- var impliedPlatforms: List<String> = emptyList()
-
- @Parameter
var perPackageOptions: List<PackageOptions> = emptyList()
@Parameter
@@ -159,6 +156,9 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
@Parameter
var failOnWarning: Boolean = DokkaDefaults.failOnWarning
+ @Parameter(defaultValue = "${DokkaDefaults.suppressObviousFunctions}")
+ var suppressObviousFunctions: Boolean = DokkaDefaults.suppressObviousFunctions
+
@Parameter
var dokkaPlugins: List<Dependency> = emptyList()
get() = field + defaultDokkaPlugins
@@ -216,7 +216,7 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
noStdlibLink = noStdlibLink,
noJdkLink = noJdkLink,
suppressedFiles = suppressedFiles.map(::File).toSet(),
- analysisPlatform = if (platform.isNotEmpty()) Platform.fromString(platform) else Platform.DEFAULT
+ analysisPlatform = if (platform.isNotEmpty()) Platform.fromString(platform) else Platform.DEFAULT,
).let {
it.copy(
externalDocumentationLinks = defaultLinks(it) + it.externalDocumentationLinks
@@ -247,6 +247,7 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
pluginsConfiguration = pluginsConfiguration.toMutableList(),
modules = emptyList(),
failOnWarning = failOnWarning,
+ suppressObviousFunctions = suppressObviousFunctions,
)
val gen = DokkaGenerator(configuration, logger)
@@ -270,8 +271,10 @@ abstract class AbstractDokkaMojo(private val defaultDokkaPlugins: List<Dependenc
servers = session!!.request.servers
mirrors = session!!.request.mirrors
proxies = session!!.request.proxies
- artifact = DefaultArtifact(groupId, artifactId, version, "compile", "jar", null,
- DefaultArtifactHandler("jar"))
+ artifact = DefaultArtifact(
+ groupId, artifactId, version, "compile", "jar", null,
+ DefaultArtifactHandler("jar")
+ )
}
log.debug("Resolving $groupId:$artifactId:$version ...")