Merge pull request #117 from Worldpay/update-archive-base-name

Updated archive base names
Worldpay · Jul 30, 2020 · 14c327a · 14c327a
2 parents 0663d47 + 643db5a
commit 14c327a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/access-checkout/gradle.properties b/access-checkout/gradle.properties
@@ -1,4 +1,5 @@
 version=2.0.0
+archivesBaseName=access-checkout-android
 
 # Leave blank for local. These will be pulled from
 # gradle.properties in the GRADLE_HOME directory on CI

diff --git a/access-checkout/gradle/javadoc.gradle b/access-checkout/gradle/javadoc.gradle
@@ -16,9 +16,11 @@ dokka {
 task javadocJar(type: Jar, dependsOn: dokka) {
     classifier "javadoc"
     from "$buildDir/javadoc"
+    appendix "android"
 }
 
 task sourcesJar(type: Jar) {
     classifier "sources"
     from android.sourceSets.main.java.srcDirs
+    appendix "android"
 }
diff --git a/access-checkout/gradle/upload.gradle b/access-checkout/gradle/upload.gradle
@@ -22,7 +22,7 @@ uploadArchives {
             }
 
             pom.version = "${project.version}"
-            pom.artifactId = "access-checkout"
+            pom.artifactId = "${project.archivesBaseName}"
             pom.groupId = "com.worldpay.access"
 
             pom.project {

diff --git a/bitrise.yml b/bitrise.yml
@@ -71,9 +71,9 @@ workflows:
           - tag: "v$PROJECT_VERSION"
           - name: $PROJECT_VERSION
           - files_to_upload: |-
-              $LIBRARY_MODULE/build/outputs/aar/$LIBRARY_MODULE-$PROJECT_VERSION.aar
-              $LIBRARY_MODULE/build/libs/$LIBRARY_MODULE-$PROJECT_VERSION-javadoc.jar
-              $LIBRARY_MODULE/build/libs/$LIBRARY_MODULE-$PROJECT_VERSION-sources.jar
+              $LIBRARY_MODULE/build/outputs/aar/$ARTIFACT_NAME-$PROJECT_VERSION.aar
+              $LIBRARY_MODULE/build/libs/$ARTIFACT_NAME-$PROJECT_VERSION-javadoc.jar
+              $LIBRARY_MODULE/build/libs/$ARTIFACT_NAME-$PROJECT_VERSION-sources.jar
           - commit: $GIT_CLONE_COMMIT_HASH
           - body: Release of SDK version $PROJECT_VERSION
           - api_token: $GITHUB_PERSONAL_ACCESS_TOKEN
@@ -237,6 +237,9 @@ app:
   - LIBRARY_MODULE: access-checkout
     opts:
       is_expand: false
+  - ARTIFACT_NAME: access-checkout-android
+    opts:
+      is_expand: false
   - APP_MODULE: demo-app
     opts:
       is_expand: false