Update SyncthingNative to v1.1.0 (#348)

* Use go stable instead of 1.9 for travis (#1283) * Restore modules * Update Syncthing submodule to v1.1.0 * Update .gitignore * Update whatsnew
Catfriend1 · Mar 5, 2019 · c1abb47 · c1abb47
1 parent 30d493a
commit c1abb47
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -345,10 +345,12 @@ def install_ndk():
     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