Merge branch 'feat/move_tasks_into_task_package' into feat/update_gra…

…dle_utils_with_kotlin_dsl # Conflicts: # runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt # runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt
Kotlin · Feb 1, 2023 · 47010c2 · 47010c2
2 parents f8d0618 + 8754121
commit 47010c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
@@ -4,6 +4,8 @@ import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.UnknownDomainObjectException
 import org.gradle.util.Path
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget

diff --git a/...rs/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt b/...rs/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt
@@ -2,15 +2,16 @@ package org.jetbrains.dokka.gradle
 
 import org.gradle.kotlin.dsl.withType
 import org.gradle.testfixtures.ProjectBuilder
-import org.jetbrains.dokka.DokkaConfiguration
-import org.jetbrains.dokka.DokkaConfigurationImpl
-import org.jetbrains.dokka.PluginConfigurationImpl
-import org.jetbrains.dokka.toJsonString
+import org.jetbrains.dokka.*
+import org.jetbrains.dokka.DokkaDefaults.documentedVisibilities
+import org.jetbrains.dokka.DokkaDefaults.includeNonPublic
+import org.jetbrains.dokka.DokkaDefaults.reportUndocumented
+import org.jetbrains.dokka.DokkaDefaults.skipDeprecated
+import org.jetbrains.dokka.gradle.tasks.DokkaTask
 import java.io.File
 import java.net.URL
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import org.jetbrains.dokka.gradle.tasks.DokkaTask
 
 class DokkaConfigurationJsonTest {
 
@@ -31,9 +32,9 @@ class DokkaConfigurationJsonTest {
             this.pluginsConfiguration.add(
                 PluginConfigurationImpl("B", DokkaConfiguration.SerializationFormat.JSON, """ { "key" : "value2" } """)
             )
-            this.dokkaSourceSets.create("main") { sourceSet ->
-                sourceSet.displayName.set("customSourceSetDisplayName")
-                sourceSet.reportUndocumented.set(true)
+            this.dokkaSourceSets.create("main") {
+                displayName.set("customSourceSetDisplayName")
+                reportUndocumented.set(true)
 
                 externalDocumentationLink {
                     packageListUrl.set(URL("http://some.url"))