From 98a276e1f2bf207671d593c5929a531c1599eaa0 Mon Sep 17 00:00:00 2001
From: Pun Butrach <pun.butrach@gmail.com>
Date: Mon, 29 Dec 2025 00:29:10 +0700
Subject: [PATCH 1/3] build: Use Gradle credentials system

---
 .github/workflows/build_pull_request.yml | 3 ++-
 .github/workflows/release.yml            | 3 ++-
 build.gradle.kts                         | 7 +------
 settings.gradle.kts                      | 5 +----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 87bd4c2..e64bc05 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -27,7 +27,8 @@ 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
 
       - name: Upload artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d7004c..b6025ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,8 @@ 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 assembleRelease --no-daemon
 
       - name: Setup Node.js
diff --git a/build.gradle.kts b/build.gradle.kts
index 22e7ff9..031ccc1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,12 +18,7 @@ subprojects {
         maven {
             name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/revanced/registry")
-            credentials {
-                username = providers.gradleProperty("gpr.user")
-                    .getOrElse(System.getenv("GITHUB_ACTOR"))
-                password =
-                    providers.gradleProperty("gpr.key").getOrElse(System.getenv("GITHUB_TOKEN"))
-            }
+            credentials(PasswordCredentials::class)
         }
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c3d815b..84da55c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,10 +7,7 @@ pluginManagement {
         maven {
             name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/revanced/registry")
-            credentials {
-                username = providers.gradleProperty("gpr.user").getOrElse(System.getenv("GITHUB_ACTOR"))
-                password = providers.gradleProperty("gpr.key").getOrElse(System.getenv("GITHUB_TOKEN"))
-            }
+            credentials(PasswordCredentials::class)
         }
     }
 }

From 882bb099ff1b68d0b61a5f36e3e5c084deab5135 Mon Sep 17 00:00:00 2001
From: Pun Butrach <pun.butrach@gmail.com>
Date: Fri, 9 Jan 2026 23:30:18 +0700
Subject: [PATCH 2/3] build: 0901

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 031ccc1..a2788cf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ subprojects {
         google()
         mavenCentral()
         maven {
-            name = "GitHubPackages"
+            name = "githubPackages"
             url = uri("https://maven.pkg.github.com/revanced/registry")
             credentials(PasswordCredentials::class)
         }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 84da55c..01578d1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
         google()
         maven {
-            name = "GitHubPackages"
+            name = "githubPackages"
             url = uri("https://maven.pkg.github.com/revanced/registry")
             credentials(PasswordCredentials::class)
         }

From 5f642c8db9163e67220353e4fb43493d9f093a40 Mon Sep 17 00:00:00 2001
From: Pun Butrach <pun.butrach@gmail.com>
Date: Tue, 20 Jan 2026 22:13:20 +0700
Subject: [PATCH 3/3] 2001

---
 .github/workflows/release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b6025ae..dc65c61 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build
         env:
-          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
           ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew assembleRelease --no-daemon
 
@@ -61,6 +61,8 @@ jobs:
         id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
           KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}