From bb15ee444e01c60ee4133aae59ee1b4b8fb8acc2 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 12 Oct 2021 22:57:59 +0800 Subject: [PATCH] misc fixes --- .../com.blogspot.e_kanivets.moneytracker.yml | 4 +++ ...com.github.catfriend1.syncthingandroid.yml | 1 + metadata/com.machiav3lli.backup.yml | 4 +++ metadata/com.tachibana.downloader.yml | 4 +++ metadata/com.tasomaniac.openwith.floss.yml | 16 +++++---- metadata/com.tutpro.baresip.yml | 1 + metadata/com.waist.line.yml | 36 +++---------------- metadata/org.bombusmod.yml | 2 ++ 8 files changed, 31 insertions(+), 37 deletions(-) diff --git a/metadata/com.blogspot.e_kanivets.moneytracker.yml b/metadata/com.blogspot.e_kanivets.moneytracker.yml index 47b0a38610..5a99c214e7 100644 --- a/metadata/com.blogspot.e_kanivets.moneytracker.yml +++ b/metadata/com.blogspot.e_kanivets.moneytracker.yml @@ -42,6 +42,10 @@ Builds: versionCode: 36 commit: c692374fc3065f89eaa7ae957b15c6c7e2e8c956 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - free prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' build.gradle diff --git a/metadata/com.github.catfriend1.syncthingandroid.yml b/metadata/com.github.catfriend1.syncthingandroid.yml index 9dd4799a2a..fb04ef46c4 100644 --- a/metadata/com.github.catfriend1.syncthingandroid.yml +++ b/metadata/com.github.catfriend1.syncthingandroid.yml @@ -1643,6 +1643,7 @@ Builds: - versionName: 1.18.3.0 versionCode: 1180300 + disable: out of memory commit: f714d00cb159edb93fba8aa9b926db891597ae75 submodules: true sudo: diff --git a/metadata/com.machiav3lli.backup.yml b/metadata/com.machiav3lli.backup.yml index 5ec2566984..2dd4abc76e 100644 --- a/metadata/com.machiav3lli.backup.yml +++ b/metadata/com.machiav3lli.backup.yml @@ -126,6 +126,10 @@ Builds: versionCode: 7000 commit: 8d54cc56b9474eb425bcca93875fee2308cdd24e subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.tachibana.downloader.yml b/metadata/com.tachibana.downloader.yml index bc460fb71c..bb01bdc0ef 100644 --- a/metadata/com.tachibana.downloader.yml +++ b/metadata/com.tachibana.downloader.yml @@ -85,6 +85,10 @@ Builds: versionCode: 12 commit: dc7f3b6f289c6f0714c3d6e03e918475948c0fdf subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.tasomaniac.openwith.floss.yml b/metadata/com.tasomaniac.openwith.floss.yml index 7ba3cae4c6..ab33e33bcb 100644 --- a/metadata/com.tasomaniac.openwith.floss.yml +++ b/metadata/com.tasomaniac.openwith.floss.yml @@ -100,12 +100,16 @@ Builds: prebuild: sed -i -e '/playImplementation/,+2d' -e '/fabric/d' -e '/SimpleDateFormatConstant/d' build.gradle ../build.gradle -MaintainerNotes: |- - Summary and Description have been removed since upstream provides - much better ones via Triple-T Gradle Play Publisher: - https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots + - versionName: 2.9-floss + versionCode: 20901 + commit: '2.9' + subdir: app + gradle: + - floss + prebuild: sed -i -e '/if (isPlay) {/,/}/d' -e '/signingConfigs.release/d' build.gradle + ../build.gradle AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 2.5-floss -CurrentVersionCode: 20503 +CurrentVersion: 2.9-floss +CurrentVersionCode: 20901 diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index dbcb65efb7..7cc23cf7bb 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1939,6 +1939,7 @@ Builds: - versionName: 34.0.0 versionCode: 178 + disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9872 commit: c071e076670e5145b58d384938c017625fa734e2 subdir: app sudo: diff --git a/metadata/com.waist.line.yml b/metadata/com.waist.line.yml index 8c7bdc4a48..9935c595cb 100644 --- a/metadata/com.waist.line.yml +++ b/metadata/com.waist.line.yml @@ -357,35 +357,9 @@ Builds: platforms/android/app/libs/barcodescanner-release-2.1.5.aar - cordova build android --release -- --packageType=apk - - versionName: 3.1.9 - versionCode: 30109 - commit: f24c811b4ca4025f1d3494916fed047c0649c0e4 - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.4/node-v14.17.4-linux-x64.tar.xz - - echo "db18c54ebe01974d46198b08729249acbb0dcdc9aea82b53eec913f8c56035c6 node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - npm install -g cordova - output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk - srclibs: - - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c - prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - > /dev/null - build: - - npm install - - cordova platform add android - - pushd $$BarcodeScanner$$ - - rm local.properties - - gradle clean assembleRelease - - popd - - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar - platforms/android/app/libs/barcodescanner-release-2.1.5.aar - - cordova build android --release -- --packageType=apk - - - versionName: 3.1.10 - versionCode: 30110 - commit: 4be7c2c794b05c34333c5516c10d88d2ea1f3807 + - versionName: 3.1.11 + versionCode: 30111 + commit: cfb8beec11a113c19f9e5ffa2202ac87f5d79fda sudo: - sysctl fs.inotify.max_user_watches=524288 - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.4/node-v14.17.4-linux-x64.tar.xz @@ -412,5 +386,5 @@ Builds: AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: config.xml|android:versionCode="(\d*)"|.|version="([\d.]*)" -CurrentVersion: 3.1.10 -CurrentVersionCode: 30110 +CurrentVersion: 3.1.11 +CurrentVersionCode: 30111 diff --git a/metadata/org.bombusmod.yml b/metadata/org.bombusmod.yml index e95197a708..eb958c4f65 100644 --- a/metadata/org.bombusmod.yml +++ b/metadata/org.bombusmod.yml @@ -67,6 +67,8 @@ Builds: - desktop - docs - ios + prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager + 'platforms;android-31' 'build-tools;30.0.2' > /dev/null scanignore: - android/src/main/assets/smiles/animate.bin