Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for sdk-34 #5

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update for sdk-34 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ba22f3
updated docker file
jgw96 Aug 8, 2024
fe78aa7
Merge pull request #4 from pwa-builder/sdk-34
jgw96 Aug 8, 2024
15ef672
update to version from Android dev site
jgw96 Aug 8, 2024
c52792c
Merge branch 'dev' of https://github.com/pwa-builder/docker-android-b…
jgw96 Aug 8, 2024
5b1f0a0
Update Dockerfile
jgw96 Aug 8, 2024
a2ec5ce
update tagged sdk list + dont install jdk 8
jgw96 Aug 8, 2024
759da4e
Merge branch 'dev' of https://github.com/pwa-builder/docker-android-b…
jgw96 Aug 8, 2024
6df1ffc
remove all refs to JDK 8
jgw96 Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
# when _TAGGED is "tagged" the version in _VERSION will be used.
# _TAGGED is used to handle the build stages

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

# Valid values are "last8" or "tagged"
# "last8" will grab the last 8 android-sdks, including extensions and
Expand Down Expand Up @@ -119,7 +121,6 @@ RUN apt-get update -qq > /dev/null && \
m4 \
ncurses-dev \
ocaml \
openjdk-8-jdk \
openjdk-11-jdk \
openjdk-17-jdk \
openssh-client \
Expand Down Expand Up @@ -204,7 +205,6 @@ FROM jenv-${JENV_TAGGED} as jenv-final
RUN . ~/.bash_profile && \
. /etc/jdk.env && \
java -version && \
jenv add /usr/lib/jvm/java-8-openjdk-$JDK_PLATFORM && \
jenv add /usr/lib/jvm/java-11-openjdk-$JDK_PLATFORM && \
jenv add /usr/lib/jvm/java-17-openjdk-$JDK_PLATFORM && \
jenv versions && \
Expand Down
2 changes: 2 additions & 0 deletions tagged_sdk_packages_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
platforms:android-34
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

target 35 to match bubblewrap? https://github.com/GoogleChromeLabs/bubblewrap/blob/2395d6aea6be141c146a1db435bc21fd06c41978/packages/core/template_project/app/build.gradle#L59

platforms;android-33
platforms;android-32
platforms;android-31
platforms;android-30
platforms;android-29
platforms;android-28
platforms;android-27
build-tools:34.0.0
build-tools;33.0.2
build-tools;33.0.1
build-tools;33.0.0
Expand Down
Loading