greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: CI updates, android SDK version

Browse Source
This commit is contained in:
Stefan Schueller 2021-11-21 14:37:33 +01:00
parent 116bc3ec2b
commit be9f5ef9b5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -4,9 +4,9 @@ FROM gradle:7-jdk16
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
ENV ANDROID_SDK_CHECKSUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf ENV ANDROID_SDK_CHECKSUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
# https://developer.android.com/studio/releases/platform-tools # https://developer.android.com/studio/releases/platform-tools
ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2 ENV ANDROID_BUILD_TOOLS_VERSION 31.0.3
ENV ANDROID_HOME /usr/local/android-sdk-linux ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANDROID_VERSION 29 ENV ANDROID_VERSION 31
ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
RUN mkdir "$ANDROID_HOME" .android && \ RUN mkdir "$ANDROID_HOME" .android && \

2
app/build.gradle
View File

@ -40,7 +40,7 @@ apply plugin: 'kotlin-kapt'
android { android {
compileSdkVersion 31 compileSdkVersion 31
buildToolsVersion "30.0.2" buildToolsVersion "31.0.3"
defaultConfig { defaultConfig {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"