misc fixes

2026-05-18 19:59:12 +00:00 · 2022-03-10 00:34:53 +08:00 · 2022-03-10 00:34:53 +08:00 · 8d1d55b191
commit 8d1d55b191
parent e4b5d2e54a
14 changed files with 33 additions and 86 deletions
--- a/metadata/at.techbee.jtx.yml
+++ b/metadata/at.techbee.jtx.yml
@ -68,6 +68,7 @@ Builds:

  - versionName: 1.00.06-rc02.ose
    versionCode: 100060002
+    disable: No matching configuration of project :ical4android was found.
    commit: 063dec8c7597488fba8b92a4a1d3ab596e8207e0
    subdir: app
    sudo:
--- a/metadata/com.iskrembilen.quasseldroid.yml
+++ b/metadata/com.iskrembilen.quasseldroid.yml
@ -467,25 +467,6 @@ Builds:
    gradle:
      - yes

-  - versionName: 1.6.0
-    versionCode: 1316
-    commit: 1.6.0
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 1.6.1
-    versionCode: 1321
-    commit: 1.6.1
-    subdir: app
-    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 '/signingConfigs {/,/^  }/d' -e '/signingConfigs/d' ../gradle/convention/src/main/kotlin/justjanne.android.signing.gradle.kts
-
  - versionName: 1.6.2
    versionCode: 1322
    commit: 1.6.2
--- a/metadata/com.mdiqentw.lifedots.yml
+++ b/metadata/com.mdiqentw.lifedots.yml
@ -16,6 +16,7 @@ Repo: https://github.com/XilinJia/Life-Dots
 Builds:
  - versionName: 2.1.0
    versionCode: 151
+    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/10648
    commit: 2.1.0
    subdir: app
    sudo:
--- a/metadata/com.physphil.android.unitconverterultimate.yml
+++ b/metadata/com.physphil.android.unitconverterultimate.yml
@ -186,6 +186,10 @@ Builds:
    versionCode: 50702
    commit: 542cd0dd1aa470fb5eeea9785eb144ba5c131ca5
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - base
    prebuild:
--- a/metadata/com.sleeptimer.yml
+++ b/metadata/com.sleeptimer.yml
@ -58,6 +58,10 @@ Builds:
    versionCode: 7
    commit: c9b6f4f3bedbc008806f4578f90f12c09aac14f6
    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.smartpack.busyboxinstaller.yml
+++ b/metadata/com.smartpack.busyboxinstaller.yml
@ -150,8 +150,8 @@ Builds:
    gradle:
      - fdroid
    srclibs:
-      - ndk-box-kitchen@49136e11272f7a8e61b74d516c1516f779ada60c
-      - Busybox@1_35_0
+      - ndk-box-kitchen@1c9e772a788fbee41f5f84390d7a878ba81ffa1c
+      - Busybox@1_34_1
      - SELinux@3.3
      - pcre@android-mainline-12.0.0_r20
    scandelete:
@ -170,7 +170,7 @@ Builds:
      - mv $$ndk-box-kitchen$$/jni/libs/armeabi-v7a/busybox src/main/assets/armv7l
      - mv $$ndk-box-kitchen$$/jni/libs/arm64-v8a/busybox src/main/assets/aarch64
      - mv $$ndk-box-kitchen$$/jni/libs/x86/busybox src/main/assets/i686
-    ndk: r23
+    ndk: r21e

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@ -2727,23 +2727,6 @@ Builds:
    scandelete:
      - site/sitemap.xml.gz

-  - versionName: 3.19.14-patch1
-    versionCode: 685
-    commit: fef27973416816eee9286068261a82c689aa5b18
-    subdir: android
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - desktop
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.3' > /dev/null
-    scandelete:
-      - site/sitemap.xml.gz
-
  - versionName: 3.19.15
    versionCode: 686
    commit: eaf5e453baddb767704656a0dbff7cc4ca8300f0
--- a/metadata/de.nulide.findmydevice.yml
+++ b/metadata/de.nulide.findmydevice.yml
@ -116,7 +116,7 @@ Builds:
    commit: 4ccfd1bef46e3b44c015b6cfd88d64faaff428b9
    subdir: app
    sudo:
-      - apt-get update
+      - apt-get update || apt-get update
      - apt-get install -y openjdk-11-jdk-headless
      - update-alternatives --auto java
    gradle:
--- a/metadata/de.thefeiter.liedgutverzeichnis.yml
+++ b/metadata/de.thefeiter.liedgutverzeichnis.yml
@ -255,9 +255,9 @@ Builds:
    gradle:
      - yes

-  - versionName: 2.23.0
-    versionCode: 44
-    commit: 36637f317c9dbf562100acbf7f3f47d384ba9d92
+  - versionName: 2.23.1
+    versionCode: 45
+    commit: 2a2557dda6101c606310268522c550139962c8ea
    subdir: app
    sudo:
      - apt-get update || apt-get update
@ -268,5 +268,5 @@ Builds:

 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 2.23.0
-CurrentVersionCode: 44
+CurrentVersion: 2.23.1
+CurrentVersionCode: 45
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@ -840,7 +840,10 @@ Builds:
    rm:
      - proprietary
      - app/gradle
-    prebuild: sed -i -e "/:proprietary/d" ../settings.gradle build.gradle
+    prebuild:
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+        > /dev/null
+      - sed -i -e "/:proprietary/d" ../settings.gradle build.gradle
    ndk: r21

 AutoUpdateMode: Version %v
--- a/metadata/eu.pretix.pretixscan.droid.yml
+++ b/metadata/eu.pretix.pretixscan.droid.yml
@ -169,10 +169,9 @@ Builds:
      - gradle publishToMavenLocal
      - popd

-  - versionName: 1.13.3
-    versionCode: 64
-    disable: Could not determine java version from '11.0.6'.
-    commit: 0957482cee7b17d224da04805d4853cb24e9aaae
+  - versionName: 1.13.4
+    versionCode: 65
+    commit: d3fd47b5576d54fbec48703aa72afb06b0347610
    subdir: pretixscan/app
    submodules: true
    sudo:
@ -204,40 +203,6 @@ Builds:
      - gradle publishToMavenLocal
      - popd

-  - versionName: 1.13.4
-    versionCode: 65
-    commit: d3fd47b5576d54fbec48703aa72afb06b0347610
-    subdir: pretixscan/app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - pretix
-    srclibs:
-      - saki4510t-libcommon@2.12.4
-      - covpass-android@v-1.165.6
-    prebuild:
-      - sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|'
-        -e 's|maven.pkg.github.com/ehn-dcc-development/*|jitpack.io|' -i -e '/repositories
-        {/a mavenLocal()' ../build.gradle
-      - sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2')
-        {exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2')
-        {exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^    }/d'
-        -i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle
-    scandelete:
-      - pretixscan/libpretixui-repo
-    build:
-      - pushd $$saki4510t-libcommon$$/common
-      - gradle uploadArchives
-      - popd
-      - mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar
-        ../libpretixui-repo/common/common.aar
-      - pushd $$covpass-android$$
-      - gradle publishToMavenLocal
-      - popd
-
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 1.13.4
--- a/metadata/nl.viter.glider.yml
+++ b/metadata/nl.viter.glider.yml
@ -240,7 +240,7 @@ Builds:
    commit: 71fb17e01bc28be2809af1580f7c76e87aaad527
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
-      - flutter@2.7.0-3.1.pre
+      - flutter@2.11.0-0.1.pre
    rm:
      - .github
      - .vscode
--- a/metadata/org.courville.nova.yml
+++ b/metadata/org.courville.nova.yml
@ -363,6 +363,7 @@ Builds:

  - versionName: 6.0.49
    versionCode: 600049
+    disable: https://github.com/nova-video-player/aos-AVP/issues/597
    commit: 0da23c9656e640e5774e357d88fa15546928c24d
    subdir: Video
    submodules: true
@ -382,7 +383,7 @@ Builds:
      - MediaLib/libs/*jar
      - native/opus-android-builder/lib
    prebuild: rm -f FileCoreLibrary/libs/*jar
-    ndk: r21d
+    ndk: r23b
    gradleprops:
      - universal

--- a/metadata/org.sufficientlysecure.ical.yml
+++ b/metadata/org.sufficientlysecure.ical.yml
@ -79,6 +79,10 @@ Builds:
    versionCode: 58
    commit: cbba029bf5254f3f2090ddbece40ea9850c841db
    subdir: CalendarImportExport
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes