Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions .github/workflows/build-capacitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,6 @@ jobs:
cache: 'pnpm'
cache-dependency-path: pnpm-lock.yaml

- name: Setup Java
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'

- name: Setup Android SDK
uses: android-actions/setup-android@v4

Expand All @@ -179,6 +172,18 @@ jobs:
npx cap add android 2>/dev/null || true
npx cap sync android

# setup-java's gradle cache keys off gradle-wrapper.properties / build.gradle
# files, which do not exist until Capacitor generates the native android/
# project above (it is gitignored, not committed) — so this step must run
# after "Add + Sync Capacitor Android", not before.
- name: Setup Java
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'
cache-dependency-path: frontend/platforms/mobile/android/**/*.gradle*

- name: Build Android (Debug)
if: inputs.build_type == 'debug'
run: |
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/build-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,6 @@ jobs:
cache: 'pnpm'
cache-dependency-path: pnpm-lock.yaml

- name: Setup Java
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'

- name: Setup Android SDK
uses: android-actions/setup-android@v4

Expand All @@ -169,6 +162,18 @@ jobs:
pnpm install --frozen-lockfile
cd platforms/react-native && pnpm install --frozen-lockfile

# setup-java's gradle cache keys off gradle-wrapper.properties / build.gradle
# files, which do not exist until "Install dependencies" generates the
# native android/ project above (it is gitignored, not committed) — so
# this step must run after "Install dependencies", not before.
- name: Setup Java
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'
cache-dependency-path: frontend/platforms/react-native/android/**/*.gradle*

- name: Build Android (Debug)
if: inputs.build_type == 'debug'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ jobs:
# files, which do not exist until Capacitor generates the native android/
# project above (it is gitignored, not committed) — so this step must run
# after "Sync Capacitor Android", not before.
- uses: actions/setup-java@v5
- uses: actions/setup-java@v6
with:
java-version: '17'
distribution: 'temurin'
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/deploy-mobile-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,6 @@ jobs:
cache: 'pnpm'
cache-dependency-path: pnpm-lock.yaml

- name: Setup Java
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'

- name: Setup Android SDK
uses: android-actions/setup-android@v4

Expand All @@ -97,6 +90,18 @@ jobs:
working-directory: frontend/platforms/mobile
run: npx cap sync android

# setup-java's gradle cache keys off gradle-wrapper.properties / build.gradle
# files, which do not exist until "Sync Capacitor" generates/updates the
# native android/ project above (it is gitignored, not committed) — so
# this step must run after "Sync Capacitor", not before.
- name: Setup Java
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'gradle'
cache-dependency-path: frontend/platforms/mobile/android/**/*.gradle*

- name: Decode Android keystore
working-directory: frontend/platforms/mobile/android
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ jobs:
uses: pnpm/action-setup@v6

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ jobs:
cache-dependency-path: pnpm-lock.yaml

- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
distribution: 'temurin'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ jobs:

- name: TruffleHog scan
id: trufflehog
uses: trufflesecurity/trufflehog@bcfcf73aaf4759d4dadc2783177c245a02792318 # v3.97.0
uses: trufflesecurity/trufflehog@20652fbbdefffcdaa493a5bf57ab2ac6b1db715b # v3.97.1
with:
path: ./
base: ${{ github.event.pull_request.base.sha || '' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ jobs:
fetch-depth: 0

- name: TruffleHog OSS
uses: trufflesecurity/trufflehog@bcfcf73aaf4759d4dadc2783177c245a02792318 # v3.97.0
uses: trufflesecurity/trufflehog@20652fbbdefffcdaa493a5bf57ab2ac6b1db715b # v3.97.1
with:
path: ./
base: ${{ github.event.repository.default_branch }}
Expand Down
Loading