Merge branch 'develop' into 'master'
Release See merge request sschueller/peertube!37
This commit is contained in:
commit
ef78a9bd83
23
Dockerfile
23
Dockerfile
@ -4,24 +4,29 @@ FROM gradle:7-jdk16
|
||||
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
|
||||
ENV ANDROID_SDK_CHECKSUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
|
||||
# https://developer.android.com/studio/releases/platform-tools
|
||||
# higher version casues Warning: Failed to find package
|
||||
ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2
|
||||
ENV ANDROID_HOME /usr/local/android-sdk-linux
|
||||
ENV ANDROID_VERSION 29
|
||||
ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
|
||||
ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux
|
||||
ENV ANDROID_VERSION 30
|
||||
# ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
|
||||
ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin
|
||||
|
||||
RUN mkdir "$ANDROID_HOME" .android && \
|
||||
cd "$ANDROID_HOME" && \
|
||||
RUN mkdir "$ANDROID_SDK_ROOT" .android && \
|
||||
cd "$ANDROID_SDK_ROOT" && \
|
||||
curl -o sdk.zip $ANDROID_SDK_URL && \
|
||||
echo "${ANDROID_SDK_CHECKSUM} sdk.zip" | sha256sum -c - && \
|
||||
unzip sdk.zip && \
|
||||
rm sdk.zip && \
|
||||
rm sdk.zip
|
||||
RUN cd "$ANDROID_SDK_ROOT" && \
|
||||
mv cmdline-tools latest && \
|
||||
mkdir cmdline-tools && \
|
||||
mv latest cmdline-tools/.
|
||||
|
||||
RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses
|
||||
RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --update
|
||||
RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
|
||||
RUN yes | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --licenses
|
||||
RUN $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --update
|
||||
# https://developer.android.com/studio/command-line/sdkmanager
|
||||
RUN $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager \
|
||||
"build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
|
||||
"platforms;android-${ANDROID_VERSION}" \
|
||||
"platform-tools"
|
||||
|
||||
|
@ -39,15 +39,15 @@ else {
|
||||
apply plugin: 'kotlin-kapt'
|
||||
|
||||
android {
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 30
|
||||
buildToolsVersion "30.0.2"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.schueller.peertube"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 31
|
||||
versionCode 1065
|
||||
versionName "1.7.0"
|
||||
targetSdkVersion 30
|
||||
versionCode 1064
|
||||
versionName "1.6.0"
|
||||
buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user