From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 19:12:20 +0000 (+0100)
Subject: Merge branch 'beta' of github.com:owncloud/android into beta
X-Git-Tag: beta-20151129~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/26b1864940df7c02b1941355034fe83edd1d6bd2?ds=sidebyside;hp=-c

Merge branch 'beta' of github.com:owncloud/android into beta
---

26b1864940df7c02b1941355034fe83edd1d6bd2
diff --combined AndroidManifest.xml
index 5a835bb3,a1fb0745..aef1bc67
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,13 -18,12 +18,13 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
  <manifest package="com.owncloud.android"
 -    android:versionCode="20151128"
 -    android:versionName="ownCloud beta" xmlns:android="http://schemas.android.com/apk/res/android">
 +    android:versionCode="20151129"
 +    android:versionName="20151129"
 +    xmlns:android="http://schemas.android.com/apk/res/android">
  
      <uses-sdk
          android:minSdkVersion="14"
-         android:targetSdkVersion="22" />
+         android:targetSdkVersion="23" />
  
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --combined build.gradle
index a5906114,8c68fa73..635cf8aa
--- a/build.gradle
+++ b/build.gradle
@@@ -3,12 -3,13 +3,13 @@@ buildscript 
          mavenCentral()
      }
      dependencies {
-         classpath 'com.android.tools.build:gradle:1.3.0'
+         classpath 'com.android.tools.build:gradle:1.5.0'
      }
  }
  
  apply plugin: 'com.android.application'
  
+ 
  repositories {
      mavenCentral()
  
@@@ -20,19 -21,22 +21,22 @@@
  dependencies {
      compile name: 'touch-image-view'
      compile project(':owncloud-android-library')
-     compile 'com.android.support:support-v4:22.2.1'
+     compile 'com.android.support:support-v4:23.1.1'
      compile 'com.jakewharton:disklrucache:2.0.2'
-     compile 'com.android.support:appcompat-v7:22.2.1'
+     compile 'com.android.support:appcompat-v7:23.1.1'
      compile 'com.getbase:floatingactionbutton:1.10.1'
  }
  
  android {
-     compileSdkVersion 22
-     buildToolsVersion "22.0.1"
+     compileSdkVersion 23
+     buildToolsVersion "23.0.2"
+     // as long as ownCloud uses Apache HTTP
+     // http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
+     useLibrary 'org.apache.http.legacy'
  
      defaultConfig {
          applicationId "com.owncloud.android.beta"
 -        versionCode 20151128
 +        versionCode 20151129
          versionName "ownCloud beta"
      }
  
@@@ -88,4 -92,4 +92,4 @@@
          }
      }
  
- }
+ }