diff --git a/docker/Dockerfile b/docker/Dockerfile index b9cd1e46..d1bf5d65 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM openjdk:8 -ENV GO_VERSION 1.9.7 -ENV ANDROID_SDK_VERSION 3859397 +ENV GO_VERSION 1.11.4 +ENV ANDROID_SDK_VERSION 4333796 WORKDIR /opt diff --git a/fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml b/fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml index 5431e3fb..0d0ea8cb 100644 --- a/fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml +++ b/fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml @@ -10,7 +10,7 @@ LiberapayID: '1534877' AutoName: Syncthing-Fork Summary: File synchronization Description: |- - This is a fork of Syncthing that brings major + This is a fork of [[com.nutomic.syncthingandroid]] that brings major enhancements like: * Individual sync conditions can be applied per device and per folder * Recent changes UI, click to open files. @@ -432,7 +432,115 @@ Builds: - PATH="$PWD/go/bin:$PATH" gradle buildNative ndk: r15c + - versionName: 0.14.54.4 + versionCode: 4183 + commit: v0.14.54.4 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz + - echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + + - versionName: 0.14.54.7 + versionCode: 145407 + commit: v0.14.54.7 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz + - echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + + - versionName: 0.14.54.9 + versionCode: 145409 + commit: v0.14.54.9 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz + - echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + + - versionName: 1.0.0.1 + versionCode: 1000001 + commit: v1.0.0.1 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz + - echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + + - versionName: 1.0.0.2 + versionCode: 1000002 + commit: v1.0.0.2 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz + - echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + + - versionName: 1.0.0.5 + versionCode: 1000005 + commit: v1.0.0.5 + submodules: true + gradle: + - yes + output: app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: sed -i -e '/signingConfig/d' app/build.gradle + build: + - wget -O go.tgz https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz + - echo 'fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b go.tgz' + | shasum -c - + - tar xf go.tgz + - PATH="$PWD/go/bin:$PATH" gradle buildNative + ndk: r15c + AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v[a-z0-9.]*$ -CurrentVersion: 0.14.54.3 -CurrentVersionCode: 4182 +CurrentVersion: 1.0.0.5 +CurrentVersionCode: 1000005 diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py index a390ed94..97082be8 100644 --- a/syncthing/build-syncthing.py +++ b/syncthing/build-syncthing.py @@ -12,6 +12,10 @@ import platform SUPPORTED_PYTHON_PLATFORMS = ['Windows', 'Linux', 'Darwin'] +GO_VERSION = '1.11.4' +GO_EXPECTED_SHASUM_LINUX = 'fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b' +GO_EXPECTED_SHASUM_WINDOWS = 'eeb20e21702f2b9469d9381df5de85e2f731b64a1f54effe196d0f7d0227fe14' + BUILD_TARGETS = [ { 'arch': 'arm', @@ -140,12 +144,12 @@ def install_go(): # Consts. pwd_path = os.path.dirname(os.path.realpath(__file__)) if sys.platform == 'win32': - url = 'https://dl.google.com/go/go1.9.7.windows-amd64.zip' - expected_shasum = '8db4b21916a3bc79f48d0611202ee5814c82f671b36d5d2efcb446879456cd28' + url = 'https://dl.google.com/go/go' + GO_VERSION + '.windows-amd64.zip' + expected_shasum = GO_EXPECTED_SHASUM_WINDOWS tar_gz_fullfn = pwd_path + os.path.sep + 'go.zip'; else: - url = 'https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz' - expected_shasum = '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee' + url = 'https://dl.google.com/go/go' + GO_VERSION + '.linux-amd64.tar.gz' + expected_shasum = GO_EXPECTED_SHASUM_LINUX tar_gz_fullfn = pwd_path + os.path.sep + 'go.tgz'; # Download prebuilt-go. @@ -342,12 +346,12 @@ for target in BUILD_TARGETS: environ.update({ 'GOPATH': module_dir, 'CGO_ENABLED': '1', - 'CC': os.path.join(standalone_ndk_dir, 'bin', target['cc']) }) print('Building syncthing version', syncthingVersion); subprocess.check_call([ go_bin, 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], + '-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']), '-version', syncthingVersion ] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir)