|
@@ -5,13 +5,17 @@
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>com.owncloud.android</groupId>
|
|
<groupId>com.owncloud.android</groupId>
|
|
<artifactId>owncloud</artifactId>
|
|
<artifactId>owncloud</artifactId>
|
|
- <version>1.3.21-SNAPSHOT</version>
|
|
|
|
|
|
+ <version>${owncloud.version}</version>
|
|
<packaging>apk</packaging>
|
|
<packaging>apk</packaging>
|
|
<name>Owncloud Android</name>
|
|
<name>Owncloud Android</name>
|
|
|
|
|
|
<properties>
|
|
<properties>
|
|
|
|
+ <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
|
|
<java-version>1.6</java-version>
|
|
<java-version>1.6</java-version>
|
|
- <google.android-version>4.2.2_r2</google.android-version>
|
|
|
|
|
|
+ <!-- Given by maven-android-sdk-deployer -->
|
|
|
|
+ <google.android-version>4.4_r1</google.android-version>
|
|
|
|
+ <!-- Usually the latest Android API -->
|
|
|
|
+ <google.android-api>19</google.android-api>
|
|
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
|
|
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
|
|
</properties>
|
|
</properties>
|
|
|
|
|
|
@@ -22,7 +26,7 @@
|
|
<developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
|
|
<developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
|
|
<url>https://github.com/owncloud/android</url>
|
|
<url>https://github.com/owncloud/android</url>
|
|
</scm>
|
|
</scm>
|
|
-
|
|
|
|
|
|
+
|
|
<dependencies>
|
|
<dependencies>
|
|
|
|
|
|
<dependency>
|
|
<dependency>
|
|
@@ -51,6 +55,13 @@
|
|
<artifactId>jackrabbit-webdav</artifactId>
|
|
<artifactId>jackrabbit-webdav</artifactId>
|
|
<version>2.5.2</version>
|
|
<version>2.5.2</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
+
|
|
|
|
+ <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
|
|
|
|
+ <dependency>
|
|
|
|
+ <groupId>com.owncloud.android</groupId>
|
|
|
|
+ <artifactId>oc_framework</artifactId>
|
|
|
|
+ <version>${owncloud.version}</version>
|
|
|
|
+ </dependency>
|
|
|
|
|
|
</dependencies>
|
|
</dependencies>
|
|
|
|
|
|
@@ -74,12 +85,11 @@
|
|
<plugin>
|
|
<plugin>
|
|
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
|
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
|
<artifactId>android-maven-plugin</artifactId>
|
|
<artifactId>android-maven-plugin</artifactId>
|
|
- <version>3.5.0</version>
|
|
|
|
|
|
+ <version>3.8.0</version>
|
|
<configuration>
|
|
<configuration>
|
|
<sdk>
|
|
<sdk>
|
|
- <!-- platform or api level (api level 4 = platform 1.6)-->
|
|
|
|
<path>${env.ANDROID_HOME}</path>
|
|
<path>${env.ANDROID_HOME}</path>
|
|
- <platform>17</platform>
|
|
|
|
|
|
+ <platform>${google.android-api}</platform>
|
|
</sdk>
|
|
</sdk>
|
|
</configuration>
|
|
</configuration>
|
|
<extensions>true</extensions>
|
|
<extensions>true</extensions>
|