Merge with master

.travis.yml

@@ -22,28 +22,6 @@ jobs:
     script:
     - mvn clean install -DskipTests=true
     - mvn javadoc:aggregate
-  - jdk: oraclejdk8
-    env: ANDROID_EXAMPLES=true
-    language: android
-    android:
-      components:
-      - tools
-      - platform-tools
-      - tools
-      - build-tools-26.0.0
-      - android-21
-      - sys-img-armeabi-v7a-android-21
-    before_install:
-    - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
-    - emulator -avd test -no-skin -no-audio -no-window &
-    install:
-    - mvn -q install --also-make --projects android,picocontainer -DskipTests=true
-      -Dmaven.javadoc.skip=true
-    before_script:
-    - android-wait-for-emulator
-    script:
-    - mvn install --activate-profiles android-examples --projects examples/android
-      --also-make-dependents -Dandroid.device=test
   - stage: deploy
     jdk: oraclejdk8
     script:

android/.travis.yml

@@ -0,0 +1,34 @@
+language: android
+jdk: oraclejdk8
+sudo: false
+
+cache:
+  directories:
+  - "$HOME/.m2"
+
+before_cache:
+- rm -rf $HOME/.m2/repository/io/cucumber
+
+android:
+  components:
+  - tools
+  - platform-tools
+  - tools
+  - build-tools-26.0.0
+  - android-21
+  - sys-img-armeabi-v7a-android-21
+
+before_install:
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+
+install:
+  - mvn -q install --also-make --projects android,picocontainer -DskipTests=true
+    -Dmaven.javadoc.skip=true
+
+before_script:
+  - android-wait-for-emulator
+
+script:
+  - mvn install --activate-profiles android-examples --projects examples/android
+    --also-make-dependents -Dandroid.device=test

android/README.md

@@ -1,3 +1,7 @@
+# Cucumber-Android
+
+This project implements Android support for Cucumber-JVM
+
 ## Developers
 
 ### Prerequisites
@@ -49,3 +53,30 @@ You can also use command line to provide these options to cucumber-android. Here
 
 ### Debugging
 Please read [the Android documentation on debugging](https://developer.android.com/tools/debugging/index.html).
+
+### Examples
+
+To *build* all android example modules with maven:
+
+```
+mvn package -pl examples/android -am -amd -P android,android-examples
+```
+
+To *clean* all android example modules with maven:
+
+```
+mvn clean -pl examples/android -amd -P android-examples
+```
+
+The example projects depend on the current (unreleased) Cucumber-JVM modules.
+If any of the examples fail to build, just build the android module and its dependencies once first:
+
+```
+mvn clean install -pl android -am
+```
+
+To create a virtual device and start an [Android emulator](https://developer.android.com/tools/devices/index.html):
+
+```
+$ANDROID_HOME/tools/android avd
+```

examples/android/android-test/pom.xml → android/cucumber-android-test/pom.xml

@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.cucumber.android-examples</groupId>
-        <artifactId>android-examples</artifactId>
+        <groupId>io.cucumber.android</groupId>
+        <artifactId>cucumber-android-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 

android/pom.xml → android/cucumber-android/pom.xml

@@ -1,21 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.cucumber</groupId>
-        <artifactId>cucumber-jvm</artifactId>
+        <groupId>io.cucumber.android</groupId>
+        <artifactId>cucumber-android-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-android</artifactId>
-    <name>Cucumber-JVM: Android</name>
+    <name>Cucumber-Android: Main</name>
 
     <dependencies>
         <dependency>
             <groupId>com.google.android</groupId>
             <artifactId>android</artifactId>
-            <version>4.1.1.4</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

examples/android/cukeulator-test/pom.xml → android/cukeulator-test/pom.xml

@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.cucumber.android-examples</groupId>
-        <artifactId>android-examples</artifactId>
+        <groupId>io.cucumber.android</groupId>
+        <artifactId>cucumber-android-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
@@ -26,14 +26,14 @@
             <artifactId>cucumber-picocontainer</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.cucumber.android-examples</groupId>
+            <groupId>io.cucumber.android</groupId>
             <artifactId>cukelator</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- declare apk dependency for android:deploy-dependencies target -->
         <dependency>
-            <groupId>io.cucumber.android-examples</groupId>
+            <groupId>io.cucumber.android</groupId>
             <artifactId>cukelator</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

examples/android/cukeulator-test/project.properties → android/cukeulator-test/project.properties

@@ -11,5 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-21
 android.library=false
+project.type=0

examples/android/cukeulator/pom.xml → android/cukeulator/pom.xml

@@ -3,15 +3,23 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.cucumber.android-examples</groupId>
-        <artifactId>android-examples</artifactId>
+        <groupId>io.cucumber.android</groupId>
+        <artifactId>cucumber-android-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cukelator</artifactId>
     <packaging>apk</packaging>
     <name>Examples: Android Cukeulator</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>

examples/android/cukeulator/project.properties → android/cukeulator/project.properties

@@ -11,5 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-21
 android.library=false
+project.type=0

examples/pom.xml

@@ -21,13 +21,6 @@
     </modules>
 
     <profiles>
-        <profile>
-            <id>android-examples</id>
-            <modules>
-                <module>android</module>
-            </modules>
-        </profile>
-
         <profile>
             <id>coveralls.io</id>
             <build>

pom.xml

@@ -74,8 +74,6 @@
         <freemarker.version>2.3.28</freemarker.version>
         <!-- version 4.0.0 does not work on Java 7 -->
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <android-maven-plugin.version>4.4.3</android-maven-plugin.version>
-        <android.version>4.1.1.4</android.version>
         <!-- Apparently Wicket 8.x requires Java 8.
         Stay on 7.0 as long as we support Java 7. -->
         <wicket.version>7.0.0</wicket.version>
@@ -169,16 +167,6 @@
                 <artifactId>picocontainer</artifactId>
                 <version>${picocontainer.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-android</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>android-examples</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java8</artifactId>
@@ -530,7 +518,6 @@
         <module>weld</module>
         <module>openejb</module>
         <module>needle</module>
-        <module>android</module>
         <module>examples</module>
         <!--This should always be the last module -->
         <module>continuous-deployment</module>