From d908a599b182110cf4482490d3d0310ff2847efd Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 6 Jul 2020 13:28:19 -0400
Subject: [PATCH] bump version and build fixes

---
 .github/workflows/build.yml                | 8 +++++---
 src/Android/Properties/AndroidManifest.xml | 2 +-
 src/iOS.Autofill/Info.plist                | 2 +-
 src/iOS.Extension/Info.plist               | 2 +-
 src/iOS/Info.plist                         | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68c8ae9cf..142c73db5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,7 +134,7 @@ jobs:
             -a ./com.x8bit.bitwarden.aab `
             -a ./com.x8bit.bitwarden.apk `
             -a ./com.x8bit.bitwarden-fdroid.apk `
-            -m $env:RELEASE_TAG_NAME `
+            -m "Version $($env:RELEASE_TAG_NAME.TrimStart('v'))" `
             $env:RELEASE_TAG_NAME
         shell: pwsh
         env:
@@ -200,7 +200,9 @@ jobs:
 
       - name: Compile for F-Droid Store
         if: github.event_name == 'release'
-        run: ./.github/scripts/android/compile-fdroid.sh
+        run: |
+            sudo chmod +x ./.github/scripts/android/compile-fdroid.sh
+            ./.github/scripts/android/compile-fdroid.sh
         env:
           FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
           RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
@@ -289,7 +291,7 @@ jobs:
         run: |
           hub release edit `
             -a ./bitwarden-export/Bitwarden.ipa `
-            -m $env:RELEASE_TAG_NAME `
+            -m "Version $($env:RELEASE_TAG_NAME.TrimStart('v'))" `
             $env:RELEASE_TAG_NAME
         shell: pwsh
         env:
diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 26443ced8..4b8707cbe 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:versionCode="1"
-  android:versionName="2.5.3"
+  android:versionName="2.5.4"
   package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
diff --git a/src/iOS.Autofill/Info.plist b/src/iOS.Autofill/Info.plist
index 0d54163c7..dabe3e3b9 100644
--- a/src/iOS.Autofill/Info.plist
+++ b/src/iOS.Autofill/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.3</string>
+	<string>2.5.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>
diff --git a/src/iOS.Extension/Info.plist b/src/iOS.Extension/Info.plist
index 020182b61..4a8fcf22a 100644
--- a/src/iOS.Extension/Info.plist
+++ b/src/iOS.Extension/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.3</string>
+	<string>2.5.4</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>
diff --git a/src/iOS/Info.plist b/src/iOS/Info.plist
index ba9dcff1b..771886e7f 100644
--- a/src/iOS/Info.plist
+++ b/src/iOS/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.3</string>
+	<string>2.5.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>