Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110676
Change subject: Fix maven dependencies
......................................................................
Fix maven dependencies
- Uses repository hosted on toollabs
- mvn install now runs tests appropriately
- One test fails, is fixed in later commit
Change-Id: Ie495bebadd8f9f83e789456306af67c7a5e7d8a3
---
M pom.xml
M wikipedia/pom.xml
2 files changed, 22 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/110676/1
diff --git a/pom.xml b/pom.xml
index 9cded8e..b2538cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,23 +13,18 @@
<module>wikipedia-it</module>
</modules>
- <properties>
- <platform.version>4.1.1.4</platform.version>
- <android.plugin.version>3.7.0</android.plugin.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.google.android</groupId>
+ <groupId>android</groupId>
<artifactId>android</artifactId>
- <version>${platform.version}</version>
+ <version>4.4_r1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
- <version>${platform.version}</version>
+ <version>4.1.1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -38,33 +33,33 @@
<version>4.11</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.android.support</groupId>
- <artifactId>support-v4</artifactId>
- <version>18.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v4</artifactId>
+ <version>19.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <id>android-support-repository</id>
- <url>file:///${env.ANDROID_HOME}/extras/android/m2repository/</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>tools-repository</id>
+ <url>https://tools.wmflabs.org/android-maven-repo/</url>
+ </repository>
+ </repositories>
- <build>
+ <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
-
<version>${android.plugin.version}</version>
+ <version>3.8.2</version>
<configuration>
<sdk>
- <platform>17</platform>
+ <platform>19</platform>
</sdk>
-
</configuration>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml
index 139e404..b2d8fcc 100644
--- a/wikipedia/pom.xml
+++ b/wikipedia/pom.xml
@@ -17,15 +17,13 @@
<dependencies>
<dependency>
- <groupId>com.google.android</groupId>
+ <groupId>android</groupId>
<artifactId>android</artifactId>
- <version>${platform.version}</version>
- <scope>provided</scope>
+ <version>4.4_r1</version>
</dependency>
<dependency>
- <groupId>com.android.support</groupId>
- <artifactId>support-v4</artifactId>
- <type>jar</type>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v4</artifactId>
</dependency>
<dependency>
<groupId>org.mediawiki.api</groupId>
--
To view, visit https://gerrit.wikimedia.org/r/110676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie495bebadd8f9f83e789456306af67c7a5e7d8a3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
