Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into update-nodejs
Browse files Browse the repository at this point in the history
# Conflicts:
#	Dockerfile
  • Loading branch information
sturman committed Nov 4, 2024
2 parents b44ef0e + 266990c commit bbd71d6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ENV DEBIAN_FRONTEND=noninteractive

# set default build arguments
# https://developer.android.com/studio#command-tools
ARG SDK_VERSION=commandlinetools-linux-9477386_latest.zip
ARG ANDROID_BUILD_VERSION=34
ARG ANDROID_TOOLS_VERSION=34.0.0
ARG NDK_VERSION=26.1.10909125
ARG SDK_VERSION=commandlinetools-linux-11076708_latest.zip
ARG ANDROID_BUILD_VERSION=35
ARG ANDROID_TOOLS_VERSION=35.0.0
ARG NDK_VERSION=27.1.12297006
ARG NODE_VERSION=20
ARG WATCHMAN_VERSION=4.9.0
ARG CMAKE_VERSION=3.22.1
Expand Down

0 comments on commit bbd71d6

Please sign in to comment.