From 8c218ff4dd5f970233c43845c19299fc74256389 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 29 Apr 2022 15:03:08 +0300 Subject: Enable warnings as errors and fix all warnings (#2451) * Enable warnings as errors and fix all warnings * Enable skip-metadata-version-check compiler setting --- .../org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt | 10 ++++++---- .../org/jetbrains/dokka/gradle/DokkaMultiModuleTaskTest.kt | 2 ++ .../jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'runners/gradle-plugin/src') diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt index abaa2536..21f0e268 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt @@ -11,7 +11,6 @@ import org.gradle.api.provider.SetProperty import org.gradle.api.tasks.* import org.gradle.kotlin.dsl.listProperty import org.gradle.kotlin.dsl.setProperty -import org.gradle.util.ConfigureUtil import org.jetbrains.dokka.* import java.io.File import java.net.URL @@ -156,8 +155,9 @@ open class GradleDokkaSourceSetBuilder( sourceRoot(project.file(path)) } + @Suppress("DEPRECATION") // TODO [beresnev] ConfigureUtil will be removed in Gradle 8 fun sourceLink(c: Closure) { - val configured = ConfigureUtil.configure(c, GradleSourceLinkBuilder(project)) + val configured = org.gradle.util.ConfigureUtil.configure(c, GradleSourceLinkBuilder(project)) sourceLinks.add(configured) } @@ -167,8 +167,9 @@ open class GradleDokkaSourceSetBuilder( sourceLinks.add(sourceLink) } + @Suppress("DEPRECATION") // TODO [beresnev] ConfigureUtil will be removed in Gradle 8 fun perPackageOption(c: Closure) { - val configured = ConfigureUtil.configure(c, GradlePackageOptionsBuilder(project)) + val configured = org.gradle.util.ConfigureUtil.configure(c, GradlePackageOptionsBuilder(project)) perPackageOptions.add(configured) } @@ -178,8 +179,9 @@ open class GradleDokkaSourceSetBuilder( perPackageOptions.add(option) } + @Suppress("DEPRECATION") // TODO [beresnev] ConfigureUtil will be removed in Gradle 8 fun externalDocumentationLink(c: Closure) { - val link = ConfigureUtil.configure(c, GradleExternalDocumentationLinkBuilder(project)) + val link = org.gradle.util.ConfigureUtil.configure(c, GradleExternalDocumentationLinkBuilder(project)) externalDocumentationLinks.add(link) } diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleTaskTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleTaskTest.kt index 5ad33c57..6e851326 100644 --- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleTaskTest.kt +++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleTaskTest.kt @@ -201,6 +201,8 @@ class DokkaMultiModuleTaskTest { val childTask = child.tasks.create("child") parentTask.addChildTask(childTask) + + @Suppress("NAME_SHADOWING") // ¯\_(ツ)_/¯ parentTask.fileLayout by DokkaMultiModuleFileLayout { parent, child -> parent.project.buildDir.resolve(child.name) } diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt index 59b35917..770d1af3 100644 --- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt +++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt @@ -148,6 +148,7 @@ class GradleDokkaSourceSetBuilderTest { } @Test + @Suppress("DEPRECATION") fun includeNonPublic() { val sourceSet = GradleDokkaSourceSetBuilder("", project) assertEquals( -- cgit