Merge pull request #198 from hannesa2/AndroidStudio-3.2.1

Android Studio 3.2.1
owncloud · Nov 29, 2018 · 9502498 · 9502498
2 parents c85fe75 + 94f3c37
commit 9502498
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -33,9 +33,5 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <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
@@ -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,11 @@ dependencies {
 android {
     compileSdkVersion 26
 
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

diff --git 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git 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
@@ -11,6 +11,11 @@ dependencies {
 android {
     compileSdkVersion 26
 
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'