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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
java-version: [17, 21, 24]
java-version: [21, 24]
steps:
- uses: actions/checkout@v5
with:
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Spotless Check
# Spotless must run in a different invocation, because
# it has some weird Gradle configuration/variant issue
if: ${{ matrix.java-version == '17' }}
if: ${{ matrix.java-version == '21' }}
run: ./gradlew spotlessCheck --scan

- name: Build
Expand All @@ -61,7 +61,7 @@ jobs:
run: ./gradlew jmh

- name: Cache Bazel stuff
if: ${{ matrix.java-version == '17' }}
if: ${{ matrix.java-version == '21' }}
uses: actions/cache@v4
with:
path: |
Expand All @@ -70,7 +70,7 @@ jobs:
restore-keys: bazel-

- name: Conformance tests
if: ${{ matrix.java-version == '17' }}
if: ${{ matrix.java-version == '21' }}
run: conformance/run-conformance-tests.sh

- name: Capture test results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:
SHA=$(git rev-parse HEAD)
gh api repos/projectnessie/cel-java/commits/${SHA}/check-runs --jq 'if ([.check_runs[] | select(.name | endswith("Release") or startswith("Dependabot ") or startswith("codecov/") or startswith("Report") | not ) | .conclusion // "pending" ] | unique == ["success"] or unique == []) then "OK" else error("Commit checks are not OK") end'

- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
java-version: 21
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Gradle
build/
.gradle/
buildSrc/.kotlin/

# Maven
**/.mvn/wrapper/maven-wrapper.jar
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ Those submodules are required to build the CEL-Java project.
You need to run `git submodule init` and `git submodule update` after a fresh clone of this repo.

Build requirements:
* Java 11 or newer, it's a Gradle-wrapper build (it's fast ;) )
* Java 21 or newer, it's a Gradle-wrapper build (it's fast ;) )

Runtime requirements:
* Java 8 or newer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just wondering:
if we have a runtime requirement of only java 8, is it intentional that CI only runs tests with 17+ ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, that's probably fine (was like that forever)

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ dependencies {
implementation(libs.errorprone.plugin)
}

java { toolchain { languageVersion.set(JavaLanguageVersion.of(11)) } }
java { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
2 changes: 1 addition & 1 deletion conformance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If your environment is already setup, just run the shell script
The CEL-spec conformance test suite is written in Go and uses the bazel build tool.

Required tools:
* [Bazel build tool](https://bazel.build/)
* [Bazel build tool](https://bazel.build/) (see [bazelisk](https://github.com/bazelbuild/bazelisk?tab=readme-ov-file#installation))

See [Bazel web site](https://bazel.build/install) for installation instructions.
Do **not** use the `bazel-bootstrap` package on Ubuntu, because it comes with
Expand Down