From 6c542600fa0344891342770f0d730b74b35d52ac Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 24 Oct 2017 21:43:18 +0900
Subject: [PATCH] Fix version

---
 app/build.gradle                             | 4 ++--
 prepare-release.bash                         | 2 +-
 publish-release.sh                           | 2 --
 syncthing/src/github.com/syncthing/syncthing | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c95c50bb..66683ab9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.nutomic.syncthingandroid"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 4128
-        versionName "0.9.16"
+        versionCode 4129
+        versionName "0.10.0-beta1"
         testApplicationId 'com.nutomic.syncthingandroid.test'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         playAccountConfig = playAccountConfigs.defaultAccountConfig
diff --git a/prepare-release.bash b/prepare-release.bash
index 1bd09bb5..cfec2ee1 100755
--- a/prepare-release.bash
+++ b/prepare-release.bash
@@ -78,7 +78,7 @@ NEW_VERSION_CODE=$(($OLD_VERSION_CODE + 1))
 sed -i "s/versionCode $OLD_VERSION_CODE/versionCode $NEW_VERSION_CODE/" "app/build.gradle"
 
 OLD_VERSION_NAME=$(grep "versionName" "app/build.gradle" | awk '{print $2}')
-sed -i "s/$OLD_VERSION_NAME/\"$1\"/" build.gradle
+sed -i "s/$OLD_VERSION_NAME/\"$1\"/" "app/build.gradle"
 git add "app/build.gradle" "app/src/main/play/en-GB/whatsnew"
 git commit -m "Bumped version to $NEW_VERSION_NAME"
 git tag ${NEW_VERSION_NAME}
diff --git a/publish-release.sh b/publish-release.sh
index 4d2f65b5..820c0651 100755
--- a/publish-release.sh
+++ b/publish-release.sh
@@ -18,8 +18,6 @@ Pushing to Github
 git push
 git push --tags
 
-version=`git describe --tags --abbrev=0`
-
 echo "
 
 Push to Google Play
diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing
index dc42db44..5aade9a4 160000
--- a/syncthing/src/github.com/syncthing/syncthing
+++ b/syncthing/src/github.com/syncthing/syncthing
@@ -1 +1 @@
-Subproject commit dc42db444b17145b7de9a0d1c56a42b9d64f3dea
+Subproject commit 5aade9a4a5506e5b71b2a9ab863790dca488700e