Skip to content

Commit

Permalink
build(deps): AGP 8.2.2 w/JDK21 compatibility, switch CI to JDK21
Browse files Browse the repository at this point in the history
AGP 8.2.x adds JDK21 compatibility, and 8.2.2 works with JaCoCo

So we can finally convert to the current LTS of the JDK, 21
  • Loading branch information
mikehardy committed Jan 23, 2024
1 parent 2c00751 commit c07a15c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 30 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17" # newer libraries require 17 now, force it everywhere

- name: Verify JDK17
# Default JDK varies depending on different runner flavors, make sure we are on 17
# Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
run: java -fullversion 2>&1 | grep '17.0'
shell: bash
java-version: "21"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17" # newer libraries require 17, also change jitpack.yml

- name: Verify JDK17
# Default JDK varies depending on different runner flavors, make sure we are on 17
# Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
run: java -fullversion 2>&1 | grep '17.0'
shell: bash
java-version: "21"

- name: Install Release Utilities
run: |
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/tests_emulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17" # newer libraries require 17 now, force it everywhere

- name: Verify JDK17
# Default JDK varies depending on different runner flavors, make sure we are on 17
# Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
run: java -fullversion 2>&1 | grep '17.0'
shell: bash
java-version: "21"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/tests_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17" # newer libraries require 17 now, force it everywhere

- name: Verify JDK17
# Default JDK varies depending on different runner flavors, make sure we are on 17
# Run a check that exits with error unless it is 17 version to future-proof against unexpected upgrades
run: java -fullversion 2>&1 | grep '17.0'
shell: bash
java-version: "21"

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17" # newer libraries require 17 now, force it everywhere
java-version: "21"

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v1
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
ext.androidx_test_version = '1.5.0'
ext.androidx_test_junit_version = '1.1.5'
ext.robolectric_version = '4.11.1'
ext.android_gradle_plugin = "8.2.1"
ext.android_gradle_plugin = "8.2.2"
ext.dokka_version = "1.9.10" // not the same with kotlin version!
ext.uiautomator_version = "2.3.0-beta01"

Expand Down

0 comments on commit c07a15c

Please sign in to comment.