diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07229b208..fcfade67d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2022, macos-13, macos-14] type: [native, jvm] env: - JAVA_VERSION: "22" + JAVA_VERSION: "23" JDK_IDENTIFIER: "latest" MX_ENV: "trufflesqueak-${{ matrix.type }}" VERBOSE_GRAALVM_LAUNCHERS: true @@ -155,7 +155,7 @@ jobs: - name: Set up Oracle GraalVM uses: graalvm/setup-graalvm@v1 with: - java-version: '${{ env.JAVA_VERSION }}.0.2' + java-version: '${{ env.JAVA_VERSION }}.0.1' distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} if: ${{ matrix.type == 'native' }} @@ -201,7 +201,7 @@ jobs: run: 'trufflesqueak --code "(String streamContents: [:s | SystemReporter basicNew reportImage: s; reportVM: s; reportVMParameters: s]) withUnixLineEndings" images/test-64bit.image' - name: Run trufflesqueak-polyglot-get on TruffleSqueak JVM standalone run: | - trufflesqueak-polyglot-get -v 24.0.0 -a js + trufflesqueak-polyglot-get -v 24.1.1 -a js trufflesqueak --code "Polyglot eval: 'js' string: 'new Object({hello_world: 42})'" images/test-64bit.image if: ${{ matrix.type == 'jvm' }} - name: Upload TruffleSqueak standalone diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py index 0387e38e1..3d6a56283 100644 --- a/mx.trufflesqueak/suite.py +++ b/mx.trufflesqueak/suite.py @@ -11,7 +11,7 @@ # METADATA # ========================================================================== "name": "trufflesqueak", - "mxversion": "7.0.3", + "mxversion": "7.33.1", "versionConflictResolution": "latest", "version": "24.1.0", @@ -53,7 +53,7 @@ "suites": [{ "name": "truffle", "subdir": True, - "version": "vm-24.0.2", + "version": "vm-24.1.1", "urls": [{ "url": "https://github.com/oracle/graal", "kind": "git" diff --git a/src/de.hpi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java b/src/de.hpi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java index 9e3a58c70..9434f7099 100644 --- a/src/de.hpi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java +++ b/src/de.hpi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java @@ -13,7 +13,7 @@ public final class SqueakLanguageConfig { public static final String MIME_TYPE = "application/x-smalltalk"; public static final String NAME = "Squeak/Smalltalk"; public static final String ST_MIME_TYPE = "text/x-smalltalk"; - public static final String VERSION = "24.0.2"; // sync with Truffle import + public static final String VERSION = "24.1.1"; // sync with Truffle import public static final String WEBSITE = "https://github.com/hpi-swa/trufflesqueak"; public static final String[][] SUPPORTED_IMAGES = {