Merge pull request #106 from nextcloud/useSdk18

Use sdk 18 for downloading
nextcloud · Sep 18, 2018 · f5d73ba · f5d73ba
2 parents a622c55 + ffb8e62
commit f5d73ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/android/Dockerfile b/android/Dockerfile
@@ -32,9 +32,10 @@ RUN cd /gradle && \
     sed -n '/^dependencies/,/\}/p' android-library.gradle | grep -v dep | grep -v "}" >> build.gradle && \
     grep -A 999 "^dependencies" android.gradle | grep -v "dependencies" >> build.gradle && \
     sed -i '/.*com.google.*/s/^.*\/\///g' build.gradle && \
-    sed -i '/.*touch-image-view.*/s/^/\/\//g' build.gradle
+    sed -i '/.*touch-image-view.*/s/^/\/\//g' build.gradle && \
+    sed -i s'#minSdkVersion\ 14#minSdkVersion\ 18#' build.gradle
 
-RUN cd /gradle && ./gradlew clean assembleGenericDebug assembleGenericDebugAndroidTest lintGenericDebug
+RUN cd /gradle && ./gradlew clean assemble assembleAndroidTest lint
 
 RUN gem install xml-simple
 

diff --git a/android/gradle/src/main/AndroidManifest.xml b/android/gradle/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     </application>
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="18"
         android:targetSdkVersion="25" />
 
 </manifest>