From 6eba501c4b7b70d8c1eb0ea7500adaa52423f996 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Wed, 24 Oct 2018 08:22:41 +0200
Subject: [PATCH 1/2] Android Studio 3.2.1

---
 AndroidManifest.xml                      | 1 -
 build.gradle                             | 6 +++++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81b9494ef..113afe9bc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,7 +34,6 @@
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
 
     <uses-sdk
-        android:minSdkVersion="14"
         android:targetSdkVersion="26" />
 
 </manifest>
diff --git a/build.gradle b/build.gradle
index c2176420f..f460a268d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -27,6 +27,10 @@ dependencies {
 android {
     compileSdkVersion 26
 
+    defaultConfig {
+        minSdkVersion 14
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 267dfc1e8..53f7eaf30 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
\ No newline at end of file

From 94f3c377e4fbe646823691dc096192731eabcaef Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Thu, 25 Oct 2018 09:16:48 +0200
Subject: [PATCH 2/2] apply review comment concerning targetSdkVersion

https://github.com/owncloud/android-library/pull/198#discussion_r228050760
---
 AndroidManifest.xml               | 3 ---
 build.gradle                      | 1 +
 sample_client/AndroidManifest.xml | 3 ---
 sample_client/build.gradle        | 5 +++++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 113afe9bc..b8083d239 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,8 +33,5 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
 
-    <uses-sdk
-        android:targetSdkVersion="26" />
-
 </manifest>
 
diff --git a/build.gradle b/build.gradle
index f460a268d..ad97f38dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
+        targetSdkVersion 26
     }
 
     sourceSets {
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index 58d5d6c11..32f151693 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -29,9 +29,6 @@
           android:versionName="1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="26"/>
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index e61a14588..c1b01e3f5 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -11,6 +11,11 @@ dependencies {
 android {
     compileSdkVersion 26
 
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'