Update Dokka for multiversion

.github/workflows/javadocs.yml

@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build Javadocs
-        run: ./gradlew --no-daemon dokkaHtml
+        run: ./gradlew --no-daemon generateDokkaDocs
 
       - name: Publish Javadocs
         uses: appleboy/scp-action@master
@@ -39,10 +39,10 @@ jobs:
           username: ${{ secrets.ACTIONS_DEPLOYER_USERNAME }}
           key: ${{ secrets.ACTIONS_DEPLOYER_SSH_KEY }}
           passphrase: ${{ secrets.ACTIONS_DEPLOYER_PASSPHRASE }}
-          source: build/javadocs/
+          source: ${{ github.workspace }}/build/javadocs/
           # TODO: Remove "new-" when we transition to 3.0.0
           target: /srv/www/static/home/new-javadocs
-          strip_components: 2
+          strip_components: 4
           rm: true
 
       - name: Set File Permissions

build.gradle.kts

@@ -127,6 +127,11 @@ tasks {
 }
 
 tasks.dokkaHtml {
+    // Just use the module name here since the MC version doesn't affect CT's API
+    // across the same mod version
+    moduleVersion.set(modVersion)
+    moduleName.set("ctjs")
+
     val docVersionsDir = projectDir.resolve("build/javadocs")
     val currentVersion = project.version.toString()
     val currentDocsDir = docVersionsDir.resolve(currentVersion)
@@ -135,11 +140,12 @@ tasks.dokkaHtml {
     outputDirectory.set(file(currentDocsDir))
 
     pluginConfiguration<VersioningPlugin, VersioningConfiguration> {
-        version = currentVersion
+        version = modVersion
         olderVersionsDir = docVersionsDir
         renderVersionsNavigationOnAllPages = true
     }
 
+    suppressObviousFunctions.set(true)
     suppressInheritedMembers.set(true)
 
     val branch = getBranch()
@@ -148,7 +154,7 @@ tasks.dokkaHtml {
             jdkVersion.set(17)
 
             perPackageOption {
-                matchingRegex.set("com\\.chattriggers\\.ctjs\\.internal")
+                matchingRegex.set("com\\.chattriggers\\.ctjs\\.internal(\$|\\.).*")
                 suppress.set(true)
             }
 

root.gradle.kts

@@ -17,3 +17,17 @@ preprocess {
 apiValidation {
     ignoredPackages.add("com.chattriggers.ctjs.internal")
 }
+
+tasks.register("generateDokkaDocs") {
+    group = "documentation"
+
+    val mainProjectName = rootProject.file("versions/mainProject").readText().trim()
+    val mainProject = subprojects.first { mainProjectName in it.name }
+    dependsOn(mainProject.tasks["dokkaHtml"])
+
+    doLast {
+        val dest = rootProject.file("build/javadocs/")
+        dest.deleteRecursively()
+        mainProject.file("build/javadocs/").copyRecursively(dest)
+    }
+}