Skip to content

Commit 83cf622

Browse files
authored
Merge pull request #5 from pwa-builder/dev
Update for sdk-34
2 parents 571cedd + 1dd45e9 commit 83cf622

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
# when _TAGGED is "tagged" the version in _VERSION will be used.
44
# _TAGGED is used to handle the build stages
55

6-
# "9123335" as of 2023/01/11
6+
# Find latest version for commandlinetools on https://developer.android.com/studio
7+
# or run `curl https://developer.android.com/studio | findstr /r "https:\/\/dl.google.com\/android\/repository\/commandlinetools\-linux\-[0-9]*_latest\.zip"`
8+
# and copy the value between "linux-XXXXXXX_latest"
79
ARG ANDROID_SDK_TOOLS_TAGGED="latest"
8-
ARG ANDROID_SDK_TOOLS_VERSION="9123335"
10+
ARG ANDROID_SDK_TOOLS_VERSION="11076708"
911

1012
# Valid values are "last8" or "tagged"
1113
# "last8" will grab the last 8 android-sdks, including extensions and
@@ -119,7 +121,6 @@ RUN apt-get update -qq > /dev/null && \
119121
m4 \
120122
ncurses-dev \
121123
ocaml \
122-
openjdk-8-jdk \
123124
openjdk-11-jdk \
124125
openjdk-17-jdk \
125126
openssh-client \
@@ -204,7 +205,6 @@ FROM jenv-${JENV_TAGGED} as jenv-final
204205
RUN . ~/.bash_profile && \
205206
. /etc/jdk.env && \
206207
java -version && \
207-
jenv add /usr/lib/jvm/java-8-openjdk-$JDK_PLATFORM && \
208208
jenv add /usr/lib/jvm/java-11-openjdk-$JDK_PLATFORM && \
209209
jenv add /usr/lib/jvm/java-17-openjdk-$JDK_PLATFORM && \
210210
jenv versions && \

tagged_sdk_packages_list.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
platforms:android-34
12
platforms;android-33
23
platforms;android-32
34
platforms;android-31

0 commit comments

Comments
 (0)