From 474766fcd4c2dc320a5b7f5f95d159a9e8a9e0ca Mon Sep 17 00:00:00 2001 From: Sarah Koop Date: Thu, 21 Sep 2023 10:31:54 -0500 Subject: [PATCH] Test version and package fix --- .github/workflows/release.yml | 102 +++++++++++++++++----------------- CHANGELOG.md | 4 ++ Drop-In/build.gradle | 18 +----- gradle/gradle-publish.gradle | 21 +++++-- 4 files changed, 73 insertions(+), 72 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71abdd3de..91ec4d5ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,54 +74,54 @@ jobs: signing_key_id: ${{ secrets.SIGNING_KEY_ID }} signing_key_pwd: ${{ secrets.SIGNING_KEY_PASSWORD }} signing_key_file: ${{ env.SIGNING_KEY_FILE_PATH }} - - name: Close and Release Repository - uses: ./.github/actions/close_and_release_repository - with: - sonatype_usr: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - sonatype_pwd: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - signing_key_id: ${{ secrets.SIGNING_KEY_ID }} - signing_key_pwd: ${{ secrets.SIGNING_KEY_PASSWORD }} - signing_key_file: ${{ env.SIGNING_KEY_FILE_PATH }} - bump_version: - needs: [ publish ] - name: Bump Version - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set GitHub User - uses: ./.github/actions/set_github_user - - name: Update Version - run: | - ./gradlew -PversionParam=${{ github.event.inputs.version }} changeGradleReleaseVersion - ./gradlew -PversionParam=${{ github.event.inputs.version }} changeREADMEVersion - ./gradlew -PversionParam=${{ github.event.inputs.version }} changeMigrationGuideVersion - ./gradlew -PversionParam=${{ github.event.inputs.version }} updateCHANGELOGVersion - git commit -am 'Release ${{ github.event.inputs.version }}' - git tag ${{ github.event.inputs.version }} -a -m 'Release ${{ github.event.inputs.version }}' - - ./gradlew -PversionParam=${{ github.event.inputs.version }} incrementSNAPSHOTVersion - ./gradlew incrementVersionCode - git commit -am 'Prepare for development' - git push origin master ${{ github.event.inputs.version }} - create_github_release: - needs: [ bump_version ] - name: Create GitHub Release - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - name: Save changelog entries to a file - run: | - sed -e '1,/##/d' -e '/##/,$d' CHANGELOG.md > changelog_entries.md - - name: Create GitHub release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.event.inputs.version }} - release_name: ${{ github.event.inputs.version }} - body_path: changelog_entries.md - draft: false - prerelease: false \ No newline at end of file +# - name: Close and Release Repository +# uses: ./.github/actions/close_and_release_repository +# with: +# sonatype_usr: ${{ secrets.SONATYPE_NEXUS_USERNAME }} +# sonatype_pwd: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} +# signing_key_id: ${{ secrets.SIGNING_KEY_ID }} +# signing_key_pwd: ${{ secrets.SIGNING_KEY_PASSWORD }} +# signing_key_file: ${{ env.SIGNING_KEY_FILE_PATH }} +# bump_version: +# needs: [ publish ] +# name: Bump Version +# runs-on: ubuntu-latest +# steps: +# - name: Checkout Repository +# uses: actions/checkout@v2 +# - name: Set GitHub User +# uses: ./.github/actions/set_github_user +# - name: Update Version +# run: | +# ./gradlew -PversionParam=${{ github.event.inputs.version }} changeGradleReleaseVersion +# ./gradlew -PversionParam=${{ github.event.inputs.version }} changeREADMEVersion +# ./gradlew -PversionParam=${{ github.event.inputs.version }} changeMigrationGuideVersion +# ./gradlew -PversionParam=${{ github.event.inputs.version }} updateCHANGELOGVersion +# git commit -am 'Release ${{ github.event.inputs.version }}' +# git tag ${{ github.event.inputs.version }} -a -m 'Release ${{ github.event.inputs.version }}' +# +# ./gradlew -PversionParam=${{ github.event.inputs.version }} incrementSNAPSHOTVersion +# ./gradlew incrementVersionCode +# git commit -am 'Prepare for development' +# git push origin master ${{ github.event.inputs.version }} +# create_github_release: +# needs: [ bump_version ] +# name: Create GitHub Release +# runs-on: ubuntu-latest +# steps: +# - name: Checkout Repository +# uses: actions/checkout@v2 +# - name: Save changelog entries to a file +# run: | +# sed -e '1,/##/d' -e '/##/,$d' CHANGELOG.md > changelog_entries.md +# - name: Create GitHub release +# id: create_release +# uses: actions/create-release@v1 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# tag_name: ${{ github.event.inputs.version }} +# release_name: ${{ github.event.inputs.version }} +# body_path: changelog_entries.md +# draft: false +# prerelease: false \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c937a48..381984223 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Braintree Android Drop-In Release Notes +## unreleased + +* Internal fixes + ## 6.13.0 * Bump braintree_android module dependency versions to `4.38.2` diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle index 62a968a91..81f162c34 100644 --- a/Drop-In/build.gradle +++ b/Drop-In/build.gradle @@ -109,28 +109,14 @@ dependencies { // region signing and publishing -task javadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - failOnError false -} - -task javadocsJar(type: Jar, dependsOn: javadocs) { - archiveClassifier.set('javadoc') - from javadocs.destinationDir -} - -task sourcesJar(type: Jar) { - archiveClassifier.set('sources') - from android.sourceSets.main.java.srcDirs -} - repositories { mavenCentral() } project.ext.name = "drop-in" project.ext.pom_name = "drop-in" +project.ext.group_id = "com.braintreepayments.api" +project.ext.version = rootProject.version project.ext.pom_desc = "Drop-in payment form for Braintree\'s Android SDK. Integrate this library to add a readymade UI for your payments." apply from: rootProject.file("gradle/gradle-publish.gradle") diff --git a/gradle/gradle-publish.gradle b/gradle/gradle-publish.gradle index c11326e64..d0730fbd7 100644 --- a/gradle/gradle-publish.gradle +++ b/gradle/gradle-publish.gradle @@ -10,11 +10,11 @@ afterEvaluate { publishing { publications { release(MavenPublication) { - groupId group - version project.version + groupId project.ext.group_id + version project.ext.version artifactId project.ext.name from components.release - artifact sourcesJar + artifact androidSourcesJar artifact javadocsJar pom { @@ -52,6 +52,17 @@ afterEvaluate { } } +task javadocs(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + failOnError false +} + +task javadocsJar(type: Jar, dependsOn: javadocs) { + archiveClassifier.set('javadoc') + from javadocs.destinationDir +} + task androidSourcesJar(type: Jar) { archiveClassifier.set('sources') from android.sourceSets.main.java.srcDirs @@ -59,6 +70,6 @@ task androidSourcesJar(type: Jar) { } artifacts { - archives sourcesJar + archives androidSourcesJar archives javadocsJar -} +} \ No newline at end of file