Skip to content

Commit 5890bcc

Browse files
authored
[WIP] Support 251.* (2025.1+) (#3681)
* Support v251 * bump gradle to 8.12.1 * Support unlimited until-build https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#z7pga7u_557 * Add changelog * Actually bump the version
1 parent 4cc4e0c commit 5890bcc

File tree

8 files changed

+79
-29
lines changed

8 files changed

+79
-29
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v21.0.0
4+
### Enhancements
5+
* [#3651](https://github.com/KronicDeth/intellij-elixir/pull/3681) - [@joshuataylor](https://github.com/joshuataylor)
6+
* Support Jetbrains 2025.1 and relax until-build.
7+
38
## v20.0.1
49

510
### Bug Fixes

build.gradle

+25-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ intellijPlatform {
102102

103103
ideaVersion {
104104
sinceBuild = providers.gradleProperty("pluginSinceBuild")
105-
untilBuild = providers.gradleProperty("pluginUntilBuild")
105+
// We want users to be able to install the plugin on future versions, and if there is incompatibility,
106+
// they should hopefully create an issue :-).
107+
untilBuild = provider { null }
106108
}
107109
vendor {
108110
name = providers.gradleProperty("vendorName")
@@ -200,6 +202,28 @@ intellijPlatformTesting {
200202
}
201203
}
202204
}
205+
206+
// if enableEAPIDEs is true, create an EAP instance
207+
if (providers.gradleProperty("enableEAPIDEs").get().toLowerCase() == "true") {
208+
runIde.create("run${platform}EAP") {
209+
type = IntelliJPlatformType."${platform}"
210+
version = providers.gradleProperty("platformVersion${platform}EAP").get()
211+
prepareSandboxTask {
212+
sandboxDirectory = project.layout.buildDirectory.dir("${platform.toLowerCase()}_eap-sandbox")
213+
}
214+
useInstaller = false
215+
216+
// if runIdePluginsList is not empty, set the plugins
217+
if (runIdePluginsList.size() > 0) {
218+
plugins {
219+
// Apply each plugin from the 'runIdePluginsList'
220+
runIdePluginsList.each { plugin ->
221+
plugins(plugin.trim())
222+
}
223+
}
224+
}
225+
}
226+
}
203227
}
204228
}
205229

gradle.properties

+18-15
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,61 @@
22
pluginGroup=org.elixir_lang
33
pluginName=Elixir
44
pluginRepositoryUrl=https://github.com/KronicDeth/intellij-elixir/
5-
pluginVersion=20.0.1
5+
pluginVersion=21.0.0
66
vendorName=Elle Imhoff
77
vendorEmail=[email protected]
88
# https://youtrack.jetbrains.com/articles/IDEA-A-2100661899/IntelliJ-IDEA-2024.1-241.14494.240-build-Release-Notes
99
pluginSinceBuild=243.21565.180
10-
pluginUntilBuild=243.*
11-
10+
pluginUntilBuild=
1211
# Set this to open
1312
runIdeWorkingDirectory=
14-
1513
# Define versions for running the IDEs, as each IDE can release at different release versions.
16-
platformVersionIntellijIdeaCommunity=2024.3
17-
platformVersionIntellijIdeaUltimate=2024.3
14+
platformVersionIntellijIdeaCommunity=2024.3.2.2
15+
platformVersionIntellijIdeaUltimate=2024.3.2.2
1816
platformVersionRubyMine=2024.3
1917
platformVersionPyCharmCommunity=2024.3
2018
platformVersionPyCharmProfessional=2024.3
2119
platformVersionWebStorm=2024.3
2220

21+
enableEAPIDEs=true
22+
platformVersionIntellijIdeaCommunityEAP=251-EAP-SNAPSHOT
23+
platformVersionIntellijIdeaUltimateEAP=251-EAP-SNAPSHOT
24+
platformVersionPyCharmCommunityEAP=251-EAP-SNAPSHOT
25+
platformVersionPyCharmProfessionalEAP=251-EAP-SNAPSHOT
26+
platformVersionRubyMineEAP=251-EAP-SNAPSHOT
27+
platformVersionWebStormEAP=251-EAP-SNAPSHOT
2328
# Comma-separated list of platforms to include
2429
platformsList=IntellijIdeaCommunity,IntellijIdeaUltimate,RubyMine,PyCharmCommunity,PyCharmProfessional,WebStorm
25-
2630
# The versions we target, 21 is needed for IntelliJ Plugins
2731
javaVersion=21
2832
javaTargetVersion=21
29-
3033
# Defined in `.tool-versions`, check via `elixir --version`
3134
elixirVersion=1.13.4
32-
3335
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
3436
# Target IntelliJ Community by default
3537
platformType=IC
3638
platformVersion=2024.3
37-
3839
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
3940
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
40-
platformPlugins=
41+
# https://plugins.jetbrains.com/plugin/24468-classic-ui
42+
# https://plugins.jetbrains.com/plugin/7641-action-tracker - Act
43+
# https://plugins.jetbrains.com/plugin/15104-ide-perf - IDE Performande
44+
# https://plugins.jetbrains.com/plugin/227-psiviewer - View PSI
45+
platformPlugins = PsiViewer:243.7768, com.google.ide-perf:1.3.2, org.jetbrains.action-tracker:0.3.3, com.intellij.classic.ui:243.21565.122,krasa.CpuUsageIndicator:1.18.0-IJ2023
4146
# Example: platformBundledPlugins = com.intellij.java
4247
# We need com.intellij.java to compile JPS, and markdown.
4348
platformBundledPlugins=org.intellij.plugins.markdown,com.intellij.java
4449
# Gradle Releases -> https://github.com/gradle/gradle/releases
4550
# 8.5 is set because newer versions have weird run time caching issues, even with caching turned off.
4651
# See https://github.com/gradle/gradle/issues/28974
47-
gradleVersion=8.10.1
52+
gradleVersion=8.12.1
4853
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
4954
kotlin.stdlib.default.dependency=false
5055
publishChannels=canary
5156
runIdePlugins=IdeaVim:2.16.0
52-
5357
# These must be set, or Out of Memory (OOM) errors will occur during compiling.
5458
org.gradle.jvmargs=-Xmx4096m
5559
kotlin.daemon.jvmargs=-Xmx4906m
56-
5760
# @todo Once this has been tested to be stable with the intellij-elixir codebase, enable.
5861
# Others have it on without issues, so I'm not overly worried - just want to confirm stability.
5962
# Can always just turn it off for CI.
@@ -63,4 +66,4 @@ kotlin.daemon.jvmargs=-Xmx4906m
6366
# Parallel Gradle Builds - https://docs.gradle.org/current/userguide/performance.html#parallel_execution
6467
org.gradle.configuration-cache=false
6568
org.gradle.caching=false
66-
org.gradle.parallel=false
69+
org.gradle.parallel=false

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum

gradlew.bat

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

resources/META-INF/changelog.html

+14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
<html>
22
<body>
3+
<h1>v21.0.0</h1>
4+
<ul>
5+
<li>
6+
<p>Bug Fixes</p>
7+
<ul>
8+
<li>
9+
<a href="https://github.com/KronicDeth/intellij-elixir/pull/3681">
10+
#3681 Support Jetbrains 2025.1 and relax until-build
11+
</a> - <a href="https://github.com/joshuataylor">@joshuataylor</a>
12+
</li>
13+
</ul>
14+
</li>
15+
</ul>
16+
317
<h1>v20.0.1</h1>
418
<ul>
519
<li>

0 commit comments

Comments
 (0)