diff --git a/SyncthingNative_update_and_build.cmd b/SyncthingNative_update_and_build.cmd index 3ee845189..7563acd4b 100644 --- a/SyncthingNative_update_and_build.cmd +++ b/SyncthingNative_update_and_build.cmd @@ -9,7 +9,7 @@ REM Script Consts. SET CLEAN_BEFORE_BUILD=1 SET SKIP_CHECKOUT_SRC=0 SET USE_GO_DEV=0 -SET DESIRED_SUBMODULE_VERSION=v1.14.0 +SET DESIRED_SUBMODULE_VERSION=v1.15.0-rc.4 SET GRADLEW_PARAMS=-q REM REM Runtime Variables. diff --git a/app/src/main/play/release-notes/en-GB/beta.txt b/app/src/main/play/release-notes/en-GB/beta.txt index 6b42c1d23..f816ff695 100644 --- a/app/src/main/play/release-notes/en-GB/beta.txt +++ b/app/src/main/play/release-notes/en-GB/beta.txt @@ -1,5 +1,4 @@ -* Syncthing v1.14.0 -* Support new v1.14.x config format in the wrapper (#750) +* Syncthing v1.15.0-rc.4 Enhanced -- @@ -7,8 +6,7 @@ Enhanced Fixes -- -- Fixed "maxConflicts" setting not preserved by wrapper (#750) -- Fixed Work profile path bug (#733) + Other issues -- diff --git a/app/versions.gradle b/app/versions.gradle index bae2f4d0d..91d1eb1c8 100644 --- a/app/versions.gradle +++ b/app/versions.gradle @@ -1,6 +1,6 @@ ext { versionMajor = 1 - versionMinor = 14 + versionMinor = 15 versionPatch = 0 - versionWrapper = 1 + versionWrapper = 0 } diff --git a/git_diff_master.cmd b/git_diff_main.cmd similarity index 96% rename from git_diff_master.cmd rename to git_diff_main.cmd index 528e50c53..3396e4795 100644 --- a/git_diff_master.cmd +++ b/git_diff_main.cmd @@ -12,7 +12,7 @@ SET GIT_BIN= FOR /F "tokens=*" %%A IN ('where git 2^> NUL:') DO SET GIT_BIN="%%A" IF NOT EXIST %GIT_BIN% echo [ERROR] GIT_BIN not found. & goto :pauseExit REM -call :runGit --no-pager diff master +call :runGit --no-pager diff main REM pause goto :eof diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index e2e5643c3..cd21b8dfa 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit e2e5643c3c96c5dd7d1c6643d8106a54f1183544 +Subproject commit cd21b8dfa55ba6017980f278033d21c1465cadaa