From bda04d050ca276ab301572fdf592ce787f40e185 Mon Sep 17 00:00:00 2001 From: Catfriend1 <16361913+Catfriend1@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:32:19 +0200 Subject: [PATCH] Fix F-Droid build recipe after migration to Kotlin gradle (fixes #1135) (#1156) --- ...com.github.catfriend1.syncthingandroid.yml | 243 +++++++++++++++++- 1 file changed, 240 insertions(+), 3 deletions(-) diff --git a/fdroiddata/com.github.catfriend1.syncthingandroid.yml b/fdroiddata/com.github.catfriend1.syncthingandroid.yml index 931a545fd..e11ac0518 100644 --- a/fdroiddata/com.github.catfriend1.syncthingandroid.yml +++ b/fdroiddata/com.github.catfriend1.syncthingandroid.yml @@ -4,7 +4,7 @@ License: MPL-2.0 WebSite: https://github.com/Catfriend1/syncthing-android/wiki SourceCode: https://github.com/Catfriend1/syncthing-android-fdroid IssueTracker: https://github.com/Catfriend1/syncthing-android/issues -Translation: https://www.transifex.com/catfriend1/syncthing-android-1 +Translation: https://hosted.weblate.org/projects/syncthing/android/catfriend1 Changelog: https://github.com/Catfriend1/syncthing-android/releases Liberapay: cf4friends @@ -2020,11 +2020,248 @@ Builds: - export PATH=$$go$$/bin:$PATH - gradle :syncthing:buildNative + - versionName: 1.27.0.1 + versionCode: 1270001 + commit: 629115a4b534c810cfab0dc734dc2d6a50237ea3 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a + - apt-get install -y -t bullseye-backports golang-go + gradle: + - yes + srclibs: + - go@go1.21.4 + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - export goversion=$(grep "GO_VERSION = " ../syncthing/build-syncthing.py|cut + -d "'" -f 2) + - pushd $$go$$ + - git checkout -f go$goversion + - cd src + - ./make.bash + - popd + - export PATH=$$go$$/bin:$PATH + - gradle :syncthing:buildNative + + - versionName: 1.27.2.1 + versionCode: 1270201 + commit: 1440f85f96ac466c0efd7f1742dcb3ed824039ae + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a + - apt-get install -y -t bullseye-backports golang-go + gradle: + - yes + srclibs: + - go@go1.21.4 + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - export goversion=$(grep "GO_VERSION = " ../syncthing/build-syncthing.py|cut + -d "'" -f 2) + - pushd $$go$$ + - git checkout -f go$goversion + - cd src + - ./make.bash + - popd + - export PATH=$$go$$/bin:$PATH + - gradle :syncthing:buildNative + + - versionName: 1.27.3.0 + versionCode: 1270300 + commit: c2e6b62623412a2eeefa3986c16cdd985c0940d3 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a + - apt-get install -y -t bullseye-backports golang-go + gradle: + - yes + srclibs: + - go@go1.21.4 + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - export goversion=$(grep "GO_VERSION = " ../syncthing/build-syncthing.py|cut + -d "'" -f 2) + - pushd $$go$$ + - git checkout -f go$goversion + - cd src + - ./make.bash + - popd + - export PATH=$$go$$/bin:$PATH + - gradle :syncthing:buildNative + + - versionName: 1.27.4.1 + versionCode: 1270401 + commit: ece5ffc403852df66b9fc29179f0573528fccb60 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y -t bookworm-backports golang-go + gradle: + - yes + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - gradle :syncthing:buildNative + + - versionName: 1.27.6.0 + versionCode: 1270600 + commit: b94bc064d4c6be32f582a40d77b76ea9e7da8278 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y -t bookworm-backports golang-go + gradle: + - yes + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - gradle :syncthing:buildNative + + - versionName: 1.27.7.0 + versionCode: 1270700 + commit: 5b4caaf15d9ac3fe2ae40bb3e21aeb784b237697 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y -t bookworm-backports golang-go + gradle: + - yes + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - gradle :syncthing:buildNative + + - versionName: 1.27.9.0 + versionCode: 1270900 + commit: f0e15f9c74be9518beb86d7e1a1d470b8791a132 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y -t bookworm-backports golang-go + gradle: + - yes + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/d' build.gradle + - sed -i -e '/executable/s/python/python3/' {../syncthing,.}/build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared = " ../build.gradle | cut -d "'" + -f 2) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - gradle :syncthing:buildNative + + - versionName: 1.28.0.0 + versionCode: 1280000 + commit: 72c3b7ead2b5427e9b57e9f093b9d461566b1653 + subdir: app + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint bzip2 g++ libc-dev make gettext + libtool pkg-config rename shtool + - apt-get install -y -t bookworm-backports golang-go + gradle: + - yes + rm: + - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata + prebuild: + - sed -i -e '/signingConfig/,+2d' build.gradle.kts + - sed -i -e 's/java.net.URI/uri/' ../settings.gradle.kts + - sed -i -e '/executable/s/python/python3/' build.gradle.kts + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties + build: + - export ndkversion=$(grep "ndkVersionShared" ../build.gradle.kts | cut -d '"' + -f 4) + - sdkmanager "ndk;$ndkversion" + - export ANDROID_NDK_HOME=$$SDK$$/ndk/$ndkversion + - gradle :syncthing:buildNative + MaintainerNotes: |- The submodule in syncthing/src/github.com/syncthing/syncthing must be pristine, as the version/release information is taken from git. AutoUpdateMode: Version UpdateCheckMode: Tags ^v[a-z0-9.]*$ -CurrentVersion: 1.26.1.0 -CurrentVersionCode: 1260100 +CurrentVersion: 1.28.0.0 +CurrentVersionCode: 1280000