From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 28 Nov 2015 10:48:57 +0000 (+0100)
Subject: Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151129~2^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c94b5314b750083451bfc2587c5a492a057a88c4?ds=inline;hp=--cc

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

Conflicts:
	build.gradle
---

c94b5314b750083451bfc2587c5a492a057a88c4
diff --cc build.gradle
index ccfce0d9,2a397999..8c68fa73
--- a/build.gradle
+++ b/build.gradle
@@@ -27,15 -28,12 +28,18 @@@ dependencies 
  }
  
  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
 +        versionName "ownCloud beta"
 +    }
 +
      sourceSets {
          main {
              manifest.srcFile 'AndroidManifest.xml'
@@@ -72,20 -67,10 +76,20 @@@
      packagingOptions {
          exclude 'META-INF/LICENSE.txt'
      }
 -}
 -
 -
 -
  
 +    signingConfigs {
 +        release {
 +            storeFile file(RELEASE_STORE_FILE)
 +            storePassword RELEASE_STORE_PASSWORD
 +            keyAlias RELEASE_KEY_ALIAS
 +            keyPassword RELEASE_KEY_PASSWORD
 +        }
 +    }
  
 +     buildTypes {
 +        release {
 +            signingConfig signingConfigs.release
 +        }
 +    }
  
- }
++}