Brush up deployment tasks so that no dependencies get lost

A dependent task for bintrayUpload will overwrite the copied POM,
which has missing runtime dependencies.

Author: mannodermaus

.circleci/config.yml

@@ -102,100 +102,53 @@ jobs:
           path: instrumentation/runner/build/reports
           destination: instrumentation-runner
 
-  deploy_plugin_snapshots:
+  deploy_plugin:
     <<: *defaults
     steps:
       - attach_workspace:
           at: ~/root
       - restore_cache:
           <<: *cache_key
       - run:
-          name: (Plugin) Deploy SNAPSHOTs
-          command: cd plugin && ./gradlew publishLibraryPublicationToSnapshotRepository --stacktrace --no-daemon
+          name: (Plugin) Deploy
+          command: cd plugin && ./gradlew deploy --stacktrace --no-daemon
       - store_artifacts:
           path: plugin/android-junit5/build/publications
           destination: plugin/publications/snapshots
 
-  deploy_instrumentation_snapshots:
+  deploy_instrumentation:
     <<: *defaults
     steps:
       - attach_workspace:
           at: ~/root
       - restore_cache:
           <<: *cache_key
       - run:
-          name: (Instrumentation) Deploy SNAPSHOTs
-          command: cd instrumentation && ./gradlew publishLibraryPublicationToSnapshotRepository --stacktrace --no-daemon
+          name: (Instrumentation) Deploy
+          command: cd instrumentation && ./gradlew deploy --stacktrace --no-daemon
       - store_artifacts:
           path: instrumentation/core/build/publications
           destination: instrumentation-core/publications/snapshots
       - store_artifacts:
           path: instrumentation/runner/build/publications
           destination: instrumentation-runner/publications/snapshots
 
-  deploy_plugin_release:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/root
-      - restore_cache:
-          <<: *cache_key
-      - run:
-          name: (Plugin) Deploy
-          command: cd plugin && ./gradlew generatePomFileForLibraryPublication publish :android-junit5:bintrayUpload --stacktrace --no-daemon
-      - store_artifacts:
-          path: plugin/android-junit5/build/publications
-          destination: plugin/publications/releases
-
-  deploy_instrumentation_release:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/root
-      - restore_cache:
-          <<: *cache_key
-      - run:
-          name: (Instrumentation) Deploy
-          command: cd instrumentation && ./gradlew generatePomFileForLibraryPublication publish :api:bintrayUpload :core:bintrayUpload :runner:bintrayUpload --stacktrace --no-daemon
-      - store_artifacts:
-          path: instrumentation/core/build/publications
-          destination: instrumentation-core/publications/releases
-      - store_artifacts:
-          path: instrumentation/runner/build/publications
-          destination: instrumentation-runner/publications/releases
-
 workflows:
   version: 2
 
   build_deploy:
     jobs:
       - build_plugin
       - build_instrumentation
-      - deploy_plugin_snapshots:
-          requires:
-            - build_plugin
-          filters:
-            branches:
-              only: master
-      - deploy_instrumentation_snapshots:
-          requires:
-            - build_instrumentation
-          filters:
-            branches:
-              only: master
-      - deploy_plugin_release:
+      - deploy_plugin:
           requires:
             - build_plugin
           filters:
             branches:
               only: master
-            tags:
-              only: plugin-*
-      - deploy_instrumentation_release:
+      - deploy_instrumentation:
           requires:
             - build_instrumentation
           filters:
             branches:
               only: master
-            tags:
-              only: instrumentation-*

gradle/deployment.gradle

@@ -100,12 +100,14 @@ task copyPom(type: Copy) {
   include "pom-default.xml"
 }
 
-publish.dependsOn copyPom
-
 // ------------------------------------------------------------------------------------------------
 // Target Configuration
 // ------------------------------------------------------------------------------------------------
 
+// Unified task for snapshots & releases
+task deploy() {
+}
+
 project.configure(project) {
   if (project.version.endsWith("-SNAPSHOT")) {
     // Configure deployment of snapshot versions to Sonatype OSS
@@ -122,6 +124,8 @@ project.configure(project) {
       }
     }
     project.tasks.getByName("bintrayUpload").enabled = false
+    publish.dependsOn copyPom
+    deploy.finalizedBy "publishLibraryPublicationToSnapshotRepository"
 
   } else {
     // Configure deployment of release versions to Bintray
@@ -152,5 +156,8 @@ project.configure(project) {
         }
       }
     }
+    // Very important! Otherwise, the POM will be overwritten & have missing dependencies
+    project.tasks.getByName("install").finalizedBy copyPom
+    deploy.finalizedBy "generatePomFileForLibraryPublication", "publish", "bintrayUpload"
   }
 }