mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #620 from LukeOwncloud/develop

Browse source 
Fix mvn build
This commit is contained in:
David A. Velasco 2014-09-12 13:01:27 +02:00
commit 340bbd0d87
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pom.xml
View file

@ -13,7 +13,7 @@
<owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
<java-version>1.6</java-version>
<!-- Given by maven-android-sdk-deployer -->
<google.android-version>4.4.2_r2</google.android-version>
<google.android-version>4.4.2_r3</google.android-version>
<!-- Usually the latest Android API -->
<google.android-api>19</google.android-api>
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
@ -28,7 +28,30 @@
</scm>
<dependencies>
<!-- Dirty trick, but it works. TouchImageView library is not available as Maven project. -->
<dependency>
<groupId>touch-image-view.jar</groupId>
<artifactId>touch-image-view.jar</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${basedir}/libs/touch-image-view.jar</systemPath>
</dependency>
<!-- This causes a (version?) conflict during packaging since sherlockactionbar also includes compatibility-v4 -->
<!--<dependency>
<groupId>android.support</groupId>
<artifactId>compatibility-v4</artifactId>
<version>19.1.0</version>
</dependency>-->
<!-- Instead we need to include the exact same version -->
<dependency>
<groupId>android-support-v4.jar</groupId>
<artifactId>android-support-v4.jar</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${basedir}/third_party/android-support-library/android-support-v4.jar</systemPath>
</dependency>
<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>