Merge pull request #3500 from KronicDeth/2023.3

Fix build for 2023.3
KronicDeth · Jan 10, 2024 · 23a9359 · 23a9359
2 parents 876b770 + 732591c
commit 23a9359
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 35 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ideaVersion: [ "2023.2", "2023.3" ]
+        ideaVersion: [ "2023.3" ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## v16.1.0
+## v17
+
+### Breaking changes
+* [#3500](https://github.com/KronicDeth/intellij-elixir/pull/3500) - [@KronicDeth](https://github.com/KronicDeth)
+  * Drop support for <= 2023.2 IDEs.
+
+### Enhancements
+* [#2402](https://github.com/KronicDeth/intellij-elixir/pull/3402) - [@joshuataylor](https://github.com/joshuataylor)
+  * Support 2023.3 IDEs.
 
 ### Bug Fixes
 * [#3431](https://github.com/KronicDeth/intellij-elixir/pull/3431) - [@KronicDeth](https://github.com/KronicDeth)
@@ -9,20 +17,6 @@
     * `org.elixir_lang.facets.sdks.erlang.Configurable` - "Internal Erlang SDKs"
     * `org.elixir_lang.facets.sdks.elixir.Configurable` - "SDKs"
 
-### Enhancements
-* [#2402](https://github.com/KronicDeth/intellij-elixir/pull/3402) - [@joshuataylor](https://github.com/joshuataylor)
-  * Support 2023.3 IDEs.
-
-## v16.0.0
-
-### Incompatible Changes
-* [#3327](https://github.com/KronicDeth/intellij-elixir/pull/3327) - [@marceloneppel](https://github.com/marceloneppel)
-  * Drop support for <= 2023.1 IDEs.
-
-### Enhancements
-* [#3327](https://github.com/KronicDeth/intellij-elixir/pull/3327) - [@marceloneppel](https://github.com/marceloneppel)
-  * Support 2023.2 IDEs.
-
-## v15
+## v16
 
-The [CHANGELOG for v15](https://github.com/KronicDeth/intellij-elixir/blob/v15.1.0/CHANGELOG.md) can be found in [the v14.1.0 tag](https://github.com/KronicDeth/intellij-elixir/tree/v14.1.0).
+The [CHANGELOG for v15](https://github.com/KronicDeth/intellij-elixir/blob/v15.1.0/CHANGELOG.md) can be found in [the v16.0.0 tag](https://github.com/KronicDeth/intellij-elixir/tree/v16.0.0).
diff --git a/build.gradle b/build.gradle
@@ -69,7 +69,7 @@ allprojects {
         changeNotes.set(bodyInnerHTML("resources/META-INF/changelog.html"))
         pluginDescription.set(bodyInnerHTML("resources/META-INF/description.html"))
 
-        sinceBuild = "232.8660.143"
+        sinceBuild = "233.11799.241"
         untilBuild = "233.*"
     }
 
@@ -82,7 +82,7 @@ allprojects {
     }
 
     runPluginVerifier {
-        ideVersions = ["2023.2", "2023.3"]
+        ideVersions = ["2023.3"]
     }
 }
 

diff --git a/jps-builder/src/org/elixir_lang/jps/builder/GeneralCommandLine.java b/jps-builder/src/org/elixir_lang/jps/builder/GeneralCommandLine.java
@@ -90,6 +90,7 @@ public Map<String, String> getEnvironment() {
     /**
      * @deprecated use {@link #getEnvironment()} (to remove in IDEA 14)
      */
+    @Deprecated
     @SuppressWarnings("unused")
     public Map<String, String> getEnvParams() {
         return getEnvironment();
@@ -98,6 +99,7 @@ public Map<String, String> getEnvParams() {
     /**
      * @deprecated use {@link #getEnvironment()} (to remove in IDEA 14)
      */
+    @Deprecated
     @SuppressWarnings("unused")
     public void setEnvParams(@Nullable Map<String, String> envParams) {
         myEnvParams.clear();

diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
@@ -1,7 +1,19 @@
 <html>
 <body>
-<h1>v16.1.0</h1>
+<h1>v17.0.0</h1>
 <ul>
+    <li>
+        <p>Incompatible Changes</p>
+        <ul>
+            <li>Drop support for &lt;= 2023.2 IDEs</li>
+        </ul>
+    </li>
+    <li>
+        <p>Enhancements</p>
+        <ul>
+            <li>Support 2023.3 IDEs</li>
+        </ul>
+    </li>
     <li>
         <p>Bug Fixes</p>
         <ul>
@@ -14,20 +26,13 @@ <h1>v16.1.0</h1>
             </li>
         </ul>
     </li>
-    <li>
-    <li>
-        <p>Enhancements</p>
-        <ul>
-            <li>Support 2023.3 IDEs</li>
-        </ul>
-    </li>
 </ul>
 <h1>v16.0.0</h1>
 <ul>
     <li>
         <p>Incompatible Changes</p>
         <ul>
-            <li>Drop support for <= 2023.1 IDEs.</li>
+            <li>Drop support for &lt;= 2023.1 IDEs.</li>
         </ul>
     </li>
     <li>

diff --git a/src/org/elixir_lang/Process.java b/src/org/elixir_lang/Process.java
@@ -1,7 +1,7 @@
 package org.elixir_lang;
 
 import com.ericsson.otp.erlang.*;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.jetbrains.annotations.Nullable;
 
 import static org.elixir_lang.psi.impl.QuotableImpl.NIL;

diff --git a/src/org/elixir_lang/formatter/Block.java b/src/org/elixir_lang/formatter/Block.java
@@ -26,7 +26,7 @@
 import java.util.function.Predicate;
 
 import static com.intellij.formatting.ChildAttributes.DELEGATE_TO_PREV_CHILD;
-import static org.apache.commons.lang.StringUtils.isWhitespace;
+import static org.apache.commons.lang3.StringUtils.isWhitespace;
 import static org.elixir_lang.psi.ElixirTypes.*;
 import static org.elixir_lang.psi.ElixirTypes.DO;
 import static org.elixir_lang.psi.ElixirTypes.FN;

diff --git a/src/org/elixir_lang/mix/runner/Status.java b/src/org/elixir_lang/mix/runner/Status.java
@@ -3,7 +3,7 @@
 import com.google.common.base.CaseFormat;
 import com.intellij.execution.testframework.sm.ServiceMessageBuilder;
 import gnu.trove.THashMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/org/elixir_lang/reference/resolver/atom/Resolvable.java b/src/org/elixir_lang/reference/resolver/atom/Resolvable.java
@@ -4,7 +4,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.tree.IElementType;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.elixir_lang.psi.*;
 import org.elixir_lang.reference.resolver.atom.resolvable.Exact;
 import org.elixir_lang.reference.resolver.atom.resolvable.Pattern;

diff --git a/src/org/elixir_lang/structure_view/sorter/Time.java b/src/org/elixir_lang/structure_view/sorter/Time.java
@@ -4,7 +4,7 @@
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.elixir_lang.structure_view.element.Timed;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

diff --git a/tests/org/elixir_lang/intellij_elixir/Quoter.kt b/tests/org/elixir_lang/intellij_elixir/Quoter.kt
@@ -2,7 +2,7 @@ package org.elixir_lang.intellij_elixir
 
 import com.ericsson.otp.erlang.*
 import com.intellij.psi.PsiFile
-import org.apache.commons.lang.CharUtils
+import org.apache.commons.lang3.CharUtils
 import org.elixir_lang.GenericServer.call
 import org.elixir_lang.IntellijElixir
 import org.elixir_lang.Keyword.isKeyword