Skip to content

Commit 40a223a

Browse files
brasmussonbrasmusson
committed
Merge branch cucumber:master into brasmusson:summary-printout
2 parents 442c4ed + 4439178 commit 40a223a

File tree

102 files changed

+2480
-411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2480
-411
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ ehthumbs.db
2929
Icon?
3030
Thumbs.db
3131
dependency-reduced-pom.xml
32+
*~

‎.travis-settings.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4+
http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
<localRepository/>
6+
<interactiveMode/>
7+
<usePluginRegistry/>
8+
<offline/>
9+
<pluginGroups/>
10+
<servers>
11+
<server>
12+
<id>sonatype-nexus-snapshots</id>
13+
<username>${env.CI_DEPLOY_USERNAME}</username>
14+
<password>${env.CI_DEPLOY_PASSWORD}</password>
15+
</server>
16+
</servers>
17+
<mirrors/>
18+
<proxies/>
19+
<profiles/>
20+
<activeProfiles/>
21+
</settings>

‎.travis.yml

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,49 @@
1+
---
12
language: java
2-
script: mvn -q clean install
3+
script: mvn -q install -P examples
34
jdk:
4-
- openjdk6
5-
- openjdk7
6-
- oraclejdk7
7-
# whitelist
5+
- openjdk6
6+
- openjdk7
7+
matrix:
8+
include:
9+
- jdk: oraclejdk7
10+
script: mvn -q deploy -P android --settings .travis-settings.xml -Dno.gem.deploy=true -Dandroid.device=test
11+
before_install:
12+
# Install base Android SDK
13+
- sudo apt-get update -qq
14+
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
15+
- wget http://dl.google.com/android/android-sdk_r21.1-linux.tgz
16+
- tar xzf android-sdk_r21.1-linux.tgz
17+
- export ANDROID_HOME=$PWD/android-sdk-linux
18+
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
19+
20+
# Install required components.
21+
# For a full list, run `android list sdk -a --extended`
22+
# Note that sysimg-16 downloads the ARM, x86 and MIPS images (we should optimize this).
23+
# Other relevant APIs:
24+
# addon-google_apis-google-16
25+
- android update sdk --filter platform-tools,extra-android-support,android-8 --no-ui --force > /dev/null
26+
27+
# Create and start emulator
28+
- echo no | android create avd --force -n test -t android-8 --abi armeabi
29+
- emulator -avd test -no-skin -no-audio -no-window &
30+
before_script:
31+
- ./android/wait_for_emulator
832
branches:
933
only:
10-
- master
11-
34+
- master
1235
notifications:
1336
email:
14-
- [email protected]
37+
- [email protected]
1538
irc:
16-
- "irc.freenode.org#cucumber"
17-
39+
- irc.freenode.org#cucumber
40+
env:
41+
global:
42+
- secure: |-
43+
rEtPzPG3bMKzx00AwDJq5tsp8LSCds5ePV6ZP+wgECP2BVIoD16zP8F6T0fY
44+
QK/2etRW6pcernOGP8S3SQE4e5ZBT5sqYY0mhKlq2aiem3i3gAwEzZvdLjWV
45+
1C6KyQplzdjKdaYWOre8YSXv5vxS3ZVS6NJc+0EQM3olTKV3flQ=
46+
- secure: |-
47+
BEsHVhETHrO8vR/7huN3MUMQQKZycZgJ+sWszwQPnwaGJEm6ptssJn/LsiUJ
48+
K/qQhjdpmPiKZIoTruG4E3vc+adT/B2VcHD0897jNeUBoDd7Vj4vzOH6ePID
49+
969vCnA+6hpQuIM02R+4OJIBPXVtr1Ix/ye+KxS69cJ5N8QyTfY=

‎History.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.1.3...master) (not released)
22

3+
* [Core] Fixed a bug where `@XStreamConverter` annotations were ignored (Aslak Hellesøy)
4+
* [Android] New Cucumber-Android module ([#525](https://github.com/cucumber/cucumber-jvm/pull/525) Maximilian Fellner).
5+
* [Build] Deploy maven SNAPSHOT versions from Travis ([#517](https://github.com/cucumber/cucumber-jvm/issues/517), [#528](https://github.com/cucumber/cucumber-jvm/pull/528) Tom Dunstan)
6+
* [Core] JUnitFormatter to mark skipped tests as failures in strict mode ([#543](https://github.com/cucumber/cucumber-jvm/pull/543) brasmusson)
7+
* [Core] Always cancel timeout at the end of a stepdef, even when it fails. ([#540](https://github.com/cucumber/cucumber-jvm/issues/540) irb1s)
8+
* [Groovy] Updated examples to be more explanatory and groovier syntax ([#537](https://github.com/cucumber/cucumber-jvm/pull/522) Quantoid)
9+
* [PicoContainer,Groovy,JRuby,Jython] Not shading maven artifacts any longer. Gem has a shaded jar though. ([#522](https://github.com/cucumber/cucumber-jvm/pull/522) [#518](https://github.com/cucumber/cucumber-jvm/issues/518) Dmytro Chyzhykov, Aslak Hellesøy)
310
* [Core] The `json-pretty` formatter is gone, and the `json` formatter is pretty!
411
* [Spring] New awesome Spring port of The Cucumber Book's chapter 14. ([#508](https://github.com/cucumber/cucumber-jvm/pull/508), [#489](https://github.com/cucumber/cucumber-jvm/pull/489) Dmytro Chyzhykov, Pedro Antonio Souza Viegas)
512
* [Core] Added `Scenario.getSourceTagNames()`, which is needed to make Capybara work with Cucumber-JRuby ([#504](https://github.com/cucumber/cucumber-jvm/issues/504) Aslak Hellesøy)
@@ -8,7 +15,10 @@
815
* [Core] Bugfix: Generated regex for ? character is incorrect. ([#494](https://github.com/cucumber/cucumber-jvm/issues/494) Aslak Hellesøy)
916
* [Core] Improve readability with unanchored regular expressions ([#485](https://github.com/cucumber/cucumber-jvm/pull/485), [#466](https://github.com/cucumber/cucumber-jvm/issues/466) Anton)
1017
* [Core] Throw exception when unsupported command line options are used. ([#482](https://github.com/cucumber/cucumber-jvm/pull/482), [#463](https://github.com/cucumber/cucumber-jvm/issues/463) Klaus Bayrhammer)
11-
* [Scala] Release cucumber-scala for the two most recent minro releases (currently 2.9.2 and 2.9.0) ([#432](https://github.com/cucumber/cucumber-jvm/issues/432), [#462](https://github.com/cucumber/cucumber-jvm/pull/462) Chris Turner)
18+
* [Scala] Release cucumber-scala for the two most recent minor releases (currently 2.10.2 and 2.9.3) ([#432](https://github.com/cucumber/cucumber-jvm/issues/432), [#462](https://github.com/cucumber/cucumber-jvm/pull/462) Chris Turner)
19+
* [Core] JUnitFormatter: Fix indentation, hook handling and support all-steps-first execution ([#556](https://github.com/cucumber/cucumber-jvm/pull/556) Björn Rasmusson)
20+
* [Core] Make the PrettyFormatter work by revering to all-steps-first execution ([#491](https://github.com/cucumber/cucumber-jvm/issues/491), [#557](https://github.com/cucumber/cucumber-jvm/pull/557) Björn Rasmusson)
21+
* [Core] Test case for the PrettyFormatter. ([#544](https://github.com/cucumber/cucumber-jvm/pull/544) Björn Rasmusson)
1222

1323
## [1.1.3](https://github.com/cucumber/cucumber-jvm/compare/v1.1.2...v1.1.3) (2013-03-10)
1424

‎android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gen/

‎android/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:versionCode="1"
4+
android:versionName="1.1.4-SNAPSHOT"
5+
package="cucumber.api.android">
6+
</manifest>

‎android/README.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
### Prerequisites *(taken from the [maven-android-plugin](https://code.google.com/p/maven-android-plugin) documentation)*
2+
3+
1. JDK 1.6+ installed as required for Android development
4+
2. [Android SDK](http://developer.android.com/sdk/index.html) (r17 or later, latest is best supported) installed, preferably with all platforms.
5+
3. [Maven 3.0.3+](http://maven.apache.org/download.html) installed
6+
4. Set environment variable `ANDROID_HOME` to the path of your installed Android SDK and add `$ANDROID_HOME/tools` as well as `$ANDROID_HOME/platform-tools` to your `$PATH`.
7+
8+
On Windows: use `%ANDROID_HOME%\tools` and `%ANDROID_HOME%\platform-tools` instead.
9+
10+
On OS X: Note that for the path to work on the commandline and in IDE's started by launchd you have to set it in `/etc/launchd.conf` and **NOT** in .bashrc or something else.
11+
12+
The generated target artifacts are an [apklib](https://code.google.com/p/maven-android-plugin/wiki/ApkLib) file and a regular .jar.
13+
14+
Tests are in `../cucumber-test/`.
15+
16+
## Developers
17+
18+
When running the test app, logs can be read with:
19+
20+
```
21+
adb logcat
22+
```

‎android/pom.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>info.cukes</groupId>
8+
<artifactId>cucumber-jvm</artifactId>
9+
<relativePath>../pom.xml</relativePath>
10+
<version>1.1.4-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>cucumber-android</artifactId>
14+
<packaging>apklib</packaging>
15+
<name>Cucumber-JVM: Android</name>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.google.android</groupId>
20+
<artifactId>android</artifactId>
21+
<scope>provided</scope>
22+
</dependency>
23+
<dependency>
24+
<groupId>com.google.android</groupId>
25+
<artifactId>android-test</artifactId>
26+
<scope>provided</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>info.cukes</groupId>
30+
<artifactId>cucumber-java</artifactId>
31+
<scope>provided</scope>
32+
</dependency>
33+
</dependencies>
34+
35+
<build>
36+
<sourceDirectory>src</sourceDirectory>
37+
<pluginManagement>
38+
<plugins>
39+
<plugin>
40+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
41+
<artifactId>android-maven-plugin</artifactId>
42+
<version>${android-maven-plugin.version}</version>
43+
<extensions>true</extensions>
44+
</plugin>
45+
</plugins>
46+
</pluginManagement>
47+
<plugins>
48+
<plugin>
49+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
50+
<artifactId>android-maven-plugin</artifactId>
51+
<configuration>
52+
<sdk>
53+
<!-- api level 8 = platform 2.2.1 -->
54+
<platform>8</platform>
55+
</sdk>
56+
</configuration>
57+
<executions>
58+
<execution>
59+
<id>update-manifest</id>
60+
<goals>
61+
<goal>manifest-update</goal>
62+
</goals>
63+
<configuration>
64+
<manifest>
65+
<versionName>${project.version}</versionName>
66+
<versionCode>${parent.parent.version}</versionCode>
67+
</manifest>
68+
</configuration>
69+
</execution>
70+
</executions>
71+
</plugin>
72+
</plugins>
73+
</build>
74+
</project>

‎android/project.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
target=android-8
2+
android.library=true

0 commit comments

Comments
 (0)