diff --git a/Dockerfile.android b/Dockerfile.android index fa4a458..063c620 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -8,11 +8,11 @@ ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION} RUN dnf -y install --setopt=install_weak_deps=False \ java-17-openjdk-devel ncurses-compat-libs && \ mkdir -p sdk && cd sdk && \ - export CMDLINETOOLS=commandlinetools-linux-10406996_latest.zip && \ + export CMDLINETOOLS=commandlinetools-linux-11076708_latest.zip && \ curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \ unzip ${CMDLINETOOLS} && \ rm ${CMDLINETOOLS} && \ yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \ - cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;33.0.2' 'platforms;android-33' 'cmake;3.22.1' + cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;34.0.0' 'platforms;android-34' 'cmake;3.22.1' CMD /bin/bash diff --git a/Dockerfile.base b/Dockerfile.base index a2defad..6ba9bad 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -7,7 +7,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN dnf -y install --setopt=install_weak_deps=False \ bash bzip2 curl file findutils gettext git make nano patch pkgconfig python3-pip unzip which xz \ - dotnet-sdk-6.0 && \ - pip install scons==4.5.2 + dotnet-sdk-8.0 && \ + pip install scons==4.6.0 CMD /bin/bash