Merge branch 'miscfixes32' into 'master'

Misc fixes after cycle See merge request fdroid/fdroiddata!7017
2026-05-18 03:39:10 +00:00 · 2020-06-24 15:39:00 +00:00 · 2020-06-24 15:39:00 +00:00 · 5bbf58bc3c
commit 5bbf58bc3c
parent aded98d8a0 dbe441efa8
30 changed files with 34 additions and 84 deletions
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@ -406,6 +406,9 @@ Builds:
        -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
      - mkdir src/main/jniLibs/
      - sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
+    scanignore:
+      - Builder/fonts/fonts.zip
+      - app/src/fdroid/assets/fonts.zip
    build:
      - pushd ../Builder/
      - ./link_to_mupdf_1.16.1.sh
--- a/metadata/com.ichi2.anki.yml
+++ b/metadata/com.ichi2.anki.yml
@ -550,6 +550,7 @@ Builds:
    rm:
      - tools
      - docs
+    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
    ndk: r21d

 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
--- a/metadata/com.termux.yml
+++ b/metadata/com.termux.yml
@ -585,6 +585,7 @@ Builds:
    subdir: app
    gradle:
      - yes
+    prebuild: sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
    ndk: r21d

 AutoUpdateMode: Version v%v
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@ -366,15 +366,6 @@ Builds:
    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
    ndk: r13b

-  - versionName: 1.0.56
-    versionCode: 10056
-    commit: 1.0.56
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk: r13b
-
  - versionName: 1.0.57
    versionCode: 10057
    commit: 1.0.57
--- a/metadata/design.codeux.authpass.fdroid.yml
+++ b/metadata/design.codeux.authpass.fdroid.yml
@ -177,7 +177,7 @@ Builds:
      - authpass/macos
      - deps/kdbx.dart/libargon2*
    build:
-      - echo 'systemProp.design.codeux.ndkVersion=21.2.6472646' >> android/gradle.properties
+      - echo 'systemProp.design.codeux.ndkVersion=21.3.6528147' >> android/gradle.properties
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release
    ndk: r21d
--- a/metadata/dev.msfjarvis.aps.yml
+++ b/metadata/dev.msfjarvis.aps.yml
@ -30,6 +30,10 @@ Builds:
    subdir: app
    gradle:
      - yes
+    prebuild:
+      - mkdir -p $HOME/.gradle
+      - echo "org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        -Dfile.encoding=UTF-8" >> $HOME/.gradle/gradle.properties
    scanignore:
      - app/src/main/assets/publicsuffixes

--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@ -365,7 +365,7 @@ Builds:
      - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
      - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
        build.gradle
-      - sed -i -e '/firebaseCrashlytics/,+2d' -e '/^android\.applicationVariants\.all
+      - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all
        {/,/^}$/d' build.gradle

 AutoUpdateMode: Version %v
--- a/metadata/net.kollnig.missioncontrol.fdroid.yml
+++ b/metadata/net.kollnig.missioncontrol.fdroid.yml
@ -52,7 +52,7 @@ Builds:
    subdir: app
    gradle:
      - fdroid
-    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' build.gradle
+    prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle
    ndk: r21d

 AutoUpdateMode: Version %c
--- a/metadata/org.projectmaxs.main.yml
+++ b/metadata/org.projectmaxs.main.yml
@ -285,6 +285,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.alarmset.yml
+++ b/metadata/org.projectmaxs.module.alarmset.yml
@ -246,19 +246,6 @@ Builds:
      - module-shell/libraryProjects/root-commands/ExampleApp
    prebuild: make prebuild

-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-alarmset
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-alarmset/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
  - versionName: 0.5.9
    versionCode: 2000503279
    commit: 0.5.9
@ -273,6 +260,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.bluetooth.yml
+++ b/metadata/org.projectmaxs.module.bluetooth.yml
@ -365,19 +365,6 @@ Builds:
      - module-shell/libraryProjects/root-commands/ExampleApp
    prebuild: make prebuild

-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-bluetooth
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-bluetooth/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
  - versionName: 0.5.9
    versionCode: 2000503279
    commit: 0.5.9
@ -392,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.bluetoothadmin.yml
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.yml
@ -365,19 +365,6 @@ Builds:
      - module-shell/libraryProjects/root-commands/ExampleApp
    prebuild: make prebuild

-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-bluetoothadmin
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-bluetoothadmin/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
  - versionName: 0.5.9
    versionCode: 2000503279
    commit: 0.5.9
@ -392,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.clipboard.yml
+++ b/metadata/org.projectmaxs.module.clipboard.yml
@ -379,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.contactsread.yml
+++ b/metadata/org.projectmaxs.module.contactsread.yml
@ -389,6 +389,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.fileread.yml
+++ b/metadata/org.projectmaxs.module.fileread.yml
@ -379,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.filewrite.yml
+++ b/metadata/org.projectmaxs.module.filewrite.yml
@ -391,6 +391,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.locationfine.yml
+++ b/metadata/org.projectmaxs.module.locationfine.yml
@ -261,6 +261,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.misc.yml
+++ b/metadata/org.projectmaxs.module.misc.yml
@ -261,6 +261,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.nfc.yml
+++ b/metadata/org.projectmaxs.module.nfc.yml
@ -215,6 +215,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.notification.yml
+++ b/metadata/org.projectmaxs.module.notification.yml
@ -250,6 +250,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.phonestateread.yml
+++ b/metadata/org.projectmaxs.module.phonestateread.yml
@ -378,6 +378,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.ringermode.yml
+++ b/metadata/org.projectmaxs.module.ringermode.yml
@ -379,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.shell.yml
+++ b/metadata/org.projectmaxs.module.shell.yml
@ -278,6 +278,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.smsnotify.yml
+++ b/metadata/org.projectmaxs.module.smsnotify.yml
@ -379,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.smsread.yml
+++ b/metadata/org.projectmaxs.module.smsread.yml
@ -379,6 +379,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.smssend.yml
+++ b/metadata/org.projectmaxs.module.smssend.yml
@ -391,6 +391,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.smswrite.yml
+++ b/metadata/org.projectmaxs.module.smswrite.yml
@ -393,6 +393,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.wifiaccess.yml
+++ b/metadata/org.projectmaxs.module.wifiaccess.yml
@ -273,6 +273,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.module.wifichange.yml
+++ b/metadata/org.projectmaxs.module.wifichange.yml
@ -261,6 +261,6 @@ Builds:
    prebuild: make prebuild

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
--- a/metadata/org.projectmaxs.transport.xmpp.yml
+++ b/metadata/org.projectmaxs.transport.xmpp.yml
@ -302,17 +302,6 @@ Builds:
    rm:
      - module-shell/libraryProjects/root-commands/ExampleApp

-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: transport-xmpp
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-
  - versionName: 0.5.9
    versionCode: 2000503279
    commit: 0.5.9
@ -325,6 +314,6 @@ Builds:
      - module-shell/libraryProjects/root-commands/ExampleApp

 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279