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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Stefan Schueller 2021-02-06 15:05:40 +01:00
commit c97c5fe949
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -73,7 +73,7 @@ fetch-semantic-version:
- export VERSION_CODE=$((${VERSION_CODE}+1)) && echo ${VERSION_CODE} - export VERSION_CODE=$((${VERSION_CODE}+1)) && echo ${VERSION_CODE}
- export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo ${VERSION_SHA} - export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo ${VERSION_SHA}
- export VERSION=`cat VERSION.txt` && echo ${VERSION} - export VERSION=`cat VERSION.txt` && echo ${VERSION}
- export VERSION_NAME=${VERSION}-${VERSION_SHA} && echo ${VERSION_NAME} - export VERSION_NAME=${VERSION} && echo ${VERSION_NAME}
- sed -i -e "s/versionCode .*/versionCode ${VERSION_CODE}/g" app/build.gradle - sed -i -e "s/versionCode .*/versionCode ${VERSION_CODE}/g" app/build.gradle
- sed -i -e "s/versionName .*/versionName \"${VERSION_NAME}\"/g" app/build.gradle - sed -i -e "s/versionName .*/versionName \"${VERSION_NAME}\"/g" app/build.gradle
- echo ${VERSION_CODE} > VERSION_CODE.txt - echo ${VERSION_CODE} > VERSION_CODE.txt

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## 1.1.1 (2021-02-05)
### Bug Fixes
* Removed SHA from version name to fix fdroid builds 9dc7d54
# 1.1.0 (2021-02-01) # 1.1.0 (2021-02-01)

2
VERSION.txt
View File

@ -1 +1 @@
1.1.0 1.1.1

4
app/build.gradle
View File

@ -44,8 +44,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1056 versionCode 1057
versionName "1.1.0-12d85f58" versionName "1.1.1"
buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

6
fastlane/metadata/android/en-US/changelogs/1057.txt Normal file
View File

@ -0,0 +1,6 @@
## 1.1.1 (2021-02-05)
### Bug Fixes
* Removed SHA from version name to fix fdroid builds 9dc7d54