misc fixes

2026-05-18 11:49:12 +00:00 · 2021-08-07 00:00:32 +08:00 · 2021-08-07 00:00:32 +08:00 · 3bdc8716f0
commit 3bdc8716f0
parent deb77b8c64
23 changed files with 75 additions and 89 deletions
--- a/metadata/app.reading.stoic.stoicreading.yml
+++ b/metadata/app.reading.stoic.stoicreading.yml
@ -286,6 +286,10 @@ Builds:
    versionCode: 70
    commit: 8cebc2f69358568ec362a9226740647fe06eaae3
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/com.adonai.manman.yml
+++ b/metadata/com.adonai.manman.yml
@ -196,6 +196,10 @@ Builds:
    versionCode: 177
    commit: 9c45a8bccc0da290141f734ef11d4f495e903c5e
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - fdroid
    prebuild: sed -i -e 's/= URI.create//' ../build.gradle
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@ -790,7 +790,7 @@ Builds:

  - versionName: '5.802'
    versionCode: 28002
-    commit: 5.8-MAINT
+    commit: '5.802'
    gradle:
      - yes
    output: app/k9mail/build/outputs/apk/release/k9mail-release-unsigned.apk
@ -800,6 +800,6 @@ MaintainerNotes: |-
    It doesn't work when using subdir because we are two levels deep into the directory structure.

 AutoUpdateMode: Version %v
-UpdateCheckMode: RepoManifest/5.8-MAINT
+UpdateCheckMode: Tags
 CurrentVersion: '5.802'
 CurrentVersionCode: 28002
--- a/metadata/com.greenaddress.greenbits_android_wallet.yml
+++ b/metadata/com.greenaddress.greenbits_android_wallet.yml
@ -2032,7 +2032,8 @@ Builds:
    timeout: 25200
    sudo:
      - apt-get update || apt-get update
-      - apt-get install -y build-essential clang virtualenv
+      - apt-get install -y build-essential clang virtualenv openjdk-11-jdk
+      - update-alternatives --auto java
      - pushd build/srclib/cpython
      - ./configure
      - make -j`nproc`
@ -2045,8 +2046,6 @@ Builds:
      - cpython@v3.9.6
    prebuild: sed -i -e 's/-p python3/-p python3.9/' crypto/prepare_gdk_clang.sh
    scanignore:
-      - bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts
-      - bitcoinj/core/src/test
      - app/src/main/assets/production/checkpoints
    scandelete:
      - app/src/main/assets/btctestnet/checkpoints
--- a/metadata/com.roguetemple.hyperroid.yml
+++ b/metadata/com.roguetemple.hyperroid.yml
@ -220,23 +220,6 @@ Builds:
      - popd
    ndk: r17c

-  - versionName: 12.0e
-    versionCode: 12050
-    commit: b67b946126c16770419d86f42a953e8e902583ba
-    subdir: hyperroid/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++
-    gradle:
-      - yes
-    prebuild: sed -i -e "s/abiFilters .*/abiFilters 'x86', 'x86_64', 'armeabi-v7a',
-        'arm64-v8a'/" build.gradle
-    build:
-      - pushd ..
-      - bash copy.sh
-      - popd
-    ndk: r17c
-
  - versionName: 12.0f
    versionCode: 12060
    commit: dda9f29403693108f596229e6d335d079b44d226
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@ -435,6 +435,7 @@ Builds:

  - versionName: 1.13.42-tfd7b738e5-ga68462ec65f
    versionCode: 59
+    disable: https://github.com/tailscale/tailscale/issues/2603
    commit: 76df74266251de04d96a09e14268a48de2116ec6
    subdir: android
    sudo:
@ -445,13 +446,9 @@ Builds:
    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
        > /dev/null
    build:
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
-      - echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz
      - export ANDROID_SDK_ROOT=$$SDK$$
      - export ANDROID_NDK_ROOT=$$NDK$$
-      - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar
+      - make -C .. release_aar
    ndk: r21e

 AutoUpdateMode: Version v%v
--- a/metadata/com.vishnuraghav.EnRecipes.yml
+++ b/metadata/com.vishnuraghav.EnRecipes.yml
@ -31,8 +31,8 @@ Builds:
      - npm -g install nativescript
      - sed -i 's|./gradlew|gradle|' /usr/local/lib/node_modules/nativescript/lib/services/android/gradle-command-service.js
    init:
-      - $$SDK$$/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" >
-        /dev/null
+      - $$SDK$$/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "emulator"
+        > /dev/null
      - npm install --unsafe-perm
    output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
    srclibs:
--- a/metadata/crypto.o0o0o0o0o.games.blackjack.yml
+++ b/metadata/crypto.o0o0o0o0o.games.blackjack.yml
@ -28,6 +28,10 @@ Builds:
    commit: bb9d81f79c2a3f230dc147cd47abed485ab777c2
    subdir: app
    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/de.beowulf.wetter.yml
+++ b/metadata/de.beowulf.wetter.yml
@ -140,6 +140,10 @@ Builds:
    versionCode: 41
    commit: 1d6b936d5e07eca3bdfa16b26c61462a6b5f5bbf
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/de.corona.tracing.yml
+++ b/metadata/de.corona.tracing.yml
@ -271,6 +271,7 @@ Builds:

  - versionName: 2.6.1.0
    versionCode: 2060101
+    disable: DOES NOT VERIFY
    commit: v2.6.1.0
    subdir: Corona-Warn-App
    submodules: true
--- a/metadata/de.micmun.android.nextcloudcookbook.yml
+++ b/metadata/de.micmun.android.nextcloudcookbook.yml
@ -84,10 +84,14 @@ Builds:
    gradle:
      - yes

-  - versionName: 2.4.0
-    versionCode: 240
-    commit: 94a0e41aa85dc5c47c33ed5aaea41df90b61d4ea
+  - versionName: 2.4.1
+    versionCode: 241
+    commit: 5bf9888401d484c45c87ff4bce7c2bbb9ed15186
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/de.moekadu.metronome.yml
+++ b/metadata/de.moekadu.metronome.yml
@ -156,6 +156,10 @@ Builds:
    versionCode: 37
    commit: 1bb6f3aef39480cddd3adc8e76fc53edae6a53ad
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@ -339,31 +339,22 @@ Builds:
    prebuild: sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
        ../coreui/src/main/res/values/styles.xml

-  - versionName: 3.6.0
-    versionCode: 324
-    commit: 020ef07a0574b4dfe2c46ca19929ab5f4e6218d3
-    subdir: stopcovid
-    submodules: true
-    gradle:
-      - yes
-    rm:
-      - coreui/src/main/res/font/marianne_*.otf
-      - coreui/src/main/res/font/marianne.xml
-    prebuild: sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
-        ../coreui/src/main/res/values/styles.xml
-
  - versionName: 3.6.1
    versionCode: 326
    commit: a06005953733de48d051e30bb296a1f1bc0388c8
    subdir: stopcovid
    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes
    rm:
      - coreui/src/main/res/font/marianne_*.otf
      - coreui/src/main/res/font/marianne.xml
    prebuild: sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
-        ../coreui/src/main/res/values/styles.xml
+        ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml

 MaintainerNotes: |-
    * Tracking – uses custom Analytics
--- a/metadata/hashengineering.darkcoin.wallet.yml
+++ b/metadata/hashengineering.darkcoin.wallet.yml
@ -110,6 +110,7 @@ Builds:

  - versionName: 7.3.1
    versionCode: 70310
+    disable: unknown maven repo
    commit: 7cc63ecd4a490e4b90a38b961b07a5a4b3e51907
    subdir: wallet
    submodules: true
@ -117,7 +118,8 @@ Builds:
      - apt-get update || apt-get update
      - apt-get install -y ninja-build
    gradle:
-      - prod
+      - foss
+    prebuild: sed -i -e '/firebase/d' -e '/gms/d' build.gradle
    scandelete:
      - wallet/test/de/schildbach/wallet/util/backup-protobuf-testnet
      - wallet/test/de/schildbach/wallet/util/bitcoin-backup-protobuf-testnet
--- a/metadata/host.stjin.anonaddy.yml
+++ b/metadata/host.stjin.anonaddy.yml
@ -72,6 +72,10 @@ Builds:
    versionCode: 23
    commit: 279f70083c2f7e9999a38ebabc5a859578b9c2cc
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/me.murks.feedwatcher.yml
+++ b/metadata/me.murks.feedwatcher.yml
@ -128,17 +128,14 @@ Builds:
    gradle:
      - yes

-  - versionName: 0.0.17-alpha
-    versionCode: 17
-    commit: 928066a9fa273f0094fc2dfb52760115b05ccba5
-    subdir: app
-    gradle:
-      - yes
-
  - versionName: 0.0.18-alpha
    versionCode: 18
    commit: 6c73ba6da96ab01e70fbac9042bea52335879c44
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/net.eneiluj.moneybuster.yml
+++ b/metadata/net.eneiluj.moneybuster.yml
@ -216,19 +216,15 @@ Builds:
    gradle:
      - normal

-  - versionName: 0.1.9
-    versionCode: 29
-    commit: fccedaa918052abffa53b84f488b0424715e3842
-    subdir: app
-    submodules: true
-    gradle:
-      - normal
-
  - versionName: 0.1.10
    versionCode: 30
    commit: 4211c096b0f08ed9c39da548e6af4eb07ef3f28f
    subdir: app
    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - normal

--- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
+++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
@ -281,6 +281,8 @@ Builds:
    sudo:
      - apt-get update || apt-get update
      - apt-get install -y libsqlite3-dev
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes
    prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null
--- a/metadata/org.jellyfin.mobile.yml
+++ b/metadata/org.jellyfin.mobile.yml
@ -49,6 +49,10 @@ Builds:
    versionCode: 2030099
    commit: v2.3.0
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - libre
    output: build/outputs/apk/libre/release/jellyfin-android-*-libre-release-unsigned.apk
--- a/metadata/rs.ltt.android.yml
+++ b/metadata/rs.ltt.android.yml
@ -46,6 +46,10 @@ Builds:
    versionCode: 6
    commit: 513925ab0cdfa75dd0f58a3c4308e348ade78784
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    init:
      - cd ../..
      - mv rs.ltt.android rs.ltt.android_underlying
--- a/metadata/ru.playsoftware.j2meloader.yml
+++ b/metadata/ru.playsoftware.j2meloader.yml
@ -366,27 +366,15 @@ Builds:
      - app/src/main/java/javax/microedition/shell/AppClassLoader.java
    ndk: r21e

-  - versionName: 1.7.1
-    versionCode: 90
-    commit: fc794417db717d77b13642156fd15af09fc3ec35
-    subdir: app
-    gradle:
-      - fdroid
-    prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
-    scanignore:
-      - app/src/main/java/javax/microedition/shell/AppClassLoader.java
-    ndk: r21e
-
  - versionName: 1.7.2
    versionCode: 91
    commit: e2d805447741a3c4f3479abc1153a123ad81a03e
    subdir: app
    gradle:
      - fdroid
-    prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
    scanignore:
      - app/src/main/java/javax/microedition/shell/AppClassLoader.java
-    ndk: r21e
+    ndk: r22b

 MaintainerNotes: 'The class loader is needed for the main function of the app: load
    JARs.'
--- a/metadata/threads.server.yml
+++ b/metadata/threads.server.yml
@ -235,17 +235,14 @@ Builds:
    gradle:
      - yes

-  - versionName: 2.5.0
-    versionCode: 250
-    commit: e6f0f4eb7d9f3c86ab64226eab1e62d212b3ebab
-    subdir: app
-    gradle:
-      - yes
-
  - versionName: 2.5.1
    versionCode: 251
    commit: 525ea12ca245e3a3a5c79a3704db7b4427779961
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/threads.thor.yml
+++ b/metadata/threads.thor.yml
@ -52,17 +52,14 @@ Builds:
    gradle:
      - yes

-  - versionName: 0.7.5
-    versionCode: 75
-    commit: a17090666cea5be3b642252b88c6234a80fca0e0
-    subdir: app
-    gradle:
-      - yes
-
  - versionName: 0.7.8
    versionCode: 78
    commit: 813b62eece27c764c7b163f6dd316632e5dce58c
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
    gradle:
      - yes