mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 05:35:39 +03:00
fix mvn build. needs to go together with update of pom.xml of
owncloud-android-library.
This commit is contained in:
parent
1d292aa224
commit
28550f5c68
1 changed files with 25 additions and 2 deletions
25
pom.xml
25
pom.xml
|
@ -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,6 +28,29 @@
|
|||
</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>
|
||||
|
|
Loading…
Reference in a new issue