Merge pull request #583 from LachlanMcKee/fix-publishing-after-agp-8.x

Fixed artifact publishing after updating to AGP 8.x
bumble-tech · Sep 4, 2023 · 9404c88 · 9404c88
2 parents 8ee078e + c04c125
commit 9404c88
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,13 +34,6 @@ jobs:
           mergeDetektSarif
           :plugins:buildPlugins
           --continue
-      - name: Check publication setup
-        run: >
-          ./gradlew
-          publishAllPublicationsToOSSRHRepository
-          publishAllPublicationsToSonatypeSnapshotRepository
-          --dry-run
-          --no-parallel
       - name: Deploy snapshot
         if: env.MAIN_BRANCH == 'true' && github.repository == 'bumble-tech/appyx'
         env:
@@ -72,6 +65,29 @@ jobs:
             **/build/reports/
             !**/build/reports/dependency-analysis/
 
+  publication-verification:
+    name: Publication verification
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
+      - name: Check publication setup
+        run: >
+          ./gradlew
+          publishAllPublicationsToOSSRHRepository
+          publishAllPublicationsToSonatypeSnapshotRepository
+          --dry-run
+          --no-parallel
+      - name: Publish locally
+        run: ./gradlew publishToMavenLocal -Psigning.required=false --no-parallel --continue
+
   instrumentation-tests:
     name: Instrumentation tests
     runs-on: macOS-latest

diff --git a/plugins/publish-plugin/src/main/kotlin/AndroidAppyxPublishPlugin.kt b/plugins/publish-plugin/src/main/kotlin/AndroidAppyxPublishPlugin.kt
@@ -12,7 +12,11 @@ internal class AndroidAppyxPublishPlugin : ProjectPlugin() {
             publishing {
                 singleVariant(getComponentName()) {
                     withSourcesJar()
-                    withJavadocJar()
+                    /**
+                     * Currently not working with Multiplatform plugin and AGP 8+
+                     * https://github.com/bumble-tech/appyx/issues/582
+                     */
+                    // withJavadocJar()
                 }
             }
         }

diff --git a/plugins/publish-plugin/src/main/kotlin/ProjectPlugin.kt b/plugins/publish-plugin/src/main/kotlin/ProjectPlugin.kt
@@ -75,7 +75,7 @@ internal abstract class ProjectPlugin : Plugin<Project> {
     }
 
     private fun SigningExtension.configureSigning() {
-        isRequired = true
+        isRequired = project.findProperty("signing.required")?.toString()?.toBooleanStrict() ?: true
 
         sign(project.extensions.getByType(PublishingExtension::class.java).publications)