Skip to content

Commit 0792c83

Browse files
vbmachervbmacher
authored
Merge pull request #72 from vbmacher/update-cucumber
Update cucumber
2 parents bead727 + 9a2a74b commit 0792c83

23 files changed

+61
-55
lines changed

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
ext.versions = [
22
scala : '2.12',
33
scalaFull : '2.12.11',
4-
gherkin : '202.5428.22',
5-
idea : '202.5428.22-EAP-SNAPSHOT',
6-
scalaPlugin: '2020.2.8'
4+
gherkin : '202.5958.19',
5+
idea : '202.5958.24-EAP-SNAPSHOT',
6+
scalaPlugin: '2020.2.12'
77
]
88

99
ext.libs = [
1010
jUnit : 'junit:junit:4.13',
1111
scala : "org.scala-lang:scala-library:${versions.scalaFull}",
12-
cucumberScala : "io.cucumber:cucumber-scala_${versions.scala}:5.7.0",
13-
cucumberJUnit : 'io.cucumber:cucumber-junit:5.7.0',
14-
scalatest : "org.scalatest:scalatest_${versions.scala}:3.1.2",
12+
cucumberScala : "io.cucumber:cucumber-scala_${versions.scala}:6.1.2",
13+
cucumberJUnit : 'io.cucumber:cucumber-junit:6.1.2',
14+
scalatest : "org.scalatest:scalatest_${versions.scala}:3.2.0",
1515
slf4j : "org.slf4j:slf4j-log4j12:1.7.30"
1616
]
1717

‎cucumber-scala/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ runIde {
3636
}
3737

3838
patchPluginXml {
39-
sinceBuild "202.5428"
40-
untilBuild "202.5428.*"
39+
sinceBuild "202.5958"
40+
untilBuild "202.5958.*"
4141
}
4242

4343
buildSearchableOptions.enabled = false

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@
6262

6363
<extensions defaultExtensionNs="org.jetbrains.plugins.cucumber.steps">
6464
<cucumberJvmExtensionPoint
65-
implementation="com.github.danielwegener.intellij.cucumber.scala.ScCucumberExtension"/>
65+
implementation="com.github.vbmacher.intellij.cucumber.scala.ScCucumberExtension"/>
6666
</extensions>
6767

6868
<extensions defaultExtensionNs="com.intellij">
69-
<fileBasedIndex implementation="com.github.danielwegener.intellij.cucumber.scala.ScCucumberStepIndex"/>
69+
<fileBasedIndex implementation="com.github.vbmacher.intellij.cucumber.scala.ScCucumberStepIndex"/>
7070

71-
<pom.declarationSearcher implementation="com.github.danielwegener.intellij.cucumber.scala.search.StepDeclarationSearcher"/>
71+
<pom.declarationSearcher implementation="com.github.vbmacher.intellij.cucumber.scala.search.StepDeclarationSearcher"/>
7272

73-
<referencesSearch implementation="com.github.danielwegener.intellij.cucumber.scala.search.StepDefinitionUsageSearcher"/>
74-
<findUsagesHandlerFactory implementation="com.github.danielwegener.intellij.cucumber.scala.search.StepFindUsagesHandlerFactory"/>
73+
<referencesSearch implementation="com.github.vbmacher.intellij.cucumber.scala.search.StepDefinitionUsageSearcher"/>
74+
<findUsagesHandlerFactory implementation="com.github.vbmacher.intellij.cucumber.scala.search.StepFindUsagesHandlerFactory"/>
7575

7676
<codeInsight.lineMarkerProvider
77-
implementationClass="com.github.danielwegener.intellij.cucumber.scala.search.ScCucumberLineMarkerProvider"
77+
implementationClass="com.github.vbmacher.intellij.cucumber.scala.search.ScCucumberLineMarkerProvider"
7878
language="Scala"/>
7979
</extensions>
8080
</idea-plugin>

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/ScCucumberExtension.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/ScCucumberExtension.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.github.danielwegener.intellij.cucumber.scala
1+
package com.github.vbmacher.intellij.cucumber.scala
22

33
import java.util
44
import java.util.{Collection => JavaCollection}
55

6-
import com.github.danielwegener.intellij.cucumber.scala.steps.{ScStepDefinition, ScStepDefinitionCreator}
6+
import com.github.vbmacher.intellij.cucumber.scala.steps.{ScStepDefinition, ScStepDefinitionCreator}
77
import com.intellij.openapi.module.{Module, ModuleUtilCore}
88
import com.intellij.openapi.progress.ProgressManager
99
import com.intellij.openapi.vfs.VirtualFile

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/ScCucumberStepIndex.java‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/ScCucumberStepIndex.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.danielwegener.intellij.cucumber.scala;
1+
package com.github.vbmacher.intellij.cucumber.scala;
22

33
import com.intellij.lang.LighterAST;
44
import com.intellij.lang.LighterASTNode;

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/ScCucumberUtil.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/ScCucumberUtil.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.danielwegener.intellij.cucumber.scala
1+
package com.github.vbmacher.intellij.cucumber.scala
22

3-
import com.github.danielwegener.intellij.cucumber.scala.steps.ScStepDefinition
3+
import com.github.vbmacher.intellij.cucumber.scala.steps.ScStepDefinition
44
import com.intellij.openapi.util.text.StringUtil
55
import com.intellij.pom.PomNamedTarget
66
import com.intellij.psi.util.PsiTreeUtil

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/package.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/package.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.danielwegener.intellij.cucumber
1+
package com.github.vbmacher.intellij.cucumber
22

33
import com.intellij.openapi.application.ApplicationManager
44
import com.intellij.openapi.util.Computable

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/search/ScCucumberLineMarkerProvider.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/search/ScCucumberLineMarkerProvider.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.danielwegener.intellij.cucumber.scala.search
1+
package com.github.vbmacher.intellij.cucumber.scala.search
22

3-
import com.github.danielwegener.intellij.cucumber.scala.ScCucumberUtil._
3+
import com.github.vbmacher.intellij.cucumber.scala.ScCucumberUtil._
44
import com.intellij.codeInsight.daemon.{LineMarkerInfo, LineMarkerProvider}
55
import com.intellij.openapi.editor.markup.GutterIconRenderer
66
import com.intellij.psi.PsiElement

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/search/StepDeclaration.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/search/StepDeclaration.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.danielwegener.intellij.cucumber.scala.search
1+
package com.github.vbmacher.intellij.cucumber.scala.search
22

33
import com.intellij.ide.util.EditSourceUtil
44
import com.intellij.pom.PomNamedTarget

‎cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/search/StepDeclarationSearcher.scala‎ renamed to ‎cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/search/StepDeclarationSearcher.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.danielwegener.intellij.cucumber.scala.search
1+
package com.github.vbmacher.intellij.cucumber.scala.search
22

3-
import com.github.danielwegener.intellij.cucumber.scala.ScCucumberUtil._
4-
import com.github.danielwegener.intellij.cucumber.scala.inReadAction
3+
import com.github.vbmacher.intellij.cucumber.scala.ScCucumberUtil._
4+
import com.github.vbmacher.intellij.cucumber.scala.inReadAction
55
import com.intellij.lang.injection.InjectedLanguageManager
66
import com.intellij.openapi.progress.ProgressManager
77
import com.intellij.pom.{PomDeclarationSearcher, PomTarget}

0 commit comments

Comments
 (0)