diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index cab9162..fd2da26 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -24,5 +24,6 @@ jobs: - name: Build env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build --no-daemon diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 526e8b4..5749965 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,8 @@ jobs: - name: Build env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build clean - name: Setup Node.js @@ -53,4 +54,6 @@ jobs: - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} run: npm exec semantic-release diff --git a/build.gradle.kts b/build.gradle.kts index 5ccaf50..765fbad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,12 +19,10 @@ repositories { mavenLocal() google() maven { + name = "githubPackages" // A repository must be specified for some reason. "registry" is a dummy. url = uri("https://maven.pkg.github.com/revanced/registry") - credentials { - username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") - } + credentials(PasswordCredentials::class) } maven { url = uri("https://jitpack.io") } }