Skip to content

Commit e196fff

Browse files
authored
Merge pull request #6 from akhil/master
upgraded to 2.4.0 and removed scala 2.10 support
2 parents d15183a + 201ee74 commit e196fff

File tree

7 files changed

+18
-65
lines changed

7 files changed

+18
-65
lines changed

.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: scala
22
sudo: false
33

4-
scala:
5-
- 2.10.7
6-
- 2.11.12
7-
- 2.12.6
4+
matrix:
5+
include:
6+
- scala: 2.11
7+
- scala: 2.12
8+
env: EXECUTE_EXAMPLES=true
9+
fast_finish: true
810

911
cache:
1012
directories:
@@ -14,7 +16,10 @@ before_cache:
1416
- rm -rf $HOME/.m2/repository/io/cucumber
1517

1618
before_install:
17-
- export MODULES_TO_RUN="scala/scala_"$(echo $TRAVIS_SCALA_VERSION | sed -e 's/\([0-9]*\.[0-9]*\)\..*/\1/')",examples" && echo $MODULES_TO_RUN
19+
- |
20+
export MODULES_TO_RUN="scala/scala_"$(echo $TRAVIS_SCALA_VERSION | sed -e 's/\([0-9]*\.[0-9]*\)\..*/\1/')
21+
[[ $EXECUTE_EXAMPLES = true ]] && export MODULES_TO_RUN=$MODULES_TO_RUN",examples"
22+
echo $MODULES_TO_RUN
1823
1924
install:
2025
- mvn install -pl $MODULES_TO_RUN -DskipTests=true -Dmaven.javadoc.skip=true -B -V

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm-scala</artifactId>
7-
<version>2.0.2-SNAPSHOT</version>
7+
<version>2.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scala-examples</artifactId>

pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>io.cucumber</groupId>
44
<artifactId>cucumber-jvm-scala</artifactId>
5-
<version>2.0.2-SNAPSHOT</version>
5+
<version>2.4.0-SNAPSHOT</version>
66
<packaging>pom</packaging>
77
<name>Cucumber-JVM: Scala</name>
88
<url>http://cucumber.io/</url>
@@ -25,14 +25,13 @@
2525

2626
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
2727

28-
<cucumber.version>2.0.1</cucumber.version>
29-
<gherkin.version>4.1.3</gherkin.version>
28+
<cucumber.version>2.4.0</cucumber.version>
29+
<gherkin.version>5.1.0</gherkin.version>
3030
<groovy.version>2.4.12</groovy.version>
3131
<junit.version>4.12</junit.version>
3232
<mockito.version>1.10.19</mockito.version>
33-
<scala.2.12.version>2.12.2</scala.2.12.version>
33+
<scala.2.12.version>2.12.6</scala.2.12.version>
3434
<scala.2.11.version>2.11.11</scala.2.11.version>
35-
<scala.2.10.version>2.10.6</scala.2.10.version>
3635

3736
</properties>
3837
<licenses>
@@ -198,7 +197,6 @@
198197
<version>4.3.0</version>
199198
<configuration>
200199
<sourceDirectories>
201-
<sourceDirectory>${basedir}/scala/scala_2.10/target/generated-sources/i18n</sourceDirectory>
202200
<sourceDirectory>${basedir}/scala/scala_2.11/target/generated-sources/i18n</sourceDirectory>
203201
<sourceDirectory>${basedir}/scala/scala_2.12/target/generated-sources/i18n</sourceDirectory>
204202
</sourceDirectories>

scala/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm-scala</artifactId>
7-
<version>2.0.2-SNAPSHOT</version>
7+
<version>2.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala-aggregator</artifactId>
@@ -13,7 +13,6 @@
1313

1414
<modules>
1515
<module>scala_2.11</module>
16-
<module>scala_2.10</module>
1716
</modules>
1817

1918
<profiles>

scala/scala_2.10/pom.xml

Lines changed: 0 additions & 49 deletions
This file was deleted.

scala/scala_2.11/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-scala-aggregator</artifactId>
7-
<version>2.0.2-SNAPSHOT</version>
7+
<version>2.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala_2.11</artifactId>

scala/scala_2.12/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-scala-aggregator</artifactId>
7-
<version>2.0.2-SNAPSHOT</version>
7+
<version>2.4.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-scala_2.12</artifactId>

0 commit comments

Comments
 (0)