Rename DokkaDependencies.kt to DokkaArtifacts.kt

5 files changed, 13 insertions, 12 deletions

diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
index a6fe551d..bc444dea 100644
--- a/.idea/kotlinScripting.xml
+++ b/.idea/kotlinScripting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinScriptingSettings">
-    <option name="isAutoReloadEnabled" value="true" />
+    <option name="suppressDefinitionsCheck" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 58f97b6c..fe21e6d6 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -7,10 +7,13 @@ plugins {
 
 apply(from = "../template.root.gradle.kts")
 
-val customDokkaTask by tasks.register<DokkaTask>("customDokka")
-
 dependencies {
+    dokkaPlugin("my:plugin:version")
+    dokkaJavadocPlugin("my:plugin-extending-javadoc:version")
     implementation(kotlin("stdlib"))
 }
 
+tasks.dokkaGfm {
+    outputDirectory = File(buildDir, "gfm").absolutePath
+}
 
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaDependencies.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt
index 2ee1d479..90d51015 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaDependencies.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt
@@ -3,9 +3,9 @@ package org.jetbrains.dokka.gradle
 import org.gradle.api.Project
 import org.jetbrains.dokka.DokkaVersion
 
-internal val Project.dokkaDependencies get() = DokkaDependencies(this)
+internal val Project.dokkaArtifacts get() = DokkaArtifacts(this)
 
-internal class DokkaDependencies(private val project: Project) {
+internal class DokkaArtifacts(private val project: Project) {
     private fun fromModuleName(name: String) =
         project.dependencies.create("org.jetbrains.dokka:$name:${DokkaVersion.version}")
 
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 2bdfa0bd..0eddd8e6 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
@@ -16,9 +16,7 @@ import org.jetbrains.dokka.ReflectDsl.isNotInstance
 import org.jetbrains.dokka.gradle.ConfigurationExtractor.PlatformData
 import org.jetbrains.dokka.plugability.Configurable
 import java.io.File
-import java.net.URLClassLoader
 import java.util.concurrent.Callable
-import java.util.function.BiConsumer
 
 open class DokkaTask : DefaultTask(), Configurable {
     private val ANDROID_REFERENCE_URL = Builder("https://developer.android.com/reference/").build()
@@ -61,14 +59,14 @@ open class DokkaTask : DefaultTask(), Configurable {
     @Classpath
     val runtime = project.configurations.create("${name}Runtime").apply {
         defaultDependencies { dependencies ->
-            dependencies.add(project.dokkaDependencies.dokkaCore)
+            dependencies.add(project.dokkaArtifacts.dokkaCore)
         }
     }
 
     @Classpath
     val plugins: Configuration = project.configurations.create("${name}Plugin").apply {
         defaultDependencies { dependencies ->
-            dependencies.add(project.dokkaDependencies.dokkaBase)
+            dependencies.add(project.dokkaArtifacts.dokkaBase)
         }
         attributes.attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, "java-runtime"))
         isCanBeConsumed = false
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
index b32a3967..3e2c51f4 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
@@ -10,15 +10,15 @@ open class DokkaPlugin : Plugin<Project> {
         project.createDokkaTasks("dokka")
 
         project.createDokkaTasks("dokkaJavadoc") {
-            plugins.dependencies.add(project.dokkaDependencies.javadocPlugin)
+            plugins.dependencies.add(project.dokkaArtifacts.javadocPlugin)
         }
 
         project.createDokkaTasks("dokkaGfm") {
-            plugins.dependencies.add(project.dokkaDependencies.gfmPlugin)
+            plugins.dependencies.add(project.dokkaArtifacts.gfmPlugin)
         }
 
         project.createDokkaTasks("dokkaJekyll") {
-            plugins.dependencies.add(project.dokkaDependencies.jekyllPlugin)
+            plugins.dependencies.add(project.dokkaArtifacts.jekyllPlugin)
         }
     }