Adjust javadoc generation

River-Kt · Jan 22, 2024 · a96d301 · a96d301
1 parent a0d9ef1
commit a96d301
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Assembly
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: jar sourcesJar javadocJar --parallel --stacktrace
+          arguments: assemble sourcesJar javadocJar --parallel --stacktrace
 
       - name: Sign & publish to Maven Central
         uses: gradle/gradle-build-action@v2
@@ -46,4 +46,4 @@ jobs:
           RELEASER_NEXUS2_USERNAME: ${{ secrets.RELEASER_NEXUS2_USERNAME }}
           RELEASER_NEXUS2_PASSWORD: ${{ secrets.RELEASER_NEXUS2_PASSWORD }}
         with:
-          arguments: jar sourcesJar javadocJar signMavenPublication signJavadocJar publish --stacktrace
+          arguments: assemble sourcesJar javadocJar signMavenPublication signJavadocJar publish --stacktrace
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -137,6 +137,13 @@ subprojects {
         }
     }
 
+    val javadocJar by tasks.registering(Jar::class) {
+        archiveClassifier.set("javadoc")
+        from(tasks.dokkaHtml)
+        dependsOn("dokkaHtml")
+        skipExamples()
+    }
+
     publishing {
         repositories {
             maven {
@@ -155,15 +162,15 @@ subprojects {
                 artifactId = project.name
                 version = "${project.version}"
 
-//                artifact(tasks["jar"])
-//
-//                artifact(tasks["sourcesJar"]) {
-//                    classifier = "sources"
-//                }
-//
-//                artifact(tasks["javadocJar"]) {
-//                    classifier = "javadoc"
-//                }
+//                artifact(tasks["jvmJar"])
+
+                artifact(tasks["sourcesJar"]) {
+                    classifier = "sources"
+                }
+
+                artifact(tasks["javadocJar"]) {
+                    classifier = "javadoc"
+                }
 
                 pom {
                     name.set(project.name)
@@ -241,7 +248,7 @@ subprojects {
         useInMemoryPgpKeys(signingKeyId, signingSecretKey, signingPassword)
 
         sign(publishing.publications["maven"])
-//        sign(tasks["javadocJar"])
+        sign(tasks["javadocJar"])
     }
 
     tasks.withType<PublishToMavenRepository>().configureEach {

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.9.22"
-dokka = "1.8.20"
+dokka = "1.9.10"
 aws-sdk = "2.23.2"
 coroutines = "1.7.3"
 slf4j = "1.7.36"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,7 +18,7 @@ rootProject.name = "river"
 
 include(
     "core",
-    "connectors",
+//    "connectors",
     "connectors:aws",
     "connectors:amqp",
     "connectors:apache:kafka",