From 62d9360cc5214cefd8d83d71efd98cbf1c2efe02 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 8 Apr 2024 15:44:09 +0800 Subject: [PATCH] misc fixes --- metadata/app.mlauncher.yml | 2 +- metadata/com.tailscale.ipn.yml | 50 ++++---------------- metadata/cx.ring.yml | 3 -- metadata/de.saschahlusiak.freebloks.yml | 4 +- metadata/net.retiolus.cigalo.yml | 10 ++-- metadata/org.purplei2p.i2pd.yml | 4 +- metadata/uk.co.busydoingnothing.anagrams.yml | 3 +- 7 files changed, 21 insertions(+), 55 deletions(-) diff --git a/metadata/app.mlauncher.yml b/metadata/app.mlauncher.yml index 08199c7dfd..b69c0f2cab 100644 --- a/metadata/app.mlauncher.yml +++ b/metadata/app.mlauncher.yml @@ -110,7 +110,7 @@ Builds: - versionName: 1.4.8 versionCode: 148 - commit: fdaf0787fd2819c5a8fb496df5770241dbdb3a76 + commit: 48dc207c589ab984e9f176daf9c7bf2b17427919 subdir: app gradle: - yes diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml index 2f01e35d1f..a4f50e741f 100644 --- a/metadata/com.tailscale.ipn.yml +++ b/metadata/com.tailscale.ipn.yml @@ -1290,45 +1290,10 @@ Builds: - ANDROID_NDK_ROOT=$$NDK$$ make -C .. android/libs/ipn.aar ndk: r23b - - versionName: 1.60.1-t2caffeeb4-g6f7ae79a31c - versionCode: 200 - disable: go downloads go automatically. Next version this is not needed anymore. - commit: de01d49351e037957cf090494843ff152b3ed51f - subdir: android - sudo: - - apt-get update - - apt-get install -y -t bookworm-backports golang-go - - apt-get install -y gcc libc-dev make - gradle: - - fdroid - srclibs: - - tailscale-go@f86d7c8ef64a0f8a2516fc23652eee28abc8d8e0 - prebuild: - - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> gradle.properties - - sdkmanager 'platforms;android-31' 'platform-tools' 'build-tools;33.0.2' - - sed -i -e '/rm -rf/,+2d' -e 's!$(ANDROID_HOME)/cmdline-tools/latest/bin/sdkmanager!sdkmanager!g' - -e 's/list_installed/list/' ../Makefile - build: - - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - - export TOOLCHAINREV=$(cat ../go.toolchain.rev) - - export TOOLCHAINDIR=${HOME}/.cache/tailscale-android-go-$TOOLCHAINREV - - ANDROID_NDK_ROOT=$$NDK$$ make -C .. env - - pushd $$tailscale-go$$ - - git checkout $TOOLCHAINREV - - pushd src - - ./make.bash - - popd - - popd - - mkdir -p $(dirname $TOOLCHAINDIR) - - ln -s $$tailscale-go$$ $TOOLCHAINDIR - - export PATH=$TOOLCHAINDIR/bin:$PATH - - ANDROID_NDK_ROOT=$$NDK$$ make -C .. android/libs/ipn.aar - ndk: r23b - - versionName: 1.61.105-t7429e8912-g12210d3f26b versionCode: 201 commit: a9ff722b024870c4a0e82d8260de539e0d8067c8 - subdir: android + subdir: android_legacy sudo: - apt-get update - apt-get install -y -t bookworm-backports golang-go @@ -1337,11 +1302,13 @@ Builds: - fdroid srclibs: - tailscale-go@f86d7c8ef64a0f8a2516fc23652eee28abc8d8e0 + rm: + - android prebuild: - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> gradle.properties - - sdkmanager 'platforms;android-31' 'platform-tools' 'build-tools;33.0.2' - - sed -i -e '/rm -rf/,+2d' -e 's!$(ANDROID_HOME)/cmdline-tools/latest/bin/sdkmanager!sdkmanager!g' - -e 's/list_installed/list/' ../Makefile + - sed -i -e 's/$(AAR):\ checkandroidsdk/$(AAR):/' ../Makefile + - sdkmanager $(sed -n 's/ANDROID_SDK_PACKAGES=\(.*\)/\1/p' ../Makefile | sed + "s/'//g") build: - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - export TOOLCHAINREV=$(cat ../go.toolchain.rev) @@ -1349,14 +1316,13 @@ Builds: - ANDROID_NDK_ROOT=$$NDK$$ make -C .. env - pushd $$tailscale-go$$ - git checkout $TOOLCHAINREV - - pushd src + - cd src - ./make.bash - popd - - popd - mkdir -p $(dirname $TOOLCHAINDIR) - ln -s $$tailscale-go$$ $TOOLCHAINDIR - export PATH=$TOOLCHAINDIR/bin:$PATH - - ANDROID_NDK_ROOT=$$NDK$$ make -C .. android/libs/ipn.aar + - ANDROID_NDK_ROOT=$$NDK$$ make -C .. android_legacy/libs/ipn.aar ndk: r23b MaintainerNotes: Tracking reported at https://gitlab.com/fdroid/fdroiddata/-/issues/2601 diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index 95a2c0bb63..c7fa1341e3 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -3093,9 +3093,6 @@ Builds: build: - cd ../../daemon/bin/jni - PACKAGEDIR=../../../jami-android/libjamiclient/src/main/java ./make-swig.sh - ndk: 26.1.10909125 - gradleprops: - - android.builder.sdkDownload=true AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/de.saschahlusiak.freebloks.yml b/metadata/de.saschahlusiak.freebloks.yml index d7cadd98ab..69ae5046e9 100644 --- a/metadata/de.saschahlusiak.freebloks.yml +++ b/metadata/de.saschahlusiak.freebloks.yml @@ -313,7 +313,9 @@ Builds: rm: - google-services/ - stuff/ - prebuild: sed -i -e '/firebase/d' -e '/gms/d' {..,.}/build.gradle + prebuild: + - sed -i -e '/firebase/d' -e '/gms/d' {..,.}/build.gradle + - echo -e '\norg.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m' >> ../gradle.properties AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/net.retiolus.cigalo.yml b/metadata/net.retiolus.cigalo.yml index 89b4d664e2..0998d764ff 100644 --- a/metadata/net.retiolus.cigalo.yml +++ b/metadata/net.retiolus.cigalo.yml @@ -46,9 +46,9 @@ Builds: gradle: - yes - - versionName: 0.2.1 - versionCode: 11 - commit: 6d4a88d64d342fa95631d5d1b1846512cbe80eaf + - versionName: 0.1.4 + versionCode: 12 + commit: ace36a6556e10b28f801324bb25515fbef89c6c8 subdir: app gradle: - yes @@ -57,5 +57,5 @@ AllowedAPKSigningKeys: 47778e80ac39f0bc1ca249885899f003294564bd92de7f2912c6298f9 AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 0.2.1 -CurrentVersionCode: 11 +CurrentVersion: 0.1.4 +CurrentVersionCode: 12 diff --git a/metadata/org.purplei2p.i2pd.yml b/metadata/org.purplei2p.i2pd.yml index 9bb8efe78e..a0aae919e4 100644 --- a/metadata/org.purplei2p.i2pd.yml +++ b/metadata/org.purplei2p.i2pd.yml @@ -415,7 +415,9 @@ Builds: rm: - app/jni/openssl/fuzz - app/jni/openssl/boringssl/fuzz - prebuild: sed -i -e 's/enable true/enable false/' build.gradle + prebuild: + - sed -i -e 's/enable true/enable false/' build.gradle + - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties build: - pushd jni - ./build_boost.sh diff --git a/metadata/uk.co.busydoingnothing.anagrams.yml b/metadata/uk.co.busydoingnothing.anagrams.yml index e0ee94a04e..584a0453b0 100644 --- a/metadata/uk.co.busydoingnothing.anagrams.yml +++ b/metadata/uk.co.busydoingnothing.anagrams.yml @@ -38,8 +38,7 @@ Builds: sudo: - apt-get update - apt-get install -y python3-pip automake make gettext autopoint ninja-build - pkg-config python3-mako - - apt-get install -y -t bullseye-backports meson + pkg-config python3-mako meson gradle: - yes prebuild: ../get-dependencies.sh