Skip to content

Commit 39c927a

Browse files
author
Maik Hummel
committed
Merge branch 'master' into next
2 parents 80c0072 + 4a6116a commit 39c927a

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ script:
77
- docker build -t beendroid .
88
- docker run -d beendroid
99
- docker ps -a
10-
- docker run beendroid /bin/sh -c "android list && mvn -v && gradle -v && java -version && ant -version"
10+
- docker run beendroid /bin/sh -c "mvn -v && gradle -v && java -version && ant -version"

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
FROM beevelop/java
22

3-
MAINTAINER Maik Hummel <m@ikhummel.com>
4-
5-
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip" \
6-
ANDROID_BUILD_TOOLS_VERSION=27.0.3 \
3+
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
4+
ANDROID_BUILD_TOOLS_VERSION=29.0.2 \
75
ANT_HOME="/usr/share/ant" \
86
MAVEN_HOME="/usr/share/maven" \
97
GRADLE_HOME="/usr/share/gradle" \
@@ -25,7 +23,8 @@ RUN mkdir android && cd android && \
2523
RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
2624
while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
2725
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-10" "platforms;android-15" "platforms;android-16" "platforms;android-17" "platforms;android-18" "platforms;android-19" && \
28-
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27"
26+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27" && \
27+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-28" "platforms;android-29"
2928

3029
RUN while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository"
3130
RUN while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-15" "add-ons;addon-google_apis-google-16" "add-ons;addon-google_apis-google-17" "add-ons;addon-google_apis-google-18" "add-ons;addon-google_apis-google-19" "add-ons;addon-google_apis-google-21" "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24"

0 commit comments

Comments
 (0)