Skip to content

Commit f58d501

Browse files
vbmachervbmacher
authored
Merge pull request #49 from vbmacher/2019.3.4
2019.3.4
2 parents 4c5bca5 + 5984a25 commit f58d501

File tree

6 files changed

+138
-34
lines changed

6 files changed

+138
-34
lines changed

‎.github/workflows/build.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Build for intellij-cucumber-scala
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Set up JDK 11
13+
uses: actions/setup-java@v1
14+
with:
15+
java-version: 11
16+
- name: Grant execute permission for gradlew
17+
run: chmod +x gradlew
18+
- name: Build with Gradle
19+
run: ./gradlew build

‎build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
ext.versions = [
22
scala: '2.12',
3-
scalaFull: '2.12.7',
4-
cucumber: '193.5662.7',
5-
gherkin: '193.6015.53',
6-
idea: '2019.3.2',
7-
scalaPlugin: '2019.3.23',
3+
scalaFull: '2.12.11',
4+
cucumber: '193.6494.1',
5+
gherkin: '193.6911.14',
6+
idea: '2019.3.4',
7+
scalaPlugin: '2019.3.27',
88
]
99

1010
ext.libs = [
11-
jUnit : 'junit:junit:4.12',
11+
jUnit : 'junit:junit:4.13',
1212
scala : "org.scala-lang:scala-library:${versions.scalaFull}",
13-
cucumberScala : "info.cukes:cucumber-scala_${versions.scala}:1.2.4",
14-
cucumberJUnit : 'io.cucumber:cucumber-junit:5.1.1'
13+
cucumberScala : "info.cukes:cucumber-scala_${versions.scala}:1.2.6",
14+
cucumberJUnit : 'io.cucumber:cucumber-junit:5.6.0'
1515
]
1616

1717
subprojects {

‎cucumber-scala/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.jetbrains.intellij" version "0.4.16"
2+
id "org.jetbrains.intellij" version "0.4.18"
33
id "scala"
44
}
55

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
1-
<?xml version="1.0" encoding="iso-8859-1"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22

33
<idea-plugin>
44
<id>com.github.danielwegener.cucumber-scala</id>
55
<name>Cucumber for Scala</name>
6-
<version>2019.1.3</version>
7-
<vendor email="[email protected]" url="http://daniel.wegener.me">Daniel Wegener</vendor>
6+
<version>2019.3.4</version>
7+
<vendor email="[email protected]" url="hhttps://github.com/vbmacher">Peter Jakubčo</vendor>
88

99
<description><![CDATA[
1010
Enables Reference tracking of glue code when using cucumber-scala DSL.
1111
1212
Requires Scala language integration from Community Repo and the JetBrains cucumber plugin.
1313
14-
Issue tracking at https://github.com/danielwegener/intellij-cucumber-scala/issues
14+
Issue tracking at https://github.com/vbmacher/intellij-cucumber-scala/issues
1515
]]></description>
1616

1717
<change-notes><![CDATA[
18-
0.1.0: Initial release.
19-
0.2.0: Supports glue code classes that implement ScalaDsl indirectly.
20-
0.3.0: Release for IntelliJ14 (unchanged functionality)
21-
0.3.1: Release for IntelliJ 14.1 (unchanged functionality)
22-
0.3.2: Release for IntelliJ 15.0 (unchanged functionality)
23-
0.3.3: Release for IntelliJ 15.0.2, scala-plugin 2.0.4, support inheriting step definitions from traits (#16)
24-
0.3.4: Release for IntelliJ 2016.1 (scala-plugin 3.0.0)
25-
0.3.5: Release for IntelliJ 2016.2 (scala-plugin 2016.2.0)
26-
0.3.6: Release for IntelliJ 2016.3
27-
0.3.7: Release for IntelliJ 2016.3 (fix renamed gherkin dependency)
28-
2017.1.1: Release for IntelliJ 2017.1 (scala-plugin 2017.1.8)
29-
2017.1.2: fix compatibility with external changes in scala plugin
30-
2017.2.0: Release for IntelliJ 2017.2 (scala-plugin 2017.2.4)
31-
2017.2.1: Release for IntelliJ 2017.2 (scala-plugin 2017.2.4) (oops :))
32-
2017.3.0: Release for IntelliJ 2017.3 (scala-plugin 2017.3.9)
33-
2017.3.1: Release for IntelliJ 2017.3.1 (scala-plugin 2017.3.11)
34-
2019.1.3: Release for IntelliJ 2019.1.3 (scala-plugin 2019.1.3)
18+
<ul>
19+
<li>0.1.0: Initial release.</li>
20+
<li>0.2.0: Supports glue code classes that implement ScalaDsl indirectly.</li>
21+
<li>0.3.0: Release for IntelliJ14 (unchanged functionality)</li>
22+
<li>0.3.1: Release for IntelliJ 14.1 (unchanged functionality)</li>
23+
<li>0.3.2: Release for IntelliJ 15.0 (unchanged functionality)</li>
24+
<li>0.3.3: Release for IntelliJ 15.0.2, scala-plugin 2.0.4, support inheriting step definitions from traits (#16)</li>
25+
<li>0.3.4: Release for IntelliJ 2016.1 (scala-plugin 3.0.0)</li>
26+
<li>0.3.5: Release for IntelliJ 2016.2 (scala-plugin 2016.2.0)</li>
27+
<li>0.3.6: Release for IntelliJ 2016.3</li>
28+
<li>0.3.7: Release for IntelliJ 2016.3 (fix renamed gherkin dependency)</li>
29+
<li>2017.1.1: Release for IntelliJ 2017.1 (scala-plugin 2017.1.8)</li>
30+
<li>2017.1.2: fix compatibility with external changes in scala plugin</li>
31+
<li>2017.2.0: Release for IntelliJ 2017.2 (scala-plugin 2017.2.4)</li>
32+
<li>2017.2.1: Release for IntelliJ 2017.2 (scala-plugin 2017.2.4) (oops :))</li>
33+
<li>2017.3.0: Release for IntelliJ 2017.3 (scala-plugin 2017.3.9)</li>
34+
<li>2017.3.1: Release for IntelliJ 2017.3.1 (scala-plugin 2017.3.11)</li>
35+
<li>2019.1.3: Release for IntelliJ 2019.1.3 (scala-plugin 2019.1.3)</li>
36+
<li>2019.3.4: Release for IntelliJ 2019.3.4 (scala-plugin 2019.3.27)</li>
37+
</ul>
3538
]]>
3639
</change-notes>
3740

@@ -45,5 +48,4 @@
4548
<cucumberJvmExtensionPoint
4649
implementation="com.github.danielwegener.intellij.cucumber.scala.CucumberScalaExtension"/>
4750
</extensions>
48-
4951
</idea-plugin>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jul 15 16:12:06 CEST 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎gradlew.bat‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS="-Xmx64m"
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega

0 commit comments

Comments
 (0)