Merge pull request #242 from nextcloud/newAndroidandroid-57

update android

3 files changed, 20 insertions, 26 deletions

diff --git a/android/Dockerfile b/android/Dockerfile
index 650edc6..c06f809 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -1,13 +1,12 @@
 FROM debian:stretch
 
 RUN apt-get update && apt-get install -y software-properties-common
-RUN apt-get install -y ruby wget libxdamage1 libgl1-mesa-glx libpulse0 locales unzip openjdk-8-jdk-headless curl qrencode git lib32stdc++6 && \
+RUN apt-get install -y ruby wget libxdamage1 libgl1-mesa-glx libpulse0 locales unzip openjdk-8-jdk-headless curl qrencode git && \
     apt-get autoremove -y && apt-get autoclean && apt-get clean && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
-RUN mkdir /opt/android-sdk-linux && \ 
-    cd /opt/android-sdk-linux && \ 
-    wget --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
+RUN mkdir /opt/android-sdk-linux
+RUN cd /opt/android-sdk-linux && wget --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
     unzip android-sdk.zip && \
     rm -f android-sdk.zip
 
@@ -25,23 +24,18 @@ ADD .gradle /root/.gradle
 RUN yes | sdkmanager --sdk_root=/opt/android-sdk-linux/ --licenses
 
 RUN cd /gradle && \
-    wget https://raw.githubusercontent.com/nextcloud/android/master/build.gradle -O android.gradle && \
+    wget https://raw.githubusercontent.com/nextcloud/android/master/build.gradle -O build.gradle && \
     wget https://raw.githubusercontent.com/nextcloud/android/master/gplay.gradle && \
-    wget https://raw.githubusercontent.com/nextcloud/android-library/master/build.gradle -O android-library.gradle && \
-    sed '/^ [ ]*dependencies/Q' android.gradle >> build.gradle && \
-    echo "    dependencies {" >> build.gradle && \
-    sed -n '/^ .*dependencies.*{/,/\}/p' android-library.gradle | grep -v dep >> build.gradle && \
-    grep -A 999 "^ [ ]*dependencies" android.gradle  | sed '/^dependencies/Q' | grep -v "dependencies" >> build.gradle && \
-    echo "dependencies {" >> build.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 s'#minSdkVersion\ 16#minSdkVersion\ 18#' build.gradle && \
-    sed -i s"/implementation 'com.github.tobiaskaminsky:android-job:v1.2.6.1'//" build.gradle && \
-    sed -i s"/implementation 'com.afollestad:sectioned-recyclerview:0.5.0'//" build.gradle && \
-    sed -i s"/.*NC_TEST.*//" build.gradle && \
-    sed -i s"/compileOnly.*findbugs.*//" build.gradle
+    sed -i s"/.*NC_TEST.*//" build.gradle
+
+RUN yes | sdkmanager --sdk_root=/opt/android-sdk-linux/ --update
+
+RUN cd /gradle && ./gradlew clean assemble assembleAndroidTest lint && \
+    ./gradlew clean
+    
+RUN cd /gradle && \
+    wget https://raw.githubusercontent.com/nextcloud/android-library/master/build.gradle -O build.gradle && \
+    sed -i s"/.*NC_TEST.*//" build.gradle
 
 RUN yes | sdkmanager --sdk_root=/opt/android-sdk-linux/ --update
 
@@ -53,7 +47,11 @@ RUN gem install xml-simple
 
 RUN wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux32 -O /usr/bin/jq && chmod +x /usr/bin/jq
 
+RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platforms;android-27" 
 RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platform-tools"
-RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "emulator"
 
+RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "system-images;android-27;google_apis;x86"
+RUN (sleep 5; echo "no") | avdmanager create avd -n android-27 -c 100M -k "system-images;android-27;google_apis;x86" --abi "google_apis/x86"
+
+EXPOSE 5037
 WORKDIR /opt/workspace/
diff --git a/android/gradle/gradle/wrapper/gradle-wrapper.properties b/android/gradle/gradle/wrapper/gradle-wrapper.properties
index d649f56..007d0e8 100644
--- a/android/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/android/gradle/src/main/AndroidManifest.xml b/android/gradle/src/main/AndroidManifest.xml
index 83905aa..9a8c357 100644
--- a/android/gradle/src/main/AndroidManifest.xml
+++ b/android/gradle/src/main/AndroidManifest.xml
@@ -7,8 +7,4 @@
         tools:replace="android:label">
     </application>
 
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="28" />
-
 </manifest>