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

[#137] IntelliJ 2024.3.1.1, sbt-idea-plugin 3.26.2 #145

Merged
merged 1 commit into from
Dec 27, 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
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lazy val commonSettings = Seq(
"--add-opens", "java.desktop/sun.font=ALL-UNNAMED",
"--add-exports", "java.base/jdk.internal.vm=ALL-UNNAMED",
),
version := "2024.3",
version := "2024.3.1.1",
scalaVersion := "2.13.15",
libraryDependencies ++= Seq(
"junit" % "junit" % "4.13.2" % Test,
Expand All @@ -30,17 +30,17 @@ lazy val `cucumber-scala` = project
.settings(
commonSettings,
ThisBuild / intellijPluginName := "intellij-cucumber-scala",
ThisBuild / intellijBuild := "243.21565.193",
ThisBuild / intellijBuild := "243.22562.218",
ThisBuild / intellijPlatform := IntelliJPlatform.IdeaCommunity,
Compile / javacOptions ++= "--release" :: "21" :: Nil,
intellijPlugins ++= Seq(
"org.intellij.scala:2024.3.18".toPlugin,
"gherkin:243.21565.122".toPlugin
"org.intellij.scala:2024.3.23".toPlugin,
"gherkin:243.22562.13".toPlugin
),
packageMethod := PackagingMethod.Standalone(),
patchPluginXml := pluginXmlOptions { xml =>
xml.version = version.value
xml.sinceBuild = "243.21565"
xml.sinceBuild = "243.22562"
xml.untilBuild = "243.*"
},
signPluginOptions := signPluginOptions.value.copy(enabled = true)
Expand Down
13 changes: 11 additions & 2 deletions cucumber-scala/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<id>com.github.danielwegener.cucumber-scala</id>
<name>Cucumber for Scala</name>
<category>Test Tools</category>
<version>2024.3</version>
<idea-version since-build="243.21565" until-build="243.*"/>
<version>2024.3.1.1</version>
<idea-version since-build="243.22562" until-build="243.*"/>
<vendor email="[email protected]" url="https://github.com/vbmacher">Peter Jakubčo</vendor>

<description><![CDATA[
Expand All @@ -19,12 +19,21 @@

<change-notes><![CDATA[
<ul>
<li>2024.3.1.1: Release for IntelliJ 2024.3.1.1 (build 243.22562.218)
<ol>
<li>Scala plugin 2024.3.23</li>
<li>Gherkin plugin 243.22562.13</li>
<li><a href="https://github.com/vbmacher/intellij-cucumber-scala/issues/137">Problem with building in GitHub actions</a></li>
<li>Rollback to using Java version 17 (which is default IntelliJ Idea Java version)</li>
</ol>
</li>
<li>2024.3: Release for IntelliJ 2024.3 (build 243.21565.193)
<ol>
<li>Scala plugin 2024.3.18</li>
<li>Gherkin plugin 243.21565.122</li>
<li>cucumber-scala 8.25.1</li>
<li>cucumber-junit 7.20.1</li>
<li>Use Java version 21</li>
</ol>
</li>
<li>2024.2.1: Release for IntelliJ 2024.2.1 (build 242.21829.142)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ package com.github.vbmacher.intellij.cucumber.scala
import com.intellij.codeInsight.daemon.LineMarkerInfo
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl.getLineMarkers
import com.intellij.psi._
import com.intellij.testFramework.UsefulTestCase
import com.intellij.testFramework.fixtures.BasePlatformTestCase
import org.apache.log4j.Logger
import com.intellij.openapi.diagnostic.Logger
import org.scalatest.matchers.should.Matchers
import org.scalatestplus.junit.JUnitSuiteLike

import java.io.File
import scala.jdk.CollectionConverters._

abstract class ScCucumberSpecBase extends BasePlatformTestCase with Matchers with JUnitSuiteLike {
protected lazy val LOG = Logger.getRootLogger
protected lazy val LOG = Logger.getInstance(classOf[ScCucumberSpecBase])

val DESCRIPTOR = new LibraryLightProjectDescriptor(
//RemoteDependency("io.cucumber:cucumber-scala_2.13:6.9.0")
Expand All @@ -32,14 +31,12 @@ abstract class ScCucumberSpecBase extends BasePlatformTestCase with Matchers wit

def findLineMarkers() = {
val editor = myFixture.getEditor
val project = myFixture.getProject
val project = getProject

myFixture.doHighlighting()

var lineMarkers = collection.mutable.Seq.empty[LineMarkerInfo[_]]
UsefulTestCase.edt(() => {
getLineMarkers(editor.getDocument, project).asScala.foreach(lineMarkers +:= _)
})
inWriteAction(getLineMarkers(editor.getDocument, project).asScala.foreach(lineMarkers +:= _))

lineMarkers
}
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.20.1")
addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.26.2")
Loading