From ea334dc474412ef8ba5d755ab1e16fbab5e049eb Mon Sep 17 00:00:00 2001 From: Ashley Sommer Date: Sun, 31 Mar 2024 17:42:49 +1000 Subject: [PATCH] bump devtools elixer to 1.14.5, and erlang/OTP 24 to latest 24.3.4.16 --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- .tool-versions | 4 ++-- CHANGELOG.md | 4 ++++ gradle.properties | 2 +- resources/META-INF/changelog.html | 7 +++++++ .../parser_definition/ElixirLangElixirParsingTestCase.java | 3 --- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 408ab803d..d16c52b59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,10 +18,10 @@ jobs: - name: Set up Elixir uses: erlef/setup-beam@v1 with: - otp-version: 24.3.4.6 - elixir-version: 1.13.0 + otp-version: 24.3.4.16 + elixir-version: 1.14.5 - name: Export OTP_RELEASE - run: echo "OTP_RELEASE=24.3.4.6" >> $GITHUB_ENV + run: echo "OTP_RELEASE=24.3.4.16" >> $GITHUB_ENV - name: Export ERLANG_SDK_HOME run: echo "ERLANG_SDK_HOME=`erl -eval 'io:format("~s", [code:root_dir()]).' -noshell -run init stop`" >> $GITHUB_ENV - name: Grant execute permission for gradlew diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5b66d44a..aa1f19a94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,10 +19,10 @@ jobs: - name: Set up Elixir uses: erlef/setup-beam@v1 with: - otp-version: 24.3.4.6 - elixir-version: 1.13.0 + otp-version: 24.3.4.16 + elixir-version: 1.14.5 - name: Export OTP_RELEASE - run: echo "OTP_RELEASE=24.3.4.6" >> $GITHUB_ENV + run: echo "OTP_RELEASE=24.3.4.16" >> $GITHUB_ENV - name: Export ERLANG_SDK_HOME run: echo "ERLANG_SDK_HOME=`erl -eval 'io:format("~s", [code:root_dir()]).' -noshell -run init stop`" >> $GITHUB_ENV - name: Grant execute permission for gradlew diff --git a/.tool-versions b/.tool-versions index bd3da7d1b..430139b32 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -elixir 1.13.4-otp-24 -erlang 24.3.4.6 +elixir 1.14.5-otp-24 +erlang 24.3.4.16 java openjdk-17.0.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e1f8bc1b..e33c7b2ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ * Add the correct ERL and elixir arguments for starting IEx depending on the version of Elixir SDK. * [#3563](https://github.com/KronicDeth/intellij-elixir/pull/3563) - [@ashleysommer](https://github.com/ashleysommer) * Bundle latest OtpErlang.jar from JInterface v1.14 for OTP v26. +* [#3564](https://github.com/KronicDeth/intellij-elixir/pull/3564) - [@ashleysommer](https://github.com/ashleysommer) + * Bump devtools + * Elixir to 1.14.5 + * Erlang/OTP 24 to 24.3.4.16 ## v17.0.0 diff --git a/gradle.properties b/gradle.properties index 5831be295..4a55e0f68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ ideaVersion=2023.3 javaVersion=17 javaTargetVersion=17 sources=true -elixirVersion=1.13.4 +elixirVersion=1.14.5 publishChannels=canary org.gradle.jvmargs=-Xmx4096m diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html index 509fb3507..d864d4745 100644 --- a/resources/META-INF/changelog.html +++ b/resources/META-INF/changelog.html @@ -8,6 +8,13 @@

v17.0.1

  • Render code snippets that are not links.
  • Add the correct ERL and elixir arguments for starting IEx depending on the version of Elixir SDK.
  • Bundle latest OtpErlang.jar from JInterface v1.14 for OTP v26.
    • +
  • + Bump devtools + +
    • diff --git a/tests/org/elixir_lang/parser_definition/ElixirLangElixirParsingTestCase.java b/tests/org/elixir_lang/parser_definition/ElixirLangElixirParsingTestCase.java index 0ea0f580b..b398fb12d 100644 --- a/tests/org/elixir_lang/parser_definition/ElixirLangElixirParsingTestCase.java +++ b/tests/org/elixir_lang/parser_definition/ElixirLangElixirParsingTestCase.java @@ -50,9 +50,6 @@ public void testEexSmartEngine() { assertParsed("lib/eex/lib/eex/smart_engine.ex", Parse.CORRECT); } - public void testEexTokenizer() { - assertParsed("lib/eex/lib/eex/tokenizer.ex", Parse.CORRECT); - } public void testAccess() { assertParsed("lib/elixir/lib/access.ex", Parse.CORRECT);