From: MMMarcy <steiner.marcello@gmail.com>
Date: Fri, 17 Oct 2014 12:58:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
X-Git-Tag: oc-android-1.7.0_signed~69^2~10^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d8d75623e49a10942c5d02137032c40984c674ea?ds=inline

Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency

Conflicts:
	owncloud-android-library
	pom.xml
---

d8d75623e49a10942c5d02137032c40984c674ea
diff --cc owncloud-android-library
index 19d453dd,c29631b8..00000000
deleted file mode 160000,160000
--- a/owncloud-android-library
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 19d453dd55233d689754335af641e77087a1c431
 -Subproject commit c29631b8bfea22e5f0b448aab8ffff959ae4de66
diff --cc pom.xml
index 36c5d944,6a8cf6a7..538df03c
--- a/pom.xml
+++ b/pom.xml
@@@ -27,29 -26,24 +27,40 @@@
          <developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
          <url>https://github.com/owncloud/android</url>
      </scm>
 -    
 +
 +
 +    <!--<repositories>-->
 +        <!--<repository>-->
 +            <!--<id>android-support</id>-->
 +            <!--<url>file://${env.ANDROID_HOME}/extras/android/m2repository</url>-->
 +        <!--</repository>-->
 +    <!--</repositories>-->
 +
      <dependencies>
 +
-         <!--<dependency>-->
-             <!--<groupId>com.actionbarsherlock</groupId>-->
-             <!--<artifactId>library</artifactId>-->
-             <!--<version>4.1.0</version>-->
-         <!--</dependency>-->
+         <!-- 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>com.jakewharton</groupId>
 +            <artifactId>disklrucache</artifactId>
 +            <version>2.0.2</version>
 +        </dependency>
 +
          <dependency>
              <groupId>android-support-v4.jar</groupId>
              <artifactId>android-support-v4.jar</artifactId>