2022.11 fixes

This commit is contained in:
Dan Ballard 2022-11-30 11:40:17 -08:00
parent 224ce2663d
commit 423e81de7d
2 changed files with 15 additions and 5 deletions

View File

@ -6,7 +6,7 @@ FROM openjdk:8
ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
ANDROID_HOME="/usr/local/android-sdk" \
ANDROID_SDK=$ANDROID_HOME \
ANDROID_VERSION=29 \
ANDROID_VERSION=31 \
ANDROID_BUILD_TOOLS_VERSION=30.0.2
## Download Android SDK
@ -89,16 +89,18 @@ ENV GOPATH=$GOMOBILEPATH
ENV PATH=$GOMOBILEPATH/bin:$PATH
RUN mkdir -p "$GOMOBILEPATH/src" "$GOMOBILEPATH/bin" "$GOMOBILEPATH/pkg" && chmod -R 777 "$GOMOBILEPATH"
# 2022.11.09
ENV GOMOBILEHASH=43a0384520996c8376bfb8637390f12b44773e65
# install gomobile
RUN cd $GOMOBILEPATH/src; \
mkdir -p golang.org/x; \
cd golang.org/x; \
git clone https://github.com/golang/mobile.git; \
cd mobile; \
git checkout bdb1ca9a1e083af5929a8214e8a056d638ebbf2d;
git checkout $GOMOBILEHASH;
RUN go get golang.org/x/mobile/cmd/gomobile
RUN go get golang.org/x/mobile/cmd/gobind
RUN go get golang.org/x/mobile/bind
RUN go install golang.org/x/mobile/cmd/gomobile@$GOMOBILEHASH
RUN go install golang.org/x/mobile/cmd/gobind@$GOMOBILEHASH
RUN gomobile clean

View File

@ -6,6 +6,14 @@ This image was built for use with Drone CI but can be used with any docker setup
Versions are:
- 2022.11
- Go 1.19.3
- Android API 31
- NDK 21.0.6113669
- 2021.03
- Go 1.17.5
- Android API 30
- NDK 21.0.6113669
- 2021.03
- Go 1.15.10
- Android API 29