patch: fixed javadoc and sources generation

* fixed javadoc and sources jar generation * increased max meta memory space size
Im-Fran · Jan 19, 2024 · ecb57df · ecb57df
1 parent e0fd964
commit ecb57df
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 27 deletions.
diff --git a/build-info/build.gradle.kts b/build-info/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.dokka.gradle.DokkaTask
+
 plugins {
     id("net.kyori.blossom") version "2.1.0"                     // Placeholder injection
 }
@@ -22,4 +24,12 @@ sourceSets {
             }
         }
     }
+}
+
+tasks.withType<DokkaTask>().configureEach {
+    dokkaSourceSets {
+        configureEach {
+            sourceRoots.from(file("src/"))
+        }
+    }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
-
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import java.util.*
 
 plugins {
@@ -12,6 +12,15 @@ plugins {
     id("org.jetbrains.dokka") version "1.9.10"                  // Dokka (Kotlin Docs)
 }
 
+/*
+    The project version can be:
+    - environment variable VERSION or the manually added version
+    - If the environment variable ENV is set to dev, the project
+    version will have appended the git commit short hash + SNAPSHOT
+*/
+val projectVersion = (env["VERSION"] ?: "1.0.0") + (if(env["ENV"] == "dev") "-${env["GIT_COMMIT_SHORT_HASH"] ?: UUID.randomUUID().toString().replace("-", "").split("").shuffled().joinToString("").substring(0,8)}-SNAPSHOT" else "")
+println("This build version was '$projectVersion'")
+
 allprojects {
     apply {
         plugin("com.github.johnrengelman.shadow")
@@ -20,14 +29,6 @@ allprojects {
         plugin("org.jetbrains.dokka")
     }
 
-    /*
-    The project version can be:
-    - environment variable VERSION or the manually added version
-    - If the environment variable ENV is set to dev, the project
-    version will have appended the git commit short hash + SNAPSHOT
-     */
-    val projectVersion = (env["VERSION"] ?: "1.0.0") + (if(env["ENV"] == "dev") "-${env["GIT_COMMIT_SHORT_HASH"] ?: UUID.randomUUID().toString().replace("-", "").split("").shuffled().joinToString("").substring(0,8)}-SNAPSHOT" else "")
-
     group = "xyz.theprogramsrc"
     version = projectVersion.replaceFirst("v", "").replace("/", "")
     description = "The best way to create a kotlin project."
@@ -48,16 +49,18 @@ allprojects {
 }
 
 subprojects {
-    java {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-        withSourcesJar()
-        withJavadocJar()
-    }
+    apply(plugin = "org.jetbrains.dokka")
 
     tasks {
-        jar {
-            dependsOn(dokkaJavadoc)
+        java {
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+            withSourcesJar()
+            withJavadocJar()
+        }
+
+        named<DokkaTaskPartial>("dokkaHtmlPartial") {
+            outputDirectory = layout.buildDirectory.dir("dokka")
         }
     }
 }
@@ -108,15 +111,25 @@ tasks {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 
-    dokkaHtml {
-        outputDirectory.set(layout.buildDirectory.dir("dokka/"))
+    register<Jar>("mergeSourcesJar") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        archiveClassifier = "sources"
+        from(subprojects.filter { subproject -> subproject.tasks.any { task -> task.name == "sourcesJar" } }.flatMap { subproject -> subproject.sourceSets.map { sourceSet -> sourceSet.allSource } })
+
+        copy {
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        }
     }
-}
 
-val dokkaJavadocJar by tasks.register<Jar>("dokkaJavadocJar") {
-    dependsOn(tasks.dokkaJavadoc, tasks.dokkaHtml)
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
-    archiveClassifier.set("javadoc")
+    dokkaHtmlMultiModule {
+        outputDirectory = rootProject.layout.buildDirectory.dir("dokka/")
+    }
+
+    register<Jar>("dokkaJavadocJar") {
+        dependsOn(dokkaHtmlMultiModule)
+        from(dokkaHtmlMultiModule.flatMap { dokkaTask -> dokkaTask.outputDirectory })
+        archiveClassifier.set("javadoc")
+    }
 }
 
 publishing {
@@ -157,8 +170,8 @@ publishing {
                 artifactId = rootProject.name.lowercase()
 
                 component(this@create)
-                artifact(dokkaJavadocJar)
-                artifact(tasks.kotlinSourcesJar)
+                artifact(tasks.named("dokkaJavadocJar"))
+                artifact(tasks.named("mergeSourcesJar"))
 
                 pom {
                     name.set(rootProject.name)

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=4096m
diff --git a/simplecoreapi/build.gradle.kts b/simplecoreapi/build.gradle.kts
@@ -1,5 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
+plugins {
+    id("org.jetbrains.dokka")
+}
+
 dependencies {
     /* Api */
     compileOnly(project(":build-info"))