Skip to content

Commit

Permalink
Update SyncthingNative to v1.15.0-rc.4 (#754)
Browse files Browse the repository at this point in the history
* Update SyncthingNative to v1.15.0-rc.3

* APK version 1.15.0.0

* Update SyncthingNative_update_and_build.cmd

* Update beta.txt

* Update git_diff_master.cmd

* Update git_diff_main.cmd

* rc4

* Update syncthing

Co-authored-by: Catfriend1 <[email protected]>
  • Loading branch information
Catfriend1 and Catfriend1 authored Mar 17, 2021
1 parent 8817bf6 commit fbad53b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion SyncthingNative_update_and_build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/play/release-notes/en-GB/beta.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
* Syncthing v1.14.0
* Support new v1.14.x config format in the wrapper (#750)
* Syncthing v1.15.0-rc.4

Enhanced
--


Fixes
--
- Fixed "maxConflicts" setting not preserved by wrapper (#750)
- Fixed Work profile path bug (#733)


Other issues
--
Expand Down
4 changes: 2 additions & 2 deletions app/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
versionMajor = 1
versionMinor = 14
versionMinor = 15
versionPatch = 0
versionWrapper = 1
versionWrapper = 0
}
2 changes: 1 addition & 1 deletion git_diff_master.cmd → git_diff_main.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Submodule syncthing updated 298 files

0 comments on commit fbad53b

Please sign in to comment.