Merge branch 'miscfixes15' into 'master'

More proxy fixes

See merge request fdroid/fdroiddata!6520

metadata/com.simplemobiletools.clock.yml

@@ -134,7 +134,9 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
+    prebuild:
+      - sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/com.tutpro.baresip.yml

@@ -1074,23 +1074,6 @@ Builds:
       - popd
     ndk: r21
 
-  - versionName: 17.2.1
-    versionCode: 113
-    commit: 17.2.1
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@12.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip|'
-        Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21
-
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
 

metadata/com.wireguard.android.yml

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

metadata/eu.faircode.netguard.yml

@@ -1192,7 +1192,9 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
+    prebuild:
+      - sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     ndk: r21
 
 AutoUpdateMode: Version %v

metadata/info.zamojski.soft.towercollector.yml

@@ -200,19 +200,13 @@ Builds:
     gradle:
       - productionFdroid
 
-  - versionName: 2.2.2
-    versionCode: 2020262
-    commit: 2.2.2
-    subdir: app
-    gradle:
-      - productionFdroid
-
   - versionName: 2.2.3
     versionCode: 2020363
     commit: 2.2.3
     subdir: app
     gradle:
       - productionFdroid
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/org.calyxinstitute.vpn.yml

@@ -72,7 +72,9 @@ Builds:
       - go/src/golang.org/x/tools/go/internal/gcimporter/testdata/
       - go/src/github.com/shadowsocks/shadowsocks-go/script/shadowsocks.exe
       - shapeshifter/*.?ar
-    prebuild: sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
+    prebuild:
+      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     build:
       - cd ../go
       - curl -o go.tar.gz https://dl.google.com/go/go1.12.7.linux-amd64.tar.gz