Address review comments

Author: runningcode

…tlin/sentry.javadoc.aggregate.gradle.kts …n/io.sentry.javadoc.aggregate.gradle.ktsbuild-logic/src/main/kotlin/sentry.javadoc.aggregate.gradle.kts renamed to build-logic/src/main/kotlin/io.sentry.javadoc.aggregate.gradle.kts build-logic/src/main/kotlin/sentry.javadoc.aggregate.gradle.kts renamed to build-logic/src/main/kotlin/io.sentry.javadoc.aggregate.gradle.kts

@@ -5,7 +5,7 @@ import org.gradle.kotlin.dsl.creating
 import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.named
 
-val javadocConsumer by configurations.creating {
+val javadocPublisher by configurations.creating {
     isCanBeConsumed = false
     isCanBeResolved = true
     attributes {
@@ -15,14 +15,15 @@ val javadocConsumer by configurations.creating {
 }
 
 subprojects {
-    javadocConsumer.dependencies.add(dependencies.create(this))
+    javadocPublisher.dependencies.add(dependencies.create(this))
 }
 
-val javadocCollection = javadocConsumer.incoming.artifactView { lenient(true) }.files
+val javadocCollection = javadocPublisher.incoming.artifactView { lenient(true) }.files
 
 tasks.register("aggregateJavadoc", AggregateJavadoc::class) {
     group = "documentation"
     description = "Aggregates Javadocs from all subprojects into a single directory."
     javadocFiles.set(javadocCollection)
+    rootDir.set(layout.projectDirectory)
     outputDir.set(layout.buildDirectory.dir("docs/javadoc"))
 }

…rc/main/kotlin/sentry.javadoc.gradle.kts …main/kotlin/io.sentry.javadoc.gradle.ktsbuild-logic/src/main/kotlin/sentry.javadoc.gradle.kts renamed to build-logic/src/main/kotlin/io.sentry.javadoc.gradle.kts build-logic/src/main/kotlin/sentry.javadoc.gradle.kts renamed to build-logic/src/main/kotlin/io.sentry.javadoc.gradle.kts

@@ -17,19 +17,24 @@ abstract class AggregateJavadoc @Inject constructor(
     @get:InputFiles
     abstract val javadocFiles: Property<FileCollection>
 
+    // Marked as Internal since this is only used to relativize the paths for the output directories
+    @get:Internal
+    abstract val rootDir: DirectoryProperty
+
     @get:OutputDirectory
     abstract val outputDir: DirectoryProperty
 
     @TaskAction
     fun aggregate() {
         javadocFiles.get().forEach { file ->
             fs.copy {
-                // Get the third to last part (project name) to use as the directory name for the output
-                val parts = file.path.split('/')
-                val projectName = parts[parts.size - 4]
+                // Get the relative path of the project directory to the root directory
+                val relativePath = file.relativeTo(rootDir.get().asFile)
+                // Remove the 'build/docs/javadoc' part from the path
+                val projectPath = relativePath.path.replace("build/docs/javadoc", "")
                 from(file)
                 // Use the project name as the output directory name so that each javadoc goes into its own directory
-                into(outputDir.get().file(projectName))
+                into(outputDir.get().file(projectPath))
             }
         }
     }

build-logic/src/main/kotlin/io/sentry/gradle/AggregateJavadoc.kt

@@ -27,7 +27,7 @@ plugins {
     alias(libs.plugins.errorprone) apply false
     alias(libs.plugins.gradle.versions) apply false
     alias(libs.plugins.spring.dependency.management) apply false
-    id("sentry.javadoc.aggregate")
+    id("io.sentry.javadoc.aggregate")
 }
 
 buildscript {

build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)

sentry-apache-http-client-5/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)

sentry-apollo-3/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)

sentry-apollo-4/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)

sentry-apollo/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)

sentry-graphql-22/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `java-library`
-    id("sentry.javadoc")
+    id("io.sentry.javadoc")
     kotlin("jvm")
     jacoco
     alias(libs.plugins.errorprone)