Skip to content

Commit 3271e11

Browse files
committed
[#136] Update to IntelliJ 2024.2.1
+ Revert sbt-idea-plugin to 3.18.3
1 parent d58b725 commit 3271e11

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

build.sbt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ lazy val commonSettings = Seq(
1212
"--add-opens", "java.desktop/sun.font=ALL-UNNAMED",
1313
"--add-exports", "java.base/jdk.internal.vm=ALL-UNNAMED",
1414
),
15-
version := "2024.2",
15+
version := "2024.2.1",
1616
scalaVersion := "2.13.14",
1717
libraryDependencies ++= Seq(
1818
"junit" % "junit" % "4.13.2" % Test,
1919
"io.cucumber" %% "cucumber-scala" % "8.23.1",
2020
"io.cucumber" % "cucumber-junit" % "7.18.1" % Test,
2121
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
2222
"org.scalatestplus" %% "junit-4-13" % "3.2.19.0" % Test,
23-
"org.opentest4j" % "opentest4j" % "1.3.0" % Test,
24-
"org.slf4j" % "slf4j-reload4j" % "2.0.13"
23+
"org.opentest4j" % "opentest4j" % "1.3.0" % Test
2524
)
2625
)
2726

@@ -30,11 +29,11 @@ lazy val `cucumber-scala` = project
3029
.settings(
3130
commonSettings,
3231
ThisBuild / intellijPluginName := "intellij-cucumber-scala",
33-
ThisBuild / intellijBuild := "242.20224.419",
32+
ThisBuild / intellijBuild := "242.21829.142",
3433
ThisBuild / intellijPlatform := IntelliJPlatform.IdeaCommunity,
3534
Compile / javacOptions ++= "--release" :: "17" :: Nil,
3635
intellijPlugins ++= Seq(
37-
"org.intellij.scala:2024.2.20".toPlugin,
36+
"org.intellij.scala:2024.2.25".toPlugin,
3837
"gherkin:242.20224.159".toPlugin
3938
),
4039
packageMethod := PackagingMethod.Standalone(),
@@ -46,9 +45,9 @@ lazy val `cucumber-scala` = project
4645
signPluginOptions := signPluginOptions.value.copy(enabled = true)
4746
)
4847

49-
lazy val example = project.settings(commonSettings)
48+
lazy val example = project.settings(commonSettings, packageMethod := PackagingMethod.Skip())
5049

51-
lazy val `example-stepdefs-lib` = project.settings(commonSettings)
50+
lazy val `example-stepdefs-lib` = project.settings(commonSettings, packageMethod := PackagingMethod.Skip())
5251

5352
lazy val root = (project in file("."))
5453
.aggregate(`cucumber-scala`, example, `example-stepdefs-lib`)

cucumber-scala/src/main/resources/META-INF/plugin.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<idea-plugin>
3+
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"
4+
require-restart="false">
45
<id>com.github.danielwegener.cucumber-scala</id>
56
<name>Cucumber for Scala</name>
67
<category>Test Tools</category>
7-
<version>2024.1</version>
8+
<version>2024.2.1</version>
89
<idea-version since-build="241.14494" until-build="241.*"/>
910
<vendor email="[email protected]" url="https://github.com/vbmacher">Peter Jakubčo</vendor>
1011

@@ -18,6 +19,13 @@
1819

1920
<change-notes><![CDATA[
2021
<ul>
22+
<li>2024.2.1: Release for IntelliJ 2024.2.1 (build 242.21829.142)
23+
<ol>
24+
<li>Scala plugin 2024.2.25</li>
25+
<li>Revert sbt-idea-plugin to 3.18.3</li>
26+
<li><a href="https://github.com/vbmacher/intellij-cucumber-scala/issues/136">IDE Internal Errors</a></li>
27+
</ol>
28+
</li>
2129
<li>2024.2: Release for IntelliJ 2024.2 (build 242.20224.419)
2230
<ol>
2331
<li>Scala plugin 2024.2.20</li>
@@ -218,9 +226,9 @@
218226
</change-notes>
219227

220228
<depends>com.intellij.modules.java</depends>
221-
<depends>org.intellij.intelliLang</depends>
222-
<depends>org.intellij.scala</depends>
223229
<depends>gherkin</depends>
230+
<depends>org.intellij.scala</depends>
231+
224232

225233
<extensions defaultExtensionNs="org.jetbrains.plugins.cucumber.steps">
226234
<cucumberJvmExtensionPoint

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.26.2")
1+
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.18.3")

0 commit comments

Comments
 (0)