Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build for 2023.3 #3500

Merged
merged 3 commits into from
Jan 10, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
ideaVersion: [ "2023.2", "2023.3" ]
ideaVersion: [ "2023.3" ]

steps:
- uses: actions/checkout@v2
Expand Down
28 changes: 11 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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).
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
}

Expand All @@ -82,7 +82,7 @@ allprojects {
}

runPluginVerifier {
ideVersions = ["2023.2", "2023.3"]
ideVersions = ["2023.3"]
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
23 changes: 14 additions & 9 deletions resources/META-INF/changelog.html
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/org/elixir_lang/Process.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/org/elixir_lang/formatter/Block.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/org/elixir_lang/mix/runner/Status.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/org/elixir_lang/structure_view/sorter/Time.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/org/elixir_lang/intellij_elixir/Quoter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading