Merge pull request #3 from tyro/add-dependency-review

Point dependency review workflow to main
tyro · Jun 12, 2024 · d9dd394 · d9dd394
2 parents 717f791 + 529421a
commit d9dd394
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}}
 
 
 
diff --git 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
@@ -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
@@ -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")
                }
            }
         }