misc fixes

2024-09-29 17:09:26 +08:00 · 2024-09-29 17:09:26 +08:00 · 31cbfcfdb3
commit 31cbfcfdb3
parent 800f3936e5
11 changed files with 49 additions and 137 deletions
--- a/metadata/br.com.colman.petals.yml
+++ b/metadata/br.com.colman.petals.yml
@ -527,15 +527,7 @@ Builds:
      - fdroid
    prebuild: sed -i -e '/sonatype/d' build.gradle.kts

-  - versionName: 3.30.0-SNAPSHOT
-    versionCode: 329001
-    commit: 6d3343770932dcf20fc08f4a4d454991bd038ee6
-    subdir: app
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/sonatype/d' build.gradle.kts
-
 AutoUpdateMode: Version
-UpdateCheckMode: Tags
-CurrentVersion: 3.30.0-SNAPSHOT
-CurrentVersionCode: 329001
+UpdateCheckMode: Tags ^v[\d.]+$
+CurrentVersion: 3.29.0
+CurrentVersionCode: 329000
--- a/metadata/com.ghostsq.commander.yml
+++ b/metadata/com.ghostsq.commander.yml
@ -739,6 +739,18 @@ Builds:
    scanignore:
      - src/main/java/com/ghostsq/commander/adapters/CA.java

+  - versionName: 1.63.1b6.2
+    versionCode: 463
+    commit: r118
+    gradle:
+      - fdroid
+    prebuild:
+      - cat build.gradle >> build.gradle.root
+      - mv build.gradle.root build.gradle
+      - sed -i -e '/task clean/,/^}/d' -e 's/lint/lintOptions/' 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.paultirk.yatoo.yml
+++ b/metadata/com.paultirk.yatoo.yml
@ -162,6 +162,7 @@ Builds:
      - cd ../..
      - npm ci
      - find node_modules/ -iname "*.node" -exec rm {} \;
+      - sed -i -e '/gms/d' android/build.gradle
    scanignore:
      - node_modules/@capacitor/cli/assets/capacitor-cordova-android-plugins.tar.gz
    scandelete:
--- a/metadata/com.ridgebotics.ridgescout.yml
+++ b/metadata/com.ridgebotics.ridgescout.yml
@ -16,13 +16,6 @@ Repo: https://github.com/team4388/scoutingapp2025.git
 Binaries: https://github.com/Team4388/ScoutingApp2025/releases/download/v%v/app-release.apk

 Builds:
-  - versionName: '0.3'
-    versionCode: 3
-    commit: v0.3
-    subdir: app
-    gradle:
-      - yes
-
  - versionName: '0.4'
    versionCode: 4
    commit: d957a1db5e91301040ccedeb0613487cc8a4abe1
--- a/metadata/com.streetwriters.notesnook.yml
+++ b/metadata/com.streetwriters.notesnook.yml
@ -8891,7 +8891,7 @@ Builds:
    scandelete:
      - .nx/cache
      - apps/mobile/node_modules
-      - node_modules/clipboardy/fallbacks
+      - node_modules
      - packages
      - servers/themes/node_modules
    build:
@ -8963,7 +8963,7 @@ Builds:
    scandelete:
      - .nx/cache
      - apps/mobile/node_modules
-      - node_modules/clipboardy/fallbacks
+      - node_modules
      - packages
      - servers/themes/node_modules
    build:
@ -9035,7 +9035,7 @@ Builds:
    scandelete:
      - .nx/cache
      - apps/mobile/node_modules
-      - node_modules/clipboardy/fallbacks
+      - node_modules
      - packages
      - servers/themes/node_modules
    build:
@ -9107,7 +9107,7 @@ Builds:
    scandelete:
      - .nx/cache
      - apps/mobile/node_modules
-      - node_modules/clipboardy/fallbacks
+      - node_modules
      - packages
      - servers/themes/node_modules
    build:
--- a/metadata/com.vitorpamplona.amethyst.yml
+++ b/metadata/com.vitorpamplona.amethyst.yml
@ -984,11 +984,27 @@ Builds:

  - versionName: 0.92.1
    versionCode: 406
+    disable: https://github.com/vitorpamplona/amethyst/issues/1113
    commit: 6d4ba6d5076945fc070a50aefca3e99e8e428587
    subdir: amethyst
+    sudo:
+      - apt-get update
+      - apt-get install -y automake autogen libtool gettext-base autopoint make g++
+        pkg-config
    gradle:
      - fdroid
-    prebuild: sed -i -e '/enable true/d' build.gradle
+    srclibs:
+      - tor-android@0de17c1863c3e0c0a49fdf8ad7ed341d69534492
+    prebuild:
+      - sed -i -e '/githubusercontent/d' -e '/repositories {/a mavenLocal()' ../settings.gradle
+      - sed -i -e '/enable true/d' -e '/googleServices/d' {..,.}/build.gradle
+    build:
+      - pushd $$tor-android$$
+      - ./tor-droid-make.sh build -b release | tee tor-android.log >/dev/null ; tail
+        -n 100 tor-android.log
+      - gradle :tor-android-binary:publishToMavenLocal
+      - popd
+    ndk: r25c

 AllowedAPKSigningKeys: c2d0aa86bcb6b62090561a41bbe336e98b78c2d0210a498dc885f28e1348cf17

--- a/metadata/io.element.android.x.yml
+++ b/metadata/io.element.android.x.yml
@ -225,116 +225,9 @@ Builds:
    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
      $$OUT$$ 'a0086df'

-  - versionName: 0.6.3
-    versionCode: 40006031
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.3
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-armeabi-v7a-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.8
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.6.3
-    versionCode: 40006032
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.3
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-arm64-v8a-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.8
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.6.3
-    versionCode: 40006033
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.3
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-x86-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.8
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
-  - versionName: 0.6.3
-    versionCode: 40006034
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.3
-    subdir: app
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned.apk
-    binary: https://github.com/element-hq/element-x-android/releases/download/v%v/app-fdroid-x86_64-release-signed.apk
-    srclibs:
-      - reproducible-apk-tools@v0.2.8
-    rm:
-      - libraries/pushproviders/firebase
-    prebuild:
-      - sed -i -e '/gms/d' ../build.gradle.kts
-      - sed -i -e '/gplayImplementation/d' build.gradle.kts
-      - echo -e "\nservices.maptiler.apikey=agdgS5zCgFZF5gDi9VXS" >> ../local.properties
-      - echo -e "\nservices.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3"
-        >> ../local.properties
-      - echo -e "\nservices.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810"
-        >> ../local.properties
-      - sed -i -e 's/"git rev-parse --abbrev-ref HEAD"/"echo main"/' ../plugins/src/main/kotlin/extension/Utils.kt
-    scandelete:
-      - plugins
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
-      $$OUT$$ '0000000'
-
  - versionName: 0.6.4
    versionCode: 40006041
+    disable: https://github.com/element-hq/element-x-android/issues/3420
    commit: v0.6.4
    subdir: app
    gradle:
@ -361,6 +254,7 @@ Builds:

  - versionName: 0.6.4
    versionCode: 40006042
+    disable: https://github.com/element-hq/element-x-android/issues/3420
    commit: v0.6.4
    subdir: app
    gradle:
@ -387,6 +281,7 @@ Builds:

  - versionName: 0.6.4
    versionCode: 40006043
+    disable: https://github.com/element-hq/element-x-android/issues/3420
    commit: v0.6.4
    subdir: app
    gradle:
@ -413,6 +308,7 @@ Builds:

  - versionName: 0.6.4
    versionCode: 40006044
+    disable: https://github.com/element-hq/element-x-android/issues/3420
    commit: v0.6.4
    subdir: app
    gradle:
@ -442,7 +338,7 @@ AllowedAPKSigningKeys: 6a2fdc3148049ce0d5c6e85010723b83fb207d20c7477f5c22ac53c87
 MaintainerNotes: We have to build all abi apks. If we patch it to build only one abi
  the AndroidManifest.xml will be different.

-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: HTTP
 VercodeOperation:
  - 1 + %c
--- a/metadata/io.github.project_kaat.gpsdrelay.yml
+++ b/metadata/io.github.project_kaat.gpsdrelay.yml
@ -35,14 +35,11 @@ Builds:

  - versionName: '1.2'
    versionCode: 3
+    disable: key changed
    commit: f266068900e5b7221c0888eded643149315c40d7
    subdir: app
    gradle:
      - yes
-    srclibs:
-      - reproducible-apk-tools@v0.2.3
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
-      'META-INF/services/*'

 AllowedAPKSigningKeys: 9a44b31a2219369b2672d30d95204f3b95cfbe243a683c698f9b226e0ca3d511

--- a/metadata/org.fossify.gallery.yml
+++ b/metadata/org.fossify.gallery.yml
@ -71,6 +71,7 @@ Builds:

  - versionName: 1.2.1
    versionCode: 9
+    disable: https://github.com/FossifyOrg/Gallery/issues/317
    commit: 08cc4fc39ba2d1756aa148f1322150623d3c48e0
    subdir: app
    gradle:
--- a/metadata/ua.com.radiokot.photoprism.yml
+++ b/metadata/ua.com.radiokot.photoprism.yml
@ -528,7 +528,7 @@ Builds:
    gradle:
      - yes
    srclibs:
-      - reproducible-apk-tools@v0.2.3
+      - reproducible-apk-tools@v0.2.8
    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
      'assets/app.properties' 'assets/open_source_licenses.html'

--- a/srclibs/tor-android.yml
+++ b/srclibs/tor-android.yml
@ -0,0 +1,4 @@
+RepoType: git
+Repo: https://github.com/guardianproject/tor-android.git
+
+Prepare: git submodule update --init --recursive