Skip to content

Commit

Permalink
Merge pull request #32 from mac-comp127/java-21-ci
Browse files Browse the repository at this point in the history
Updating CI tests to include Java 21 and 22, drop < 17
  • Loading branch information
pcantrell authored Sep 15, 2024
2 parents 0cc6f16 + c9b92d8 commit 279fb24
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,23 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest]
java-version: [18, 17, 16]
java-version: [17, 21, 22]
java-distro: [temurin, zulu]
# Gradle fails to detect JDK on GitHub CI on Windows when code asks for 17 and 21+ is
# installed. Revisit this when we bump the whole library from 17 to 21.
exclude:
- os: windows-latest
java-version: 21
- os: windows-latest
java-version: 22

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: ${{ matrix.java-distro }}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion src/edu/macalester/graphics/GraphicsText.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
Expand Down

0 comments on commit 279fb24

Please sign in to comment.