Merge pull request #394 from 100mslive/dev

Dev to release
100mslive · Jun 19, 2023 · 66ccef3 · 66ccef3
2 parents 0f49d56 + 3062b62
commit 66ccef3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/roomkit-publish.yml b/.github/workflows/roomkit-publish.yml
@@ -19,6 +19,8 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Which version
+      run: echo "${{github.ref_name}}"
 
     - name: Decrypt the artefact signing key
       run: gpg --quiet --batch --yes --decrypt --passphrase="${{ secrets.ANDROID_ROOM_KIT_SONATYPE_PRIVATE_KEY_DECRYPT_PASSWORD }}" --output secrets/private.pgp secrets/private.pgp.gpg

diff --git a/room-kit/build.gradle b/room-kit/build.gradle
@@ -6,6 +6,7 @@ plugins {
     id 'kotlin-parcelize'
     id 'androidx.navigation.safeargs.kotlin'
     id 'signing'
+    id "org.jetbrains.dokka" version "1.5.0"
 }
 def getVersionName = { ->
     return "$HMS_ROOM_KIT_VERSION"
@@ -52,7 +53,6 @@ android {
     publishing {
         singleVariant('release') {
             withSourcesJar()
-            withJavadocJar()
         }
     }
 }
@@ -101,6 +101,12 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
+task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
+    archiveFileName = "javadoc.jar"
+    from "build/dokka/javadoc"
+    archiveClassifier.set("javadoc")
+}
+
 afterEvaluate {
     publishing {
         publications {
@@ -111,9 +117,8 @@ afterEvaluate {
                     // Only sign the artefacts if this is a maven central build.
                     // This would only halt jitpack builds and/or make our signing keys public.
                     if(rootProject.properties["ossrhUsername"]) {
-
+                        artifact javadocJar
                         signing {
-                            sign artifacts.find{it.getClassifier() == "javadoc"}.getFile()
                             sign publishing.publications
                         }
                     }