Skip to content

Commit

Permalink
Merge pull request #130 from nextcloud/updateAndroidDeps
Browse files Browse the repository at this point in the history
update android deps
  • Loading branch information
tobiasKaminsky authored Jan 21, 2019
2 parents 7fb3abe + 24a0649 commit c22b903
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions android/.gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
org.gradle.jvmargs=-Xmx4608M
android.useAndroidX = true
android.enableJetifier = false
9 changes: 6 additions & 3 deletions android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@ RUN cd /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\ 14#minSdkVersion\ 18#' build.gradle
sed -i s'#minSdkVersion\ 14#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

RUN cd /gradle && ./gradlew clean assemble assembleAndroidTest lint
RUN yes | sdkmanager --sdk_root=/opt/android-sdk-linux/ --update

RUN cd /gradle && ./gradlew clean assemble assembleAndroidTest # lint

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 echo "y" | sdkmanager --sdk_root=/opt/android-sdk-linux/ --update
RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platforms;android-27"
RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platform-tools"

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

0 comments on commit c22b903

Please sign in to comment.