misc fixes

2026-05-19 04:09:14 +00:00 · 2022-06-11 16:55:50 +08:00 · 2022-06-11 16:55:50 +08:00 · 92651e636b
commit 92651e636b
parent d119c5c0d6
12 changed files with 39 additions and 52 deletions
--- a/metadata/com.jefftharris.passwdsafe.yml
+++ b/metadata/com.jefftharris.passwdsafe.yml
@ -12,9 +12,11 @@ Donate: https://www.paypal.com/cgi-bin/webscr?item_name=Donation+to+PasswdSafe&c
 AutoName: PasswdSafe
 Summary: Port of PasswordSafe password manager
 Description: |-
-    PasswdSafe is a port of the Password Safe (<a href="https://pwsafe.org/">https://pwsafe.org/</a>) application to Android. YubiKey NEO tokens are supported for two-factor authentication. File passwords can be saved on devices with a fingerprint scanner and Android 6.0 or higher.
+    PasswdSafe is a port of the Password Safe (<a href="https://pwsafe.org/">https://pwsafe.org/</a>)
+    application to Android. YubiKey NEO tokens are supported for two-factor authentication.
+    File passwords can be saved on devices with a fingerprint scanner and Android 6.0 or higher.

-    ***Please maintain a known-good backup in case bugs exist***
+    <b>Please maintain a known-good backup in case bugs exist</b>

 RepoType: hg
 Repo: http://hg.code.sf.net/p/passwdsafe/code
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@ -3,10 +3,10 @@ Categories:
  - Internet
 License: GPL-3.0-or-later
 WebSite: https://jami.net/
-SourceCode: https://git.jami.net/savoirfairelinux/ring-client-android
-IssueTracker: https://git.jami.net/savoirfairelinux/ring-client-android/issues
+SourceCode: https://git.jami.net/savoirfairelinux/jami-client-android
+IssueTracker: https://git.jami.net/savoirfairelinux/jami-client-android/issues
 Translation: https://www.transifex.com/savoirfairelinux/jami
-Changelog: https://git.jami.net/savoirfairelinux/ring-client-android/tree/master/ring-android/fastlane/metadata/android/en-US/changelogs
+Changelog: https://git.jami.net/savoirfairelinux/jami-client-android/tree/master/ring-android/fastlane/metadata/android/en-US/changelogs

 AutoName: Ring
 Description: |-
@ -35,7 +35,7 @@ Description: |-
    You can also install Jami on Windows, macOS, iOS and GNU/Linux.

 RepoType: git
-Repo: https://review.jami.net/ring-project
+Repo: https://review.jami.net/jami-project

 Builds:
  - versionName: 2.0.003
@ -1736,7 +1736,7 @@ Builds:
      - patches
      - scripts
    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-31' 'build-tools;31.0.0' > /dev/null
+        'platforms;android-31' 'build-tools;32.0.0' > /dev/null
    build:
      - cd ../..
      - export ANDROID_NDK_ROOT="$ANDROID_NDK"
@ -1871,13 +1871,13 @@ Builds:
      - patches
      - scripts
    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-31' 'build-tools;31.0.0' > /dev/null
+        'platforms;android-32' 'build-tools;31.0.0' > /dev/null
    build:
      - cd ../..
      - export ANDROID_NDK_ROOT="$ANDROID_NDK"
      - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64"
      - ./compile.sh --release --daemon
-    ndk: r23
+    ndk: r23c

 MaintainerNotes: |-
    Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.
@ -1888,6 +1888,6 @@ MaintainerNotes: |-

 AutoUpdateMode: Version android/release_%c
 UpdateCheckMode: HTTP
-UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-project/-/tags?format=atom|<title>android/release_(\d+)|https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle.kts|versionName\s=\s"([\d-]+)"
+UpdateCheckData: https://git.jami.net/savoirfairelinux/jami-project/-/tags?format=atom|<title>android/release_(\d+)|https://git.jami.net/savoirfairelinux/jami-client-android/-/raw/master/ring-android/app/build.gradle.kts|versionName\s=\s"([\d-]+)"
 CurrentVersion: 20220607-01
 CurrentVersionCode: 334
--- a/metadata/de.beowulf.wetter.yml
+++ b/metadata/de.beowulf.wetter.yml
@ -259,11 +259,12 @@ Builds:

  - versionName: '3.18'
    versionCode: 55
+    disable: https://codeberg.org/BeoCode/Weather/issues/31
    commit: 32b621d8c7c5982e298287379d39ef0e68d3d9bb
    subdir: app
    sudo:
      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
      - update-alternatives --auto java
    gradle:
      - yes
--- a/metadata/de.westnordost.streetcomplete.yml
+++ b/metadata/de.westnordost.streetcomplete.yml
@ -1049,20 +1049,6 @@ Builds:
    prebuild: sed -i -e '/keystorePropertiesFile.*{/,/}/d; /keystorePropertiesFile/d'
        build.gradle.kts

-  - versionName: '44.0'
-    versionCode: 4401
-    commit: eabff9bb21b61fd6c4a4a6c768f4ce36b606f693
-    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 's|= java.net.URI(".*")|"https://jitpack.io"|' ../build.gradle.kts
-      - sed -i -e '/keystorePropertiesFile.*{/,/}/d; /keystorePropertiesFile/d' build.gradle.kts
-
  - versionName: '44.1'
    versionCode: 4402
    commit: db27e4a60aed83f7e54530aa96c45c827863d4fe
@ -1074,7 +1060,7 @@ Builds:
    gradle:
      - yes
    prebuild:
-      - sed -i -e 's|= java.net.URI(".*")|"https://jitpack.io"|' ../build.gradle.kts
+      - sed -i -e 's/java.net.URI/uri/' ../build.gradle.kts
      - sed -i -e '/keystorePropertiesFile.*{/,/}/d; /keystorePropertiesFile/d' build.gradle.kts

 AutoUpdateMode: Version v%v
--- a/metadata/design.codeux.authpass.fdroid.yml
+++ b/metadata/design.codeux.authpass.fdroid.yml
@ -551,6 +551,10 @@ Builds:
    commit: 41d9cb23c955c38a4e000ae4919ec4c1a3af1681
    subdir: authpass
    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
    rm:
      - authpass/ios
--- a/metadata/fr.free.nrw.commons.yml
+++ b/metadata/fr.free.nrw.commons.yml
@ -1,3 +1,4 @@
+Disabled: GMS in the final apk
 Categories:
  - Internet
 License: Apache-2.0
@ -379,20 +380,13 @@ Builds:
      - prod
    ndk: r21

-  - versionName: 4.0.0
-    versionCode: 1026
-    commit: e27f5d445866a9894b42021f58f7f9525b160209
-    subdir: app
-    gradle:
-      - prod
-    ndk: r21
-
  - versionName: 4.0.1
    versionCode: 1027
    commit: 66f8f97d0c07b0ab2339bab2455c50afaf640a84
    subdir: app
    gradle:
      - prod
+    prebuild: sed -i -e '/proxy/d' ../gradle.properties
    ndk: r21

 AutoUpdateMode: Version v%v
--- a/metadata/net.vonforst.evmap.yml
+++ b/metadata/net.vonforst.evmap.yml
@ -447,24 +447,6 @@ Builds:
      - CHARGEPRICE_API_KEY_ENCRYPTED=JVwoGQcbTgIbFUlHIE5leEAEVRZzCC1LAh5JAB4UT0Y=
      - OPENCHARGEMAP_API_KEY_ENCRYPTED=dw4uF1YdTFIHQEpHdgZjcxJRSRFyW3sDBhwaBU9CTUp3Tm99

-  - versionName: 1.3.0
-    versionCode: 74
-    commit: 54332e8f77887c78e1e1d29fcf6a1dd8cd21004d
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - foss
-    prebuild: sed -i -e '/places-maps-sdk-3.1.0-beta/d' build.gradle
-    gradleprops:
-      - GOINGELECTRIC_API_KEY=7ef9a064ec4602a853c9201ac35be94b
-      - GOOGLE_MAPS_API_KEY=
-      - MAPBOX_API_KEY_ENCRYPTED=NgZlSx1mHC9AH0IoHHEjEnkkDT8FJyNnDkNEPxgEGxMAYTouSwlUPgFVPE8wZlgFbSYaPAMSPhITEh0pBSdyAAVYVyNDRn0IIltkDRksPjArAhh6MFs=
-      - CHARGEPRICE_API_KEY_ENCRYPTED=JVwoGQcbTgIbFUlHIE5leEAEVRZzCC1LAh5JAB4UT0Y=
-      - OPENCHARGEMAP_API_KEY_ENCRYPTED=dw4uF1YdTFIHQEpHdgZjcxJRSRFyW3sDBhwaBU9CTUp3Tm99
-
  - versionName: 1.3.1
    versionCode: 78
    commit: 518cf11dc8963fccdd2a9cc3e5837a4450fdb8e5
@ -475,6 +457,7 @@ Builds:
      - update-alternatives --auto java
    gradle:
      - foss
+      - normal
    prebuild: sed -i -e '/places-maps-sdk-3.1.0-beta/d' build.gradle
    gradleprops:
      - GOINGELECTRIC_API_KEY=7ef9a064ec4602a853c9201ac35be94b
--- a/metadata/nl.mpcjanssen.simpletask.nextcloud.yml
+++ b/metadata/nl.mpcjanssen.simpletask.nextcloud.yml
@ -42,6 +42,10 @@ Builds:
    versionCode: 11000000
    commit: 0874e8b182193b2593bdedd2ef6a4499c9c5920f
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - nextcloud

--- a/metadata/nl.mpcjanssen.simpletask.webdav.yml
+++ b/metadata/nl.mpcjanssen.simpletask.webdav.yml
@ -74,6 +74,10 @@ Builds:
    versionCode: 11000000
    commit: 0874e8b182193b2593bdedd2ef6a4499c9c5920f
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - webdav
    prebuild: echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m' >> ../gradle.properties
--- a/metadata/nl.mpcjanssen.simpletask.yml
+++ b/metadata/nl.mpcjanssen.simpletask.yml
@ -1096,6 +1096,10 @@ Builds:
    versionCode: 11000000
    commit: 0874e8b182193b2593bdedd2ef6a4499c9c5920f
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - cloudless

--- a/metadata/org.owntracks.android.yml
+++ b/metadata/org.owntracks.android.yml
@ -46,6 +46,7 @@ Builds:
      - update-alternatives --auto java
    gradle:
      - oss
+    prebuild: sed -i -e 's/storage.*"/jitpack.io"/' ../build.gradle.kts

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
--- a/metadata/org.woheller69.audio_analyzer_for_android.yml
+++ b/metadata/org.woheller69.audio_analyzer_for_android.yml
@ -22,6 +22,10 @@ Builds:
    versionCode: 180
    commit: ace3d428f9aa3c7d4e310b8202c50a066a16aff3
    subdir: audioSpectrumAnalyzer
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes