build: Lower JDK to 17 and minSdk to 21 (#4369)

This commit is contained in:
James Rich 2026-01-29 20:04:30 -06:00 committed by GitHub
parent 2b51926e24
commit 039e785a2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 53 additions and 62 deletions

View file

@ -12,8 +12,7 @@ jobs:
lint:
if: github.repository == 'meshtastic/Meshtastic-Android'
uses: ./.github/workflows/reusable-lint.yml
secrets:
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
secrets: inherit
build:
needs: lint
@ -21,11 +20,7 @@ jobs:
uses: ./.github/workflows/reusable-android-build.yml
with:
upload_artifacts: false
secrets:
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
DATADOG_APPLICATION_ID: ${{ secrets.DATADOG_APPLICATION_ID }}
DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
secrets: inherit
androidTest:
needs: lint
@ -35,9 +30,7 @@ jobs:
api_levels: '[26, 35]' # Run on both API 26 and 35 for merge queue
test_flavors: 'both' # Run both flavors for merge queue (comprehensive)
upload_artifacts: false
secrets:
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
secrets: inherit
check-workflow-status:
name: Check Workflow Status # Matches another in pull-request, and is required for merge to main.

View file

@ -38,8 +38,7 @@ jobs:
needs: check-changes
if: needs.check-changes.outputs.code_changed == 'true'
uses: ./.github/workflows/reusable-lint.yml
secrets:
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
secrets: inherit
build:
needs: lint

View file

@ -42,10 +42,10 @@ jobs:
fetch-depth: 0
submodules: 'recursive'
- name: Set up JDK 21
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
java-version: '21'
java-version: '17'
distribution: 'jetbrains'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View file

@ -5,21 +5,25 @@ on:
secrets:
GRADLE_ENCRYPTION_KEY:
required: false
GRADLE_CACHE_URL:
required: false
jobs:
lint:
runs-on: ubuntu-latest # Lint is fast, doesn't need large runner
timeout-minutes: 10
env:
GRADLE_CACHE_URL: ${{ secrets.GRADLE_CACHE_URL }}
steps:
- name: Checkout code
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Set up JDK 21
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
java-version: '21'
java-version: '17'
distribution: 'jetbrains'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}