From a6e5baecbcce8135def390e6da768dd8a14e155f Mon Sep 17 00:00:00 2001
From: Catfriend1 <ref_github@reiseredv.de>
Date: Mon, 17 Jun 2019 06:57:07 +0200
Subject: [PATCH] Futher improve the build process (#429)

* Update git_update_submodule.cmd

* Update build_and_release.cmd
---
 build_and_release.cmd    | 19 ++++++++++++++++++-
 git_update_submodule.cmd |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/build_and_release.cmd b/build_and_release.cmd
index 09ba1971..d199ec31 100644
--- a/build_and_release.cmd
+++ b/build_and_release.cmd
@@ -14,7 +14,10 @@ REM SET SYNCTHING_RELEASE_STORE_FILE="%userprofile%\.android\signing_key.jks"
 SET SYNCTHING_RELEASE_KEY_ALIAS=Syncthing-Fork
 title %SYNCTHING_RELEASE_KEY_ALIAS% - Build and Release
 REM 
-SET PATH=C:\Program Files\Android\Android Studio\jre\bin;%PATH%
+SET GIT_INSTALL_DIR=%ProgramFiles%\Git
+SET GIT_BIN="%GIT_INSTALL_DIR%\bin\git.exe"
+REM 
+SET PATH=C:\Program Files\Android\Android Studio\jre\bin;"%GIT_INSTALL_DIR%\bin";%PATH%
 REM
 echo [INFO] Let's prepare a new "%SYNCTHING_RELEASE_KEY_ALIAS%" GPlay release.
 REM 
@@ -67,6 +70,20 @@ REM Workaround for play-publisher issue, see https://github.com/Triple-T/gradle-
 IF EXIST "app\build\generated\gpp" rd /s /q "app\build\generated\gpp"
 IF EXIST "app\build\generated\gpp" TASKKILL /F /IM java.exe & sleep 1 & goto :clearPlayPublisherCache
 REM 
+REM Remove "app\src\main\play\listings\[lang]\graphics\icon" folders because of GPlay API Error #500.
+rd /s /q "app\src\main\play\listings\de-DE\graphics\icon"
+rd /s /q "app\src\main\play\listings\en-GB\graphics\icon"
+REM 
+REM Publish text and image resources to GPlay
+echo [INFO] Publishing descriptive resources to GPlay ...
+call gradlew --quiet publishReleaseListing
+SET RESULT=%ERRORLEVEL%
+IF NOT "%RESULT%" == "0" echo [ERROR] "gradlew publishReleaseListing" exited with code #%RESULT%. & goto :eos
+REM 
+REM Revert removed play icon resources.
+git checkout -- "app\src\main\play\listings\de-DE\graphics\icon\*"
+git checkout -- "app\src\main\play\listings\en-GB\graphics\icon\*"
+REM 
 REM Publish APK to GPlay
 echo [INFO] Publishing APK to GPlay ...
 call gradlew --quiet publishRelease
diff --git a/git_update_submodule.cmd b/git_update_submodule.cmd
index d3ae93fa..b819725e 100644
--- a/git_update_submodule.cmd
+++ b/git_update_submodule.cmd
@@ -2,7 +2,7 @@
 cls
 REM
 SET PATH=%PATH%;"%ProgramFiles%\Git\bin"
-SET DESIRED_SUBMODULE_VERSION=v1.0.0
+SET DESIRED_SUBMODULE_VERSION=v1.2.0
 REM 
 cd /d "%~dps0\syncthing\src\github.com\syncthing\syncthing"
 REM