From fc4bc2f5e3df81c8aa8a51716c49308ca8919872 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Tue, 10 Mar 2026 16:32:11 +0000 Subject: [PATCH 1/5] Support JitPack token in CI and build Wire JITPACK_TOKEN from GitHub Secrets into CI workflows and the Gradle build. Updated .github/workflows/ci.yml, docker.yml, and verify-apk.yml to pass JITPACK_TOKEN (or write jitpack.token to local.properties). Updated build.gradle.kts to read jitpack.token / JITPACK_TOKEN and configure the https://jitpack.io Maven repository to use the token as credentials when present, enabling authenticated JitPack access in CI and local builds. --- .github/workflows/ci.yml | 2 ++ .github/workflows/docker.yml | 1 + .github/workflows/verify-apk.yml | 1 + build.gradle.kts | 8 +++++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76d88814e..7dadfe013 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,7 @@ jobs: env: GPR_USERNAME: ${{ github.actor }} GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JITPACK_TOKEN: ${{ secrets.JITPACK_TOKEN }} - name: Run tests uses: reactivecircus/android-emulator-runner@v2 @@ -91,3 +92,4 @@ jobs: env: GPR_USERNAME: ${{ github.actor }} GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JITPACK_TOKEN: ${{ secrets.JITPACK_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5f7aefb21..81fcc7018 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,6 +48,7 @@ jobs: run: | echo "gpr.username=${{ github.actor }}" > local.properties echo "gpr.token=${{ secrets.GITHUB_TOKEN }}" >> local.properties + echo "jitpack.token=${{ secrets.JITPACK_TOKEN }}" >> local.properties echo "# Automatically generated for CI build" >> local.properties - name: Determine ref to build diff --git a/.github/workflows/verify-apk.yml b/.github/workflows/verify-apk.yml index 41c615560..38bc74c9e 100644 --- a/.github/workflows/verify-apk.yml +++ b/.github/workflows/verify-apk.yml @@ -77,6 +77,7 @@ jobs: run: | echo "gpr.username=${{ github.actor }}" > local.properties echo "gpr.token=${{ secrets.GITHUB_TOKEN }}" >> local.properties + echo "jitpack.token=${{ secrets.JITPACK_TOKEN }}" >> local.properties echo "# Automatically generated for verify-apk workflow" >> local.properties - name: Download official APK diff --git a/build.gradle.kts b/build.gradle.kts index 50f98a2a0..c6ada33f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,11 +35,17 @@ allprojects { } val gprUsername = properties["gpr.username"] as? String ?: System.getenv("GPR_USERNAME") val gprToken = properties["gpr.token"] as? String ?: System.getenv("GPR_TOKEN") + val jitpackToken = properties["jitpack.token"] as? String ?: System.getenv("JITPACK_TOKEN") google() mavenCentral() mavenLocal() - maven { url = uri("https://jitpack.io") } + maven { + url = uri("https://jitpack.io") + if (!jitpackToken.isNullOrEmpty()) { + credentials { username = jitpackToken } + } + } maven { url = uri("https://maven.pkg.github.com/trustwallet/wallet-core") credentials { From da74a7c5d26413bcf7178b8a67e1e123d33d910e Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Tue, 10 Mar 2026 16:46:20 +0000 Subject: [PATCH 2/5] Update build.gradle.kts --- build.gradle.kts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6ada33f7..b1a4e0010 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,19 +54,6 @@ allprojects { } } } - - dependencyLocking { - lockAllConfigurations() - } -} - -subprojects { - dependencyLocking { - lockAllConfigurations() - } - configurations.configureEach { - resolutionStrategy.activateDependencyLocking() - } } tasks.register("clean", Delete::class) { From 6eca5b02eab2faeee276fac5126c328f533d6be4 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Tue, 10 Mar 2026 18:57:00 +0000 Subject: [PATCH 3/5] Remove JitPack token and simplify JitPack config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Stop passing JITPACK_TOKEN and remove credential usage for JitPack across CI. Workflows (.github/workflows/ci.yml, docker.yml, verify-apk.yml) no longer write or expose jitpack.token and the Gradle setup step was renamed to "Setup Gradle" with caching disabled. build.gradle.kts no longer reads the jitpack token or injects credentials for the JitPack maven block — the repository is kept but without credentials. Minor formatting/whitespace cleanup included. --- .github/workflows/ci.yml | 6 ++---- .github/workflows/docker.yml | 1 - .github/workflows/verify-apk.yml | 1 - build.gradle.kts | 10 ++-------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7dadfe013..5b3cf76f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,17 +67,16 @@ jobs: ~/.android/adb* key: avd-29-2g-${{ runner.os }} - - name: Gradle cache + - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: - cache-read-only: ${{ github.ref != 'refs/heads/main' }} + cache-disabled: true - name: Build tests run: just build-test env: GPR_USERNAME: ${{ github.actor }} GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }} - JITPACK_TOKEN: ${{ secrets.JITPACK_TOKEN }} - name: Run tests uses: reactivecircus/android-emulator-runner@v2 @@ -92,4 +91,3 @@ jobs: env: GPR_USERNAME: ${{ github.actor }} GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }} - JITPACK_TOKEN: ${{ secrets.JITPACK_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 81fcc7018..5f7aefb21 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -48,7 +48,6 @@ jobs: run: | echo "gpr.username=${{ github.actor }}" > local.properties echo "gpr.token=${{ secrets.GITHUB_TOKEN }}" >> local.properties - echo "jitpack.token=${{ secrets.JITPACK_TOKEN }}" >> local.properties echo "# Automatically generated for CI build" >> local.properties - name: Determine ref to build diff --git a/.github/workflows/verify-apk.yml b/.github/workflows/verify-apk.yml index 38bc74c9e..41c615560 100644 --- a/.github/workflows/verify-apk.yml +++ b/.github/workflows/verify-apk.yml @@ -77,7 +77,6 @@ jobs: run: | echo "gpr.username=${{ github.actor }}" > local.properties echo "gpr.token=${{ secrets.GITHUB_TOKEN }}" >> local.properties - echo "jitpack.token=${{ secrets.JITPACK_TOKEN }}" >> local.properties echo "# Automatically generated for verify-apk workflow" >> local.properties - name: Download official APK diff --git a/build.gradle.kts b/build.gradle.kts index b1a4e0010..5825dbfd1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,17 +35,10 @@ allprojects { } val gprUsername = properties["gpr.username"] as? String ?: System.getenv("GPR_USERNAME") val gprToken = properties["gpr.token"] as? String ?: System.getenv("GPR_TOKEN") - val jitpackToken = properties["jitpack.token"] as? String ?: System.getenv("JITPACK_TOKEN") - google() mavenCentral() mavenLocal() - maven { - url = uri("https://jitpack.io") - if (!jitpackToken.isNullOrEmpty()) { - credentials { username = jitpackToken } - } - } + maven { url = uri("https://jitpack.io") } maven { url = uri("https://maven.pkg.github.com/trustwallet/wallet-core") credentials { @@ -54,6 +47,7 @@ allprojects { } } } + } tasks.register("clean", Delete::class) { From c7c1052bde894fa8a71e2d4bdcaf016b2bdeabe6 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Tue, 10 Mar 2026 18:59:47 +0000 Subject: [PATCH 4/5] Update build.gradle.kts --- build.gradle.kts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 5825dbfd1..849fd3a3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,6 +48,18 @@ allprojects { } } + dependencyLocking { + lockAllConfigurations() + } +} + +subprojects { + dependencyLocking { + lockAllConfigurations() + } + configurations.configureEach { + resolutionStrategy.activateDependencyLocking() + } } tasks.register("clean", Delete::class) { From 3e6278034c9a191b862f1d8be3fd4d0702e6d57e Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Tue, 10 Mar 2026 19:00:16 +0000 Subject: [PATCH 5/5] Update build.gradle.kts --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 849fd3a3a..50f98a2a0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,7 @@ allprojects { } val gprUsername = properties["gpr.username"] as? String ?: System.getenv("GPR_USERNAME") val gprToken = properties["gpr.token"] as? String ?: System.getenv("GPR_TOKEN") + google() mavenCentral() mavenLocal()