diff --git a/.gitignore b/.gitignore index 83c73548..3456f0ed 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,9 @@ syncthing/go.zip syncthing/android-ndk-r* syncthing/ndk.zip +# Go modules +syncthing/pkg/mod/ + # MinGit syncthing/mingit syncthing/mingit.zip diff --git a/.travis.yml b/.travis.yml index c46b3358..87acdde8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: # Install Go using gimme tool - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme - chmod +x ~/bin/gimme - - eval "$(gimme 1.9)" + - eval "$(gimme stable)" # Hack to accept Android licenses - yes | sdkmanager "platforms;android-27" diff --git a/app/src/main/play/en-GB/whatsnew b/app/src/main/play/en-GB/whatsnew index 2b54208b..d2ed02fa 100644 --- a/app/src/main/play/en-GB/whatsnew +++ b/app/src/main/play/en-GB/whatsnew @@ -5,5 +5,5 @@ Enhancements Fixes * Minor fixes (#342) (#343) Notes -* Syncthing v1.0.1 +* Syncthing v1.1.0 * Refer to GitHub for detailed change log. diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py index 97082be8..f61497c5 100644 --- a/syncthing/build-syncthing.py +++ b/syncthing/build-syncthing.py @@ -345,10 +345,12 @@ for target in BUILD_TARGETS: environ = os.environ.copy() environ.update({ 'GOPATH': module_dir, + 'GO111MODULE': 'on', 'CGO_ENABLED': '1', }) print('Building syncthing version', syncthingVersion); + subprocess.check_call([go_bin, 'mod', 'download'], cwd=syncthing_dir) subprocess.check_call([ go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], '-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']), diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index 1e69997e..f0f79a3e 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 1e69997ecdbf87ceaad76bd0149d98f560f4fdb5 +Subproject commit f0f79a3e3e861b79da2b09f563e9d373255419f0