nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 06:11:19 +00:00
Code Releases Activity

Update SyncthingNative to v1.1.0 (#348)

Browse source 
* Use go stable instead of 1.9 for travis (#1283)

* Restore modules

* Update Syncthing submodule to v1.1.0

* Update .gitignore

* Update whatsnew
This commit is contained in:
Catfriend1 2019-03-05 23:23:52 +01:00 committed by GitHub
parent 30d493a206
commit c1abb476b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -38,6 +38,9 @@ syncthing/go.zip
syncthing/android-ndk-r* syncthing/android-ndk-r*
syncthing/ndk.zip syncthing/ndk.zip
# Go modules
syncthing/pkg/mod/
# MinGit # MinGit
syncthing/mingit syncthing/mingit
syncthing/mingit.zip syncthing/mingit.zip

2
.travis.yml
View file

@ -22,7 +22,7 @@ before_install:
# Install Go using gimme tool # Install Go using gimme tool
- curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
- chmod +x ~/bin/gimme - chmod +x ~/bin/gimme
- eval "$(gimme 1.9)" - eval "$(gimme stable)"
# Hack to accept Android licenses # Hack to accept Android licenses
- yes | sdkmanager "platforms;android-27" - yes | sdkmanager "platforms;android-27"

2
app/src/main/play/en-GB/whatsnew
View file

@ -5,5 +5,5 @@ Enhancements
Fixes Fixes
* Minor fixes (#342) (#343) * Minor fixes (#342) (#343)
Notes Notes
* Syncthing v1.0.1 * Syncthing v1.1.0
* Refer to GitHub for detailed change log. * Refer to GitHub for detailed change log.

2
syncthing/build-syncthing.py
View file

@ -345,10 +345,12 @@ for target in BUILD_TARGETS:
environ = os.environ.copy() environ = os.environ.copy()
environ.update({ environ.update({
'GOPATH': module_dir, 'GOPATH': module_dir,
'GO111MODULE': 'on',
'CGO_ENABLED': '1', 'CGO_ENABLED': '1',
}) })
print('Building syncthing version', syncthingVersion); print('Building syncthing version', syncthingVersion);
subprocess.check_call([go_bin, 'mod', 'download'], cwd=syncthing_dir)
subprocess.check_call([ subprocess.check_call([
go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'],
'-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']), '-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']),

2
syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 1e69997ecdbf87ceaad76bd0149d98f560f4fdb5 Subproject commit f0f79a3e3e861b79da2b09f563e9d373255419f0