From ad251e9998c37c51e2300aa362c0563962fa3baa Mon Sep 17 00:00:00 2001 From: Robert Mayer Date: Sun, 13 Aug 2023 10:18:14 +0200 Subject: [PATCH] try Java 22-ea and GraalVM 20 --- .github/workflows/graalvm.yml | 5 ++--- .github/workflows/maven.yml | 2 +- lambda/src/main/java/io/github/jmurmel/LambdaJ.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml index 06c455da..5cc6105f 100644 --- a/.github/workflows/graalvm.yml +++ b/.github/workflows/graalvm.yml @@ -12,7 +12,7 @@ on: - "scribbles/**" env: - JAVA_VERSION: 17 + JAVA_VERSION: 20 jobs: build: @@ -26,9 +26,8 @@ jobs: - uses: graalvm/setup-graalvm@v1 with: - distribution: 'graalvm-community' + distribution: 'graalvm' java-version: ${{ env.JAVA_VERSION }} - components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0d492859..755ff69c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '17', '20', '21-ea' ] + java: [ '8', '17', '20', '21-ea', '22-ea' ] name: Java ${{ matrix.Java }} CI steps: diff --git a/lambda/src/main/java/io/github/jmurmel/LambdaJ.java b/lambda/src/main/java/io/github/jmurmel/LambdaJ.java index 6e5c511b..bb5edabe 100644 --- a/lambda/src/main/java/io/github/jmurmel/LambdaJ.java +++ b/lambda/src/main/java/io/github/jmurmel/LambdaJ.java @@ -1913,7 +1913,7 @@ private static ConsCell nconc2(ConsCell first, Object rest) { /* qq-expand and qq-expand-list are based on "Quasiquotation in Lisp (1999) by Alan Bawden" - https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.309.227 + https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.309.227, https://3e8.org/pub/scheme/doc/Quasiquotation%20in%20Lisp%20(Bawden).pdf (defun qq-expand (x) (cond ((null x)