Skip to content

Commit bb463f0

Browse files
fontsieMarco Stevan
andauthored
chore: update Android SDK tools to version 35 and adjust README for API levels 31-35 (#53)
* chore: update Android SDK tools to version 35 and adjust README for API levels 31-35 * chore: update gradle to version 8.12 * chore: apply the optimisations suggested by CodeRabbit --------- Co-authored-by: Marco Stevan <marco.stevan@r3gis.com>
1 parent 66fca77 commit bb463f0

2 files changed

Lines changed: 24 additions & 17 deletions

File tree

Dockerfile

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,47 @@
11
FROM beevelop/java
22

33
# https://developer.android.com/studio/#downloads
4-
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" \
5-
ANDROID_BUILD_TOOLS_VERSION=34.0.0 \
4+
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" \
5+
ANDROID_BUILD_TOOLS_VERSION=35.0.0 \
66
ANT_HOME="/usr/share/ant" \
77
MAVEN_HOME="/usr/share/maven" \
88
GRADLE_HOME="/usr/share/gradle" \
99
ANDROID_SDK_ROOT="/opt/android" \
1010
ANDROID_HOME="/opt/android"
1111

12-
ENV PATH $PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
12+
ENV PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
1313

1414
WORKDIR /opt
1515

16-
RUN apt-get -qq update && \
17-
apt-get -qq install -y wget curl maven ant gradle
16+
RUN apt -qq update && \
17+
apt -qq install -y --no-install-recommends wget curl maven ant unzip && \
18+
apt autoremove -y && \
19+
apt clean && \
20+
rm -rf /var/lib/apt/lists/*
21+
22+
# Installs gradle
23+
RUN wget https://services.gradle.org/distributions/gradle-8.12-bin.zip && \
24+
unzip -d /usr/share/ gradle-8.12-bin.zip && \
25+
mv /usr/share/gradle-8.12 /usr/share/gradle && \
26+
ln -s /usr/share/gradle/bin/gradle /usr/bin/gradle
1827

1928
# Installs Android SDK
2029
RUN mkdir android && cd android && \
2130
wget -O tools.zip ${ANDROID_SDK_URL} && \
2231
unzip tools.zip && rm tools.zip && \
2332
cd cmdline-tools && \
24-
mkdir latest && \
25-
ls | grep -v latest | xargs mv -t latest
33+
mkdir -p latest && \
34+
find . -mindepth 1 -maxdepth 1 ! -name latest -exec mv -t latest {} +
2635

2736
RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
2837
while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
29-
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
30-
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" && \
38+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
39+
while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-34" "platforms;android-35" && \
3140
while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" && \
3241
while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
3342

3443
RUN chmod a+x -R $ANDROID_SDK_ROOT && \
3544
chown -R root:root $ANDROID_SDK_ROOT && \
3645
rm -rf /opt/android/licenses && \
37-
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
38-
apt-get autoremove -y && \
39-
apt-get clean && \
40-
mvn -v && gradle -v && java -version && ant -version
46+
rm -rf /tmp/* /var/tmp/* && \
47+
mvn -v && gradle -v && java -version && ant -version

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
![CalVer](https://img.shields.io/badge/CalVer-YYYY.MM.MICRO-22bfda.svg?style=for-the-badge)
99
[![Beevelop](https://img.shields.io/badge/-%20Made%20with%20%F0%9F%8D%AF%20by%20%F0%9F%90%9Dvelop-blue.svg?style=for-the-badge)](https://beevelop.com)
1010

11-
# Android 13 (API levels 28 - 34)
11+
# Android 15 (API levels 31 - 35)
1212

1313
## based on [beevelop/java](https://github.com/beevelop/docker-java)
1414

15-
- Java `17.0.9`
16-
- Gradle `4.4.1` (Groovy: `2.4.21`)
15+
- Java `17.0.12`
16+
- Gradle `8.12` (Groovy: `3.0.22`)
1717
- Apache Maven `3.6.3`
1818
- Ant `1.10.12`
1919

@@ -41,7 +41,7 @@ RUN yes | sdkmanager --licenses --sdk_root=$ANDROID_SDK_ROOT
4141

4242
## Licenses
4343

44-
The usage of the Android SDK requires you to accept the licenses
44+
The usage of the Android SDK requires you to accept the licenses
4545

4646
## Maintenance
4747

0 commit comments

Comments
 (0)