* changed android maven plugin version to most recent release version 4.0.0 for example projects

* fixed structural problems with example projects and android maven plugin 4.x.x

Author: SierraGolf

examples/android/android-studio/Cukeulator/README.md

@@ -60,7 +60,7 @@ adb shell am instrument -w cukeulator.android.example.cucumber.cukeulator.test/c
 ### Using an Android Studio IDE
 1. Import the example to Android Studio: `File > Import Project`.
 2. Make sure you have the cucumber-android jar dependencies in `app/libs/`.
-3. Create a test run confiruation:
+3. Create a test run configuration:
     1.  Run > Edit Configurations
     2. Click `+` button and select Android Tests
     3. Specify test name: `CalculatorTest`

examples/android/android-test/pom.xml

@@ -19,7 +19,6 @@
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-android</artifactId>
             <version>${project.version}</version>
-            <type>apklib</type>
         </dependency>
         <dependency>
             <groupId>info.cukes</groupId>
@@ -32,12 +31,15 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
+                <configuration>
+                    <!-- hack to workaround https://github.com/simpligility/android-maven-plugin/issues/548 -->
+                    <testCoverageFile>foo</testCoverageFile>
+                </configuration>
             </plugin>
         </plugins>
     </build>

examples/android/android-test/AndroidManifest.xml renamed to examples/android/android-test/src/main/AndroidManifest.xml

@@ -1,5 +1,9 @@
 ## Cukeulator Example Test
-This is the example test-project for the Cukeulator app.
+This is the example test-project for the Cukeulator app. Running the test assumes that the application itself has been install in your local repository like so:
+
+```
+mvn install -pl examples/android/cukeulator -P android-examples
+```
 
 ### Setup
 Features must be placed in `assets/features/`. Subdirectories are allowed.
@@ -23,7 +27,7 @@ To build:
 mvn package -pl examples/android/cukeulator-test -am -P android,android-examples
 ```
 
-To intall and run:
+To install and run:
 
 ```
 mvn install -pl examples/android/cukeulator-test -am -P android-examples

examples/android/android-test/assets/features/Test.feature renamed to examples/android/android-test/src/main/assets/features/Test.feature

@@ -12,7 +12,7 @@
     <available file="${file.libs}" type="dir" property="file.libs.present"/>
 
     <target name="libs.getmetadata">
-        <get src="${url.base}/${name.cucumber}/${file.metadata}" dest="./"/>
+        <get src="${url.base}/${name.cucumber}/${file.metadata}" dest="/"/>
     </target>
 
     <target name="libs.getjar.libs" depends="libs.getmetadata" if="file.libs.present">

examples/android/android-test/src/cucumber/example/android/test/CucumberActivity.java renamed to examples/android/android-test/src/main/java/cucumber/example/android/test/CucumberActivity.java

@@ -19,7 +19,6 @@
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-android</artifactId>
             <version>${project.version}</version>
-            <type>apklib</type>
         </dependency>
         <dependency>
             <groupId>info.cukes</groupId>
@@ -46,12 +45,16 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
+                <configuration>
+                    <!-- hack to workaround https://github.com/simpligility/android-maven-plugin/issues/548 -->
+                    <testCoverageFile>foo</testCoverageFile>
+                    <failOnNonStandardStructure>false</failOnNonStandardStructure>
+                </configuration>
             </plugin>
         </plugins>
     </build>

examples/android/android-test/src/cucumber/example/android/test/CucumberActivitySteps.java renamed to examples/android/android-test/src/main/java/cucumber/example/android/test/CucumberActivitySteps.java

@@ -15,10 +15,9 @@
     <name>Examples: Android Cukeulator</name>
 
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>

examples/android/android-test/src/cucumber/example/android/test/SomeDependency.java renamed to examples/android/android-test/src/main/java/cucumber/example/android/test/SomeDependency.java

@@ -43,7 +43,7 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <groupId>com.simpligility.maven.plugins</groupId>
                     <artifactId>android-maven-plugin</artifactId>
                     <version>${android-maven-plugin.version}</version>
                     <configuration>

examples/android/android-test/res/drawable-hdpi/ic_launcher.png renamed to examples/android/android-test/src/main/res/drawable-hdpi/ic_launcher.png

@@ -61,7 +61,7 @@
         <slf4j.version>1.7.7</slf4j.version>
         <freemarker.version>2.3.21</freemarker.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <android-maven-plugin.version>4.0.0-rc.1</android-maven-plugin.version>
+        <android-maven-plugin.version>4.0.0</android-maven-plugin.version>
         <android.version>4.1.1.4</android.version>
         <wicket.version>7.0.0-M3</wicket.version>
         <!-- We need a version that works with Java 6 and Java 7: http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html -->
@@ -796,9 +796,9 @@
                 <!-- Non-standard plugins -->
 
                 <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <groupId>com.simpligility.maven.plugins</groupId>
                     <artifactId>android-maven-plugin</artifactId>
-                    <version>3.9.0-rc.3</version>
+                    <version>${android-maven-plugin.version}</version>
                 </plugin>
 
                 <plugin>