Skip to content

Commit

Permalink
Merge branch 'develop' into DIA-3574-update-sdk-dep-view-binding
Browse files Browse the repository at this point in the history
  • Loading branch information
andresilveirah committed Jul 1, 2024
2 parents dd1daf7 + 7fb7efe commit cb3ce70
Show file tree
Hide file tree
Showing 21 changed files with 459 additions and 459 deletions.
145 changes: 145 additions & 0 deletions .github/workflows/release-sdk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
name: Release
on:
push:
branches: [ master ]
jobs:
release-sdk:
runs-on: macos-latest
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
cache: gradle
- name: Build
run: ./gradlew cmplibrary:build
- name: Get current time
uses: 1466587594/get-current-time@v2
id: current-time
with:
format: (MMMM, DD, YYYY)
- name: Set version lib into VERSION_NAME variable
run: |
./gradlew cmplibrary:versionTxt
echo "VERSION_NAME=$(cat app/version.txt)" >> $GITHUB_ENV
- name: Update CHANGELOG.md
run: ./gradlew cmplibrary:changeLogUpdate
- name: Update README.md
run: ./gradlew cmplibrary:replaceInFile
- name: Read Release Note
id: release_note
uses: juliangruber/read-file-action@v1
with:
path: ./cmplibrary/release_note.txt
- name: Get the version
id: get_version
uses: juliangruber/read-file-action@v1
with:
path: ./cmplibrary/version.txt
- name: Prepare environment
env:
SIGNING_SECRET_KEY_RING_FILE_CONTENT: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE_CONTENT }}
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
run: sudo bash -c "echo '$SIGNING_SECRET_KEY_RING_FILE_CONTENT' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
- name: Release build
run: ./gradlew cmplibrary:assemble
- name: Source jar and dokka
run: ./gradlew androidSourcesJar javadocJar
- name: Publish to MavenCentral
run: ./gradlew publishReleasePublicationToSonatypeRepository #--max-workers 1 closeAndReleaseRepository --info
env:
OSSRH_TOKEN_USER: ${{ secrets.OSSRH_TOKEN_USER }}
OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }}
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
- name: Add, commit and push edited files
env:
GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
run: ./gradlew addCommitPush
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: v${{ steps.get_version.outputs.content }}
release_name: v${{ steps.get_version.outputs.content }}
body: |
## ${{ steps.get_version.outputs.content }} ${{ steps.current-time.outputs.formattedTime }}
${{ steps.release_note.outputs.content }}
draft: false
prerelease: false
release-metaapp:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- name: set up JDK 17
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
cache: gradle
- name: Bump versionCode
id: bump
run: |
git config user.email "andre@sourcepoint.com"
git config user.name "GitHub Action"
./gradlew metaapp:bumpVersionCode
- name: creating local.properties
run: touch local.properties
- name: generating MetaApp build release
id: buildRelease
run: ./gradlew :metaapp:bundleRelease :metaapp:bundleDebug :metaapp:assembleRelease :metaapp:assemblePreprod :metaapp:assembleDebug
- name: Sign APK
id: sign
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: samples/metaapp/build/outputs/bundle/release
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.SIGNING_ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }}
- name: Create service_account.json
id: createServiceAccount
run: |
echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
- name: 'Publish release artifact'
if: always()
uses: actions/upload-artifact@v2-preview
with:
name: 'release-artifact'
path: ${{ steps.sign.outputs.signedReleaseFile }}
- name: Deploy to Play Store
id: deploy
uses: r0adkll/upload-google-play@v1.0.15
with:
serviceAccountJson: service_account.json
packageName: com.sourcepointmeta.metaapp
releaseFiles: ${{ steps.sign.outputs.signedReleaseFile }}
track: production
- name: Add, commit and push edited files
env:
GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
run: ./gradlew addCommitPush
- name: Publish MetaAppPreprod artifact
if: always()
uses: actions/upload-artifact@v2-preview
with:
name: MetaAppPreprod
path: samples/metaapp/build/outputs/apk/preprod/metaapp-preprod.apk
- name: Publish MetaAppDebug artifact
if: always()
uses: actions/upload-artifact@v2-preview
with:
name: MetaAppDebug
path: samples/metaapp/build/outputs/apk/debug/metaapp-debug.apk
79 changes: 0 additions & 79 deletions .github/workflows/release.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/sdk-release.yml

This file was deleted.

19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 7.8.4 (June, 19, 2024)
* [DIA-4112](https://sourcepoint.atlassian.net/browse/DIA-4112) Fixed an issue preventing links from being opened on external browser [#825](https://github.com/SourcePointUSA/android-cmp-app/pull/825)
*[ HCD-525](https://sourcepoint.atlassian.net/browse/HCD-525) Improve documentation on authenticated consent [#823](https://github.com/SourcePointUSA/android-cmp-app/pull/823)

## 7.8.3 (June, 05, 2024)
* [DIA-3945](https://sourcepoint.atlassian.net/browse/DIA-3945) Added Tagalog as message language [#819](https://github.com/SourcePointUSA/android-cmp-app/pull/819)
* [DIA-3946](https://sourcepoint.atlassian.net/browse/DIA-3946) Fixed an issue causing consent uuid to be null for server-sided sampled properties [#820](https://github.com/SourcePointUSA/android-cmp-app/pull/820)
* [DIA-4086](https://sourcepoint.atlassian.net/browse/DIA-4086) Fixed an issue affecting users taking consent action when legislation applies is false [#822](https://github.com/SourcePointUSA/android-cmp-app/pull/822)

## 7.8.2 (May, 02, 2024)
* [DIA-3785](https://sourcepoint.atlassian.net/browse/DIA-3785) Fix an issue preventing USNat consent data from being stored after PM save & exit [#805](https://github.com/SourcePointUSA/android-cmp-app/pull/805)
* Fix an issue causing the SDK to show wrong translations in some scenarios. [#809](https://github.com/SourcePointUSA/android-cmp-app/pull/809)
* [DIA-2066](https://sourcepoint.atlassian.net/browse/DIA-2066) Improve experience of the back button on AndroidTV [#715](https://github.com/SourcePointUSA/android-cmp-app/pull/715)
* [HCD-496](https://sourcepoint.atlassian.net/browse/HCD-496) Improve documentation around MSPS consent status [#802](https://github.com/SourcePointUSA/android-cmp-app/pull/802)
* [HCD-502](https://sourcepoint.atlassian.net/browse/HCD-502) Improve documentation regarding supporting US Privacy String along USNat campaigns [#806](https://github.com/SourcePointUSA/android-cmp-app/pull/806)
* Internal code cleanup and dependencies updates from SDK and Example apps dependencies [#796](https://github.com/SourcePointUSA/android-cmp-app/pull/796), [#798](https://github.com/SourcePointUSA/android-cmp-app/pull/798), [#803](https://github.com/SourcePointUSA/android-cmp-app/pull/803), [#811](https://github.com/SourcePointUSA/android-cmp-app/pull/811), [#814](https://github.com/SourcePointUSA/android-cmp-app/pull/814)

## 7.7.1 (February, 22, 2024)
* [DIA-3622](https://sourcepoint.atlassian.net/browse/DIA-3622) GCM flag missing (#787)
* [DIA-3505](https://sourcepoint.atlassian.net/browse/DIA-3505) Handle no internet edge cases (#782)
Expand Down Expand Up @@ -706,4 +723,4 @@ For more information, the [Usage section of our README](https://github.com/Sourc

* Release activity on finish, fixing possible memory leaks
* Make `LoadTask` class `static`, fixing possible memory leaks
* Fix several lint warnings
* Fix several lint warnings
2 changes: 1 addition & 1 deletion NATIVEMESSAGE_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ available functions:
- `removeNativeView`: allows the app to remove the native layout after the user take an action.

## A complete example
A complete example can be found into the `samples/native-message-demo`
A complete example can be found into the `samples/nat-message-demo`



Loading

0 comments on commit cb3ce70

Please sign in to comment.