From 0ba22f3a748cc368a993e3228dbb58351948077b Mon Sep 17 00:00:00 2001 From: Justin Willis Date: Thu, 8 Aug 2024 16:43:22 +0000 Subject: [PATCH 1/5] updated docker file --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 07ab6773..1b463635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ # 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 +# "\6609375" as of 2024/08/08 ARG ANDROID_SDK_TOOLS_TAGGED="latest" -ARG ANDROID_SDK_TOOLS_VERSION="9123335" +ARG ANDROID_SDK_TOOLS_VERSION="6609375" # Valid values are "last8" or "tagged" # "last8" will grab the last 8 android-sdks, including extensions and From 15ef672ebdd90a8d8d88291396771776ed1dd365 Mon Sep 17 00:00:00 2001 From: Justin Willis Date: Thu, 8 Aug 2024 17:59:36 +0000 Subject: [PATCH 2/5] update to version from Android dev site --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07ab6773..c967f4fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # "9123335" as of 2023/01/11 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 From 5b1f0a02e6b7542c6b67cb65a135bec4e7cf259d Mon Sep 17 00:00:00 2001 From: Justin Willis Date: Thu, 8 Aug 2024 15:41:39 -0700 Subject: [PATCH 3/5] Update Dockerfile Co-authored-by: Maicon Carraro --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index acadde37..c8be1eb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,9 @@ # when _TAGGED is "tagged" the version in _VERSION will be used. # _TAGGED is used to handle the build stages -# "\6609375" as of 2024/08/08 +# 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="11076708" From a2ec5ced2ec858a0a900f1153163b336cd1dd060 Mon Sep 17 00:00:00 2001 From: Justin Willis Date: Thu, 8 Aug 2024 22:50:47 +0000 Subject: [PATCH 4/5] update tagged sdk list + dont install jdk 8 --- Dockerfile | 1 - tagged_sdk_packages_list.txt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index acadde37..31b0386e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,6 @@ RUN apt-get update -qq > /dev/null && \ m4 \ ncurses-dev \ ocaml \ - openjdk-8-jdk \ openjdk-11-jdk \ openjdk-17-jdk \ openssh-client \ diff --git a/tagged_sdk_packages_list.txt b/tagged_sdk_packages_list.txt index cf43030e..e08043c7 100644 --- a/tagged_sdk_packages_list.txt +++ b/tagged_sdk_packages_list.txt @@ -1,3 +1,4 @@ +platforms:android-34 platforms;android-33 platforms;android-32 platforms;android-31 @@ -5,6 +6,7 @@ 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 From 6df1ffc44d5b4895f7352cc3de651fda36847e99 Mon Sep 17 00:00:00 2001 From: Justin Willis Date: Thu, 8 Aug 2024 23:07:39 +0000 Subject: [PATCH 5/5] remove all refs to JDK 8 --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d72a32f9..2ddf289a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -205,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 && \