Misc fixes after cycle

2026-05-08 07:06:52 +00:00 · 2020-07-24 18:55:42 +00:00 · 2020-07-24 18:55:42 +00:00 · 49c321b50a
commit 49c321b50a
parent 4fb0d3138b
14 changed files with 11 additions and 228 deletions
--- a/metadata/com.coboltforge.dontmind.multivnc.yml
+++ b/metadata/com.coboltforge.dontmind.multivnc.yml
@ -169,15 +169,6 @@ Builds:
    scanignore:
      - contrib

-  - versionName: 1.8.11
-    versionCode: 66
-    commit: AndroidMultiVNC-1.8.11
-    subdir: android/app
-    gradle:
-      - yes
-    scanignore:
-      - contrib
-
  - versionName: 1.9.0
    versionCode: 67
    commit: AndroidMultiVNC-1.9.0
--- a/metadata/com.github.gotify.yml
+++ b/metadata/com.github.gotify.yml
@ -108,6 +108,7 @@ Builds:
    subdir: app
    gradle:
      - yes
+    prebuild: sed -i -e 's/6.3-rc-4-all/6.3-all/' ../gradle/wrapper/gradle-wrapper.properties

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
--- a/metadata/com.github.premnirmal.tickerwidget.yml
+++ b/metadata/com.github.premnirmal.tickerwidget.yml
@ -940,84 +940,6 @@ Builds:
      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
        build.gradle

-  - versionName: 3.8.6
-    versionCode: 386
-    commit: '386'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.0
-    versionCode: 390
-    commit: '390'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.2
-    versionCode: 392
-    commit: '392'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.3
-    versionCode: 393
-    commit: '393'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.5
-    versionCode: 395
-    commit: '395'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
-  - versionName: 3.9.6
-    versionCode: 396
-    commit: '396'
-    subdir: app
-    gradle:
-      - purefoss
-    prebuild:
-      - touch translate.properties
-      - sed -i -e '/fabric/d' -e '/crashlytics/,+2d' -e '/play-services/d' -e '/google-services/d'
-        build.gradle
-      - sed -i -e '/dl.bintray.com\/lukaville/d' -e 's/com.nbsp:library:1.8/com.github.nbsp-team:MaterialFilePicker:7f3679fbbf/g'
-        build.gradle
-
 MaintainerNotes: |-
    We replace com.nbsp:library from http://dl.bintray.com/lukaville/maven with
    com.github.nbsp-team:MaterialFilePicker from
--- a/metadata/com.ichi2.anki.yml
+++ b/metadata/com.ichi2.anki.yml
@ -553,18 +553,6 @@ Builds:
    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
    ndk: r21d

-  - versionName: 2.12.0
-    versionCode: 21200300
-    commit: v2.12.0
-    subdir: AnkiDroid
-    gradle:
-      - yes
-    rm:
-      - tools
-      - docs
-    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
-    ndk: r21d
-
  - versionName: 2.12.1
    versionCode: 21201300
    commit: v2.12.1
@ -574,7 +562,7 @@ Builds:
    rm:
      - tools
      - docs
-    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
+    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' -e '/splits\ {/,+30d' build.gradle
    ndk: r21d

 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
--- a/metadata/com.todobom.opennotescanner.yml
+++ b/metadata/com.todobom.opennotescanner.yml
@ -224,12 +224,9 @@ Builds:
    versionCode: 35
    commit: 1.0.35-fdroid
    subdir: app
-    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.11\" }' >> ../build.gradle"
    gradle:
      - fdroid

-MaintainerNotes: Uses jitpack, so Gradle 2.11 or newer is needed.
-
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 1.0.35-fdroid
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@ -111,46 +111,6 @@ Builds:
      - popd
    ndk: r21d

-  - versionName: 2.0.0
-    versionCode: 6
-    commit: v2.0.0
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v3.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|'
-        Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
-  - versionName: 3.0.0
-    versionCode: 7
-    commit: v3.0.0
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v3.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|'
-        Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
  - versionName: 3.0.1
    versionCode: 8
    commit: v3.0.1
--- a/metadata/de.freifunk_karte.freifunk_karte.yml
+++ b/metadata/de.freifunk_karte.freifunk_karte.yml
@ -39,6 +39,8 @@ Builds:
    subdir: app
    gradle:
      - yes
+    rm:
+      - Bilder/ic_launcher.zip

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/de.tutao.tutanota.yml
+++ b/metadata/de.tutao.tutanota.yml
@ -823,25 +823,6 @@ Builds:
      - npm install
      - node dist prod

-  - versionName: 3.75.1
-    versionCode: 375010
-    commit: tutanota-android-release-3.75.1
-    subdir: app-android/app
-    sudo:
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v10.11.0/node-v10.11.0-linux-x64.tar.xz
-      - echo "c2eab149e7f0712a6a3eb672a76d657b049a3b3ae0c2edc2e0571df5049fe82c node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v10.11.0-linux-x64/. /usr/local/
-    gradle:
-      - yes
-    prebuild:
-      - cd ../..
-      - rm -rf app-ios
-      - node fdroid-fix-deps
-      - npm install
-      - node dist prod
-
  - versionName: 3.75.3
    versionCode: 375030
    commit: tutanota-android-release-3.75.3
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@ -83,30 +83,6 @@ Builds:
      - foss
    prebuild: sed -i -e '/play-services/d' ../proprietary/build.gradle ../wear/build.gradle

-  - versionName: 7.2.3
-    versionCode: 702031
-    commit: 7.2.3
-    subdir: app
-    gradle:
-      - foss
-    prebuild: sed -i -e '/play-services/d' ../proprietary/build.gradle ../wear/build.gradle
-
-  - versionName: 7.2.4
-    versionCode: 702041
-    commit: 7.2.4
-    subdir: app
-    gradle:
-      - foss
-    prebuild: sed -i -e '/play-services/d' ../proprietary/build.gradle ../wear/build.gradle
-
-  - versionName: 7.2.6
-    versionCode: 702061
-    commit: 7.2.6
-    subdir: app
-    gradle:
-      - foss
-    prebuild: sed -i -e '/play-services/d' ../proprietary/build.gradle ../wear/build.gradle
-
  - versionName: 7.2.7
    versionCode: 702071
    commit: 7.2.7
--- a/metadata/dk.kjeldsen.carwingsflutter.yml
+++ b/metadata/dk.kjeldsen.carwingsflutter.yml
@ -414,20 +414,6 @@ Builds:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk

-  - versionName: 1.8.9
-    versionCode: 140
-    commit: 1.8.9
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@v1.12.13+hotfix.5
-    prebuild:
-      - touch android/key.properties
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
  - versionName: 1.8.9
    versionCode: 141
    commit: 1.8.9
@ -456,20 +442,6 @@ Builds:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk

-  - versionName: 1.9.2
-    versionCode: 147
-    commit: 1.9.2
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@v1.12.13+hotfix.5
-    prebuild:
-      - touch android/key.properties
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
  - versionName: 1.9.2
    versionCode: 148
    commit: 1.9.2
--- a/metadata/dnsfilter.android.yml
+++ b/metadata/dnsfilter.android.yml
@ -129,6 +129,9 @@ Builds:
    subdir: app
    gradle:
      - yes
+    scanignore:
+      - material.io_icons.zip
+      - personalDNSfilter_icon.zip

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/me.murks.feedwatcher.yml
+++ b/metadata/me.murks.feedwatcher.yml
@ -48,7 +48,6 @@ Builds:
    versionCode: 5
    commit: 0.0.5-alpha
    subdir: app
-    submodules: true
    gradle:
      - yes

--- a/metadata/org.openobservatory.ooniprobe.yml
+++ b/metadata/org.openobservatory.ooniprobe.yml
@ -219,16 +219,6 @@ Builds:
      - sed -i -e '/fabric/d' ../build.gradle
      - sed -i -e '/fabric/d' build.gradle

-  - versionName: 2.5.0
-    versionCode: 61
-    commit: v2.5.0
-    subdir: app
-    gradle:
-      - stableFdroid
-    prebuild:
-      - sed -i -e '/fabric/d' ../build.gradle
-      - sed -i -e '/fabric/d' build.gradle
-
  - versionName: 2.5.1
    versionCode: 62
    commit: v2.5.1
@ -237,7 +227,8 @@ Builds:
      - stableFdroid
    prebuild:
      - sed -i -e '/fabric/d' ../build.gradle
-      - sed -i -e '/fabric/d' build.gradle
+      - sed -i -e '/fabric/d' -e 's/21.0.6113669/21.3.6528147/' build.gradle
+    ndk: r21d

 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
--- a/metadata/rocks.poopjournal.flashy.yml
+++ b/metadata/rocks.poopjournal.flashy.yml
@ -24,12 +24,12 @@ Builds:

  - versionName: '1.1'
    versionCode: 2
-    commit: v1.1
+    commit: '1.1'
    subdir: app
    gradle:
      - yes

-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: '1.1'
 CurrentVersionCode: 2