combine classpath properties

Author: eyuan-netflix

nebula-archrules-gradle-plugin/src/main/kotlin/com/netflix/nebula/archrules/gradle/ArchrulesLibraryPlugin.kt

@@ -76,8 +76,8 @@ class ArchrulesLibraryPlugin : Plugin<Project> {
             project.tasks.register<GenerateRulesDocumentationTask>("generateRulesDocumentation") {
                 description = "Generates documentation for ArchRules"
                 group = "documentation"
-                rulesClasspath.from(archRulesSourceSet.output)
-                dependencyClasspath.from(project.configurations.named(archRulesSourceSet.runtimeClasspathConfigurationName))
+                classpath.from(archRulesSourceSet.output)
+                classpath.from(project.configurations.named(archRulesSourceSet.runtimeClasspathConfigurationName))
                 outputFile.convention(
                     project.layout.buildDirectory.file("docs/archrules.md")
                 )

nebula-archrules-gradle-plugin/src/main/kotlin/com/netflix/nebula/archrules/gradle/GenerateRulesDocumentationTask.kt

@@ -19,28 +19,17 @@ import java.util.ServiceLoader
 abstract class GenerateRulesDocumentationTask : DefaultTask() {
 
     @get:Classpath
-    abstract val rulesClasspath: ConfigurableFileCollection
-
-    @get:Classpath
-    abstract val dependencyClasspath: ConfigurableFileCollection
+    abstract val classpath: ConfigurableFileCollection
 
     @get:OutputFile
     abstract val outputFile: RegularFileProperty
 
     @TaskAction
     fun generateDocs() {
         val rules = mutableListOf<RuleMetadata>()
-        val rulesUrls = rulesClasspath.files.map { it.toURI().toURL() }.toTypedArray()
-        val dependencyUrls = dependencyClasspath.files.map { it.toURI().toURL() }.toTypedArray()
-
-//        val ownClassLoader = URLClassLoader(rulesUrls, javaClass.classLoader)
-//        val ownArchRulesClasses = ServiceLoader.load(ArchRulesService::class.java, ownClassLoader)
-//            .stream()
-//            .map { it.type().name }
-//            .toList()
-//            .toSet()
+        val classpathUrls = classpath.files.map { it.toURI().toURL() }.toTypedArray()
 
-        val ownArchRulesClasses = rulesClasspath.files.map {
+        val ownArchRulesClasses = classpath.files.map {
             File(
                 it,
                 "META-INF/services/com.netflix.nebula.archrules.core.ArchRulesService"
@@ -52,7 +41,7 @@ abstract class GenerateRulesDocumentationTask : DefaultTask() {
             ?.toSet()
             ?: emptySet()
 
-        URLClassLoader(rulesUrls + dependencyUrls, this.javaClass.classLoader).use { classLoader ->
+        URLClassLoader(classpathUrls, this.javaClass.classLoader).use { classLoader ->
             ServiceLoader.load(ArchRulesService::class.java, classLoader)
                 .filter { it.javaClass.name in ownArchRulesClasses }
                 .forEach { service ->