Merge branch 'miscfixes19' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!6564

metadata/au.com.wallaceit.reddinator.yml

@@ -444,8 +444,10 @@ Builds:
     forceversion: true
     rm:
       - build.gradle
-    prebuild: sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#'
+    prebuild:
+      - sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#'
         -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+      - sed -i -e 's/2.2.1/5.4.1/' gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/ch.blinkenlights.android.vanilla.yml

@@ -331,6 +331,11 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild:
+      - pushd ../gradle/wrapper
+      - mv gradle-wrapper.properties gradle-wrapper.properties_orig
+      - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties
+      - popd
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/com.flxrs.dankchat.yml

@@ -190,6 +190,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/design.codeux.authpass.fdroid.yml

@@ -89,6 +89,7 @@ Builds:
       - authpass/ios
       - authpass/macos
       - deps/kdbx.dart/libargon2*
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release

metadata/fr.cph.chicago.foss.yml

@@ -487,7 +487,6 @@ Builds:
       - echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties
     scandelete:
       - buildSrc/
-      - .gradle/
 
 AutoUpdateMode: Version %v-fdroid
 UpdateCheckMode: Tags

metadata/hr.kravarscan.enchantedfortress.yml

@@ -122,6 +122,11 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild:
+      - pushd ../gradle/wrapper
+      - mv gradle-wrapper.properties gradle-wrapper.properties_orig
+      - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties
+      - popd
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/net.ivpn.client.yml

@@ -25,6 +25,7 @@ Builds:
     gradle:
       - fdroidProduction
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
+    ndk: r21
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/org.wownero.cyberwow.yml

@@ -29,24 +29,6 @@ Builds:
       - PATH=$flutter_dir:$PATH ANDROID_NDK_ROOT=$$NDK$$ make wow
     ndk: r20
 
-  - versionName: 0.7.0.0-j
-    versionCode: 23
-    commit: v0.7.0.0-j
-    subdir: cyberwow
-    sudo:
-      - apt-get update || apt-get update
-      - apt install -y build-essential
-      - apt install -y -t stretch-backports cmake
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@stable
-    build:
-      - flutter_dir=$(realpath $$flutter$$/bin)
-      - $flutter_dir/flutter config --no-analytics
-      - cd ..
-      - PATH=$flutter_dir:$PATH ANDROID_NDK_ROOT=$$NDK$$ make wow
-    ndk: r20b
-
   - versionName: 0.7.0.0-k
     versionCode: 24
     commit: v0.7.0.0-k

metadata/se.manyver.yml

@@ -1218,7 +1218,9 @@ Builds:
       - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
       - node_modules/react-native/template/
       - e2e/apple-app-store-demo
-    prebuild: sed -i -e '/lifecycle/d' ../build.gradle
+    prebuild:
+      - sed -i -e '/lifecycle/d' ../build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     scanignore:
       - android/build.gradle
     scandelete: