From 9dc7d54689b5bce8939733b2bbdf00173fea1d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Fri, 5 Feb 2021 15:55:01 +0100
Subject: [PATCH 1/2] fix: Removed SHA from version name to fix fdroid builds

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d11a0a..ffbaf4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,7 @@ fetch-semantic-version:
     - export VERSION_CODE=$((${VERSION_CODE}+1)) && echo ${VERSION_CODE}
     - export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo ${VERSION_SHA}
     - 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/versionName .*/versionName \"${VERSION_NAME}\"/g" app/build.gradle
     - echo ${VERSION_CODE} > VERSION_CODE.txt

From 5305533cea1f43890c1657d24d0f18846c019ae9 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Fri, 5 Feb 2021 15:48:32 +0000
Subject: [PATCH 2/2] chore(release): 1.1.1 [only cd]

## 1.1.1 (2021-02-05)

### Bug Fixes

* Removed SHA from version name to fix fdroid builds 9dc7d54
---
 CHANGELOG.md                                        | 7 +++++++
 VERSION.txt                                         | 2 +-
 app/build.gradle                                    | 4 ++--
 fastlane/metadata/android/en-US/changelogs/1057.txt | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/1057.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95f12b6..a636638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
 
 
diff --git a/VERSION.txt b/VERSION.txt
index 9084fa2..524cb55 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/app/build.gradle b/app/build.gradle
index 6ce455a..17f9a6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,8 +44,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1056
-        versionName "1.1.0-12d85f58"
+        versionCode 1057
+        versionName "1.1.1"
         buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/fastlane/metadata/android/en-US/changelogs/1057.txt b/fastlane/metadata/android/en-US/changelogs/1057.txt
new file mode 100644
index 0000000..0475985
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1057.txt
@@ -0,0 +1,6 @@
+## 1.1.1 (2021-02-05)
+
+
+### Bug Fixes
+
+* Removed SHA from version name to fix fdroid builds 9dc7d54