diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3d3ffa0..905bded 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -52,8 +52,8 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@v2 env: - GITHUB_PACKAGES_USER: ${{ github.actor }} - GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_PACKAGE_USER: ${{ github.actor }} + GH_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index fe7ff18..d96ae97 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -8,7 +8,10 @@ on: jobs: review: - uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@master + uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@main with: build-tool: gradle + java-version: '11' + gradle-module: tyro-pay-android + gradle-configuration: 'releaseRuntimeClasspath' secrets: inherit diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 14343c3..0c9f7b6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: - name: Publish aar to GitHub Packages run: ./gradlew publish env: - GITHUB_PACKAGES_USER: ${{github.actor}} - GITHUB_PACKAGES_TOKEN: ${{secrets.GITHUB_TOKEN}} + GH_PACKAGE_USER: ${{github.actor}} + GH_PACKAGE_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb3ec48..3fa4977 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,8 +63,8 @@ jobs: - name: Publish aar to GitHub Packages run: ./gradlew publish env: - GITHUB_PACKAGES_USER: ${{github.actor}} - GITHUB_PACKAGES_TOKEN: ${{secrets.GITHUB_TOKEN}} + GH_PACKAGE_USER: ${{github.actor}} + GH_PACKAGE_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/README.md b/README.md index 175b35c..709234e 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ This SDK supports easy integration of Tyro's Pay API in you Android app. ### Configuration Store GitHub Packages Username -`export GITHUB_PACKAGES_USER={YOUR_GITHUB_USERNAME}` +`export GH_PACKAGE_USER={YOUR_GITHUB_USERNAME}` Setup GitHub Personal Access Token (PAT) * Follow this [GitHub guide](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic) to generate a PAT with `read:packages` permission * Store the new token as an environment variable: -`export GITHUB_PACKAGES_TOKEN={YOUR_GITHUB_TOKEN}` +`export GH_PACKAGE_TOKEN={YOUR_GITHUB_TOKEN}` Add `tyro-pay-api-sdk-android` to your `build.gradle` dependencies. @@ -38,8 +38,8 @@ repositories { maven { url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") + password = System.getenv("GH_PACKAGE_TOKEN") } } } diff --git a/settings.gradle b/settings.gradle index b51075c..745ff2d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,8 +17,8 @@ dependencyResolutionManagement { maven { url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") ?: System.getProperty("github.username")?.toString() - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") ?: System.getProperty("github.username")?.toString() + password = System.getenv("GH_PACKAGE_TOKEN") } } diff --git a/tyro-pay-android/build.gradle b/tyro-pay-android/build.gradle index b3081a7..e73427d 100644 --- a/tyro-pay-android/build.gradle +++ b/tyro-pay-android/build.gradle @@ -110,8 +110,8 @@ afterEvaluate { name= 'GitHubPackages' url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") + password = System.getenv("GH_PACKAGE_TOKEN") } } }