Merge branch 'miscfixes17' into 'master'

Bypass proxy - another cycle

See merge request fdroid/fdroiddata!6553

metadata/com.duckduckgo.mobile.android.yml

@@ -558,15 +558,6 @@ Builds:
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r20b
 
-  - versionName: 5.47.4
-    versionCode: 54704
-    commit: 5.47.4
-    submodules: true
-    gradle:
-      - yes
-    output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
-    ndk: r20b
-
   - versionName: 5.48.0
     versionCode: 54800
     commit: 5.48.0
@@ -574,6 +565,7 @@ Builds:
     gradle:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r20b
 
 MaintainerNotes: Cannot use AUM/UCM because version code and version name are dynamic.

metadata/com.maxfour.music.yml

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

metadata/com.punksta.apps.volumecontrol.yml

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

metadata/com.wireguard.android.yml

@@ -400,16 +400,6 @@ Builds:
     prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r16b
 
-  - versionName: 0.0.20200322
-    versionCode: 466
-    commit: 0.0.20200322
-    subdir: ui
-    submodules: true
-    gradle:
-      - yes
-    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
-    ndk: r16b
-
   - versionName: 0.0.20200328
     versionCode: 469
     commit: 0.0.20200328

metadata/it.niedermann.owncloud.notes.yml

@@ -438,6 +438,7 @@ Builds:
     submodules: true
     gradle:
       - fdroid
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/net.ivpn.client.yml

@@ -24,6 +24,7 @@ Builds:
       - rm -rf src/main/cpp/openvpn3/test
     gradle:
       - fdroidProduction
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/org.billthefarmer.siggen.yml

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

metadata/ru.evgeniy.dpitunnel.yml

@@ -37,6 +37,7 @@ Builds:
     submodules: true
     gradle:
       - yes
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r20b
 
 AutoUpdateMode: Version v%v