BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/135059

Change subject: Get tests to run on older devices.
......................................................................

Get tests to run on older devices.

Had to do some Maven magic to get JUnit jar included
without being a duplicate. Before this change it
only worked on my Kitkat device, but not on my
GB and ICS devices.

Change-Id: I4b0391b070ede15a150296fe32b03de3802f8d98
---
M wikipedia-it/pom.xml
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/59/135059/1

diff --git a/wikipedia-it/pom.xml b/wikipedia-it/pom.xml
index fbf2d9e..0774ac0 100644
--- a/wikipedia-it/pom.xml
+++ b/wikipedia-it/pom.xml
@@ -20,6 +20,17 @@
             <groupId>com.google.android</groupId>
             <artifactId>android-test</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.wikimedia</groupId>
@@ -49,6 +60,7 @@
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <configuration>
+                    <extractDuplicates>true</extractDuplicates>
                     <test>
                         <!--<skip>true|false|auto</skip> -->
                         
<!--<instrumentationPackage>packageName</instrumentationPackage> -->

-- 
To view, visit https://gerrit.wikimedia.org/r/135059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b0391b070ede15a150296fe32b03de3802f8d98
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to