Merge branch 'develop' into 'master'

Release

See merge request sschueller/peertube!35
This commit is contained in:
Stefan Schüller 2021-11-21 10:21:42 +00:00
commit 4151694e2c

View File

@ -39,13 +39,13 @@ else {
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
android { android {
compileSdkVersion 29 compileSdkVersion 31
buildToolsVersion "30.0.2" buildToolsVersion "30.0.2"
defaultConfig { defaultConfig {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 31
versionCode 1064 versionCode 1064
versionName "1.6.0" versionName "1.6.0"
buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'