misc fixes

2026-05-19 20:29:15 +00:00 · 2021-12-04 16:05:12 +00:00 · 2021-12-04 16:05:12 +00:00 · 52bf374ab3
commit 52bf374ab3
parent 0676cf2f6b
20 changed files with 81 additions and 184 deletions
--- a/metadata/btools.routingapp.yml
+++ b/metadata/btools.routingapp.yml
@ -152,11 +152,24 @@ Builds:
      - sed -i -e '79,81d' pom.xml
      - sed -i -e '44,70d' pom.xml

+  - versionName: 1.6.2
+    versionCode: 42
+    commit: 12116b846787dd9fb030257fe6de90b39c0e6f71
+    subdir: brouter-routing-app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - api19
+    scanignore:
+      - brouter-routing-app/src/main/assets/*.zip
+
 MaintainerNotes: |-
    We need to upgrade the android maven plugin for the build to work: https://github.com/abrensch/brouter/issues/178
    The other sed's remove signing stuff.

 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
-CurrentVersion: Unknown
+CurrentVersion: 1.6.2
 CurrentVersionCode: 42
--- a/metadata/ca.snoe.deedum.yml
+++ b/metadata/ca.snoe.deedum.yml
@ -38,7 +38,7 @@ Builds:
    commit: f803fbdf1cbeea30ca281db94cf82b1ab09ac256
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
-      - flutter@1.22.5
+      - flutter@2.5.3
    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
    build:
      - $$flutter$$/bin/flutter config --no-analytics
--- a/metadata/com.coinerella.peercoin.yml
+++ b/metadata/com.coinerella.peercoin.yml
@ -123,10 +123,9 @@ Builds:
      - $$flutter$$/bin/flutter packages pub run build_runner build --delete-conflicting-outputs
      - $$flutter$$/bin/flutter build apk

-  - versionName: 0.7.0
-    versionCode: 63
-    disable: https://github.com/peercoin/peercoin_flutter/issues/107
-    commit: b022c96ecbafe1c71c11e1d5b87a0c1db5f6bb00
+  - versionName: 0.7.3
+    versionCode: 68
+    commit: 8aa571c933139851b61a2735e9f414b547bf2d34
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
      - flutter@2.5.1
@ -134,6 +133,8 @@ Builds:
      - ios/build
      - test_driver
    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
+    scanignore:
+      - android/build.gradle
    build:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter pub get
@ -142,62 +143,7 @@ Builds:
      - $$flutter$$/bin/flutter packages pub run build_runner build --delete-conflicting-outputs
      - $$flutter$$/bin/flutter build apk

-  - versionName: 0.7.0
-    versionCode: 65
-    disable: https://github.com/peercoin/peercoin_flutter/issues/107
-    commit: bbbb6b6770479dd5272e50340824a92ca46cc041
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.5.1
-    rm:
-      - ios/build
-      - test_driver
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main -f fdroid_flutter_launcher_icons.yaml
-      - $$flutter$$/bin/flutter pub run flutter_native_splash:create
-      - $$flutter$$/bin/flutter packages pub run build_runner build --delete-conflicting-outputs
-      - $$flutter$$/bin/flutter build apk
-
-  - versionName: 0.7.1
-    versionCode: 66
-    disable: https://github.com/peercoin/peercoin_flutter/issues/107
-    commit: 86fd096e0aaae5d4bcad1a69c231028dffcdaba7
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.5.1
-    rm:
-      - ios/build
-      - test_driver
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main -f fdroid_flutter_launcher_icons.yaml
-      - $$flutter$$/bin/flutter pub run flutter_native_splash:create
-      - $$flutter$$/bin/flutter packages pub run build_runner build --delete-conflicting-outputs
-      - $$flutter$$/bin/flutter build apk
-
-  - versionName: 0.7.2
-    versionCode: 67
-    disable: https://github.com/peercoin/peercoin_flutter/issues/107
-    commit: da5219151ade08e8155e82a7c33380658d93a4fa
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.5.1
-    rm:
-      - ios/build
-      - test_driver
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main -f fdroid_flutter_launcher_icons.yaml
-      - $$flutter$$/bin/flutter pub run flutter_native_splash:create
-      - $$flutter$$/bin/flutter packages pub run build_runner build --delete-conflicting-outputs
-      - $$flutter$$/bin/flutter build apk
+MaintainerNotes: Ignore local maven repo for flutter_background_fetch.

  - versionName: 0.7.3
    versionCode: 69
--- a/metadata/com.darshancomputing.BatteryIndicatorPro.yml
+++ b/metadata/com.darshancomputing.BatteryIndicatorPro.yml
@ -82,6 +82,19 @@ Builds:
      - sed -i -e '/secureProperties/d' build.gradle
      - echo -e "android.useAndroidX=true\nandroid.enableJetifier=true" > gradle.properties

+  - versionName: 12.0.0
+    versionCode: 26016
+    commit: 3f4efb4102c582b9e21c7bd8ae096f27d03d1635
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/secureProperties/d' build.gradle
+      - echo -e "android.useAndroidX=true\nandroid.enableJetifier=true" > gradle.properties
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 12.0.0
--- a/metadata/com.ero.kinoko.yml
+++ b/metadata/com.ero.kinoko.yml
@ -163,51 +163,6 @@ Builds:
      - $$flutter$$/bin/flutter build apk
    ndk: r21e

-  - versionName: 4.0.0
-    versionCode: 66
-    commit: 279a23be48383a1e635e5701fe5cbf65b4331dff
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.2.3
-    rm:
-      - ios
-      - plugins/glib/ios
-      - plugins/glib/example/ios
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-    ndk: r21e
-
-  - versionName: 4.0.1
-    versionCode: 67
-    commit: 9ec078c87a776bb6fcd6e56d6ca34394f67f68d6
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.2.3
-    rm:
-      - ios
-      - plugins/glib/ios
-      - plugins/glib/example/ios
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-    ndk: r21e
-
-  - versionName: 4.0.2
-    versionCode: 68
-    commit: 56d779a3e9930d0da7b07746b2b47f6d8b79883d
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.2.3
-    rm:
-      - ios
-      - plugins/glib/ios
-      - plugins/glib/example/ios
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-    ndk: r21e
-
  - versionName: 4.0.4
    versionCode: 70
    commit: a96c727f4a3e10e26fbc78368117df59a8c7c28e
@ -221,7 +176,7 @@ Builds:
    build:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk
-    ndk: r21e
+    ndk: r23

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
--- a/metadata/com.ghostsq.commander.yml
+++ b/metadata/com.ghostsq.commander.yml
@ -569,6 +569,18 @@ Builds:
    scanignore:
      - src/main/java/com/ghostsq/commander/adapters/CA.java

+  - versionName: 1.60.6b3
+    versionCode: 426
+    commit: '78'
+    gradle:
+      - free
+    prebuild:
+      - sed -i -e '/task clean/,/^}/d' build.gradle.root
+      - cat build.gradle >> build.gradle.root
+      - mv build.gradle.root build.gradle
+    scanignore:
+      - src/main/java/com/ghostsq/commander/adapters/CA.java
+
 MaintainerNotes: |-
    No commit messages in source repo! No tags. Apks on website can be used to
    confirm a release is real. Commit where AndroidManifest is changed usually
--- a/metadata/com.nltechno.dolidroidpro.yml
+++ b/metadata/com.nltechno.dolidroidpro.yml
@ -67,6 +67,17 @@ Builds:
    gradle:
      - yes

+  - versionName: DoliDroid Pro 2.2
+    versionCode: 43
+    commit: 9ee8ba0ab2c557099e849919913f84c9e82962bb
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: DoliDroid Pro 2.2
--- a/metadata/com.osfans.trime.yml
+++ b/metadata/com.osfans.trime.yml
@ -138,7 +138,7 @@ Builds:
        'cmake;3.18.1' > /dev/null
    scandelete:
      - app/src/main/jni
-    ndk: r23
+    ndk: r23b

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/com.perflyst.twire.yml
+++ b/metadata/com.perflyst.twire.yml
@ -158,6 +158,10 @@ Builds:
    versionCode: 524
    commit: f17e954b227b3f66c8f4747bb4e7fa9d5b68267a
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/com.termoneplus.yml
+++ b/metadata/com.termoneplus.yml
@ -181,7 +181,7 @@ Builds:
      - update-alternatives --auto java
    gradle:
      - yes
-    ndk: r17c
+    ndk: r21e

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
--- a/metadata/com.tuntori.mightieramp.yml
+++ b/metadata/com.tuntori.mightieramp.yml
@ -26,6 +26,7 @@ Builds:
    build:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk --release
+    ndk: r21

 AutoUpdateMode: Version
 UpdateCheckMode: Tags
--- a/metadata/com.wire.yml
+++ b/metadata/com.wire.yml
@ -17,6 +17,7 @@ Repo: https://github.com/wireapp/wire-android.git
 Builds:
  - versionName: 3.77.7-fdroid
    versionCode: 1889384
+    disable: https://github.com/wireapp/wire-android/issues/3621
    commit: 3.77.7
    subdir: app
    gradle:
--- a/metadata/de.chaosdorf.meteroid.yml
+++ b/metadata/de.chaosdorf.meteroid.yml
@ -131,6 +131,10 @@ Builds:
    versionCode: 42
    commit: ef6a3f900f64fa42c0a3ab01b9a8de8b029c8c4d
    subdir: meteroid
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes

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

  - versionName: 2.14.1.0
    versionCode: 2140101
+    disable: DOES NOT VERIFY
    commit: v2.14.1.0
    subdir: Corona-Warn-App
    submodules: true
--- a/metadata/de.kromke.andreas.musictagger.yml
+++ b/metadata/de.kromke.andreas.musictagger.yml
@ -121,6 +121,10 @@ Builds:
    versionCode: 24
    commit: 8bc499c793ab3ce9562fbc821e393cdc61d31fb8
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/eu.pretix.pretixscan.droid.yml
+++ b/metadata/eu.pretix.pretixscan.droid.yml
@ -206,6 +206,7 @@ Builds:

  - versionName: 1.12.2
    versionCode: 60
+    disable: Could not determine java version from '11.0.6'.
    commit: 63a8cafb8412ff486f3130eb1b3d12c25cb2acce
    subdir: pretixscan/app
    submodules: true
--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@ -527,6 +527,8 @@ Builds:
      - 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 ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml
+    scanignore:
+      - stopcovid/src/main/assets/CertList-Plus/*.pb.gz

 MaintainerNotes: |-
    * Tracking – uses custom Analytics
--- a/metadata/ie.defo.ech_apps.yml
+++ b/metadata/ie.defo.ech_apps.yml
@ -25,6 +25,7 @@ Builds:
    scanignore:
      - app/src/androidTest/assets
      - app/src/test/resources
+    ndk: r20

 AutoUpdateMode: None
 UpdateCheckMode: None
--- a/metadata/se.leap.bitmaskclient.yml
+++ b/metadata/se.leap.bitmaskclient.yml
@ -351,45 +351,9 @@ Builds:
      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
    ndk: r20b

-  - versionName: 1.1.0
-    versionCode: 158
-    commit: 7dd9277d6410c2aa1b00283294ba87ab3c143a38
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
-    gradle:
-      - normalProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
-    scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
-      - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
-
  - versionName: 1.1.1
    versionCode: 159
+    disable: invalid submodule
    commit: 5aaa3bb1c83d486e300eb98876eab26ad4325b82
    subdir: app
    submodules: true
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@ -185,45 +185,9 @@ Builds:
      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
    ndk: r20b

-  - versionName: 1.1.0
-    versionCode: 158
-    commit: 7dd9277d6410c2aa1b00283294ba87ab3c143a38
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
-    gradle:
-      - customProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
-    scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
-      - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
-
  - versionName: 1.1.1
    versionCode: 159
+    disable: invalid submodule
    commit: 5aaa3bb1c83d486e300eb98876eab26ad4325b82
    subdir: app
    submodules: true