From 75367303103328195112b227c5b88dc18efd9f90 Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon.kter@protonmail.com>
Date: Mon, 23 Mar 2020 00:56:54 +0200
Subject: [PATCH] More proxy fixes

---
 metadata/com.simplemobiletools.clock.yml       |  4 +++-
 metadata/com.tutpro.baresip.yml                | 17 -----------------
 metadata/com.wireguard.android.yml             |  1 +
 metadata/eu.faircode.netguard.yml              |  4 +++-
 metadata/info.zamojski.soft.towercollector.yml |  8 +-------
 metadata/org.calyxinstitute.vpn.yml            |  4 +++-
 6 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/metadata/com.simplemobiletools.clock.yml b/metadata/com.simplemobiletools.clock.yml
index 41c15a8779..13879f3027 100644
--- a/metadata/com.simplemobiletools.clock.yml
+++ b/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
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 2e94051da1..bcb0653473 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/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.
 
diff --git a/metadata/com.wireguard.android.yml b/metadata/com.wireguard.android.yml
index 8c2608e9fa..4dd22c41f7 100644
--- a/metadata/com.wireguard.android.yml
+++ b/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
diff --git a/metadata/eu.faircode.netguard.yml b/metadata/eu.faircode.netguard.yml
index 1ee052311f..4e41ef9e3f 100644
--- a/metadata/eu.faircode.netguard.yml
+++ b/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
diff --git a/metadata/info.zamojski.soft.towercollector.yml b/metadata/info.zamojski.soft.towercollector.yml
index 78abbe9327..70511770b6 100644
--- a/metadata/info.zamojski.soft.towercollector.yml
+++ b/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
diff --git a/metadata/org.calyxinstitute.vpn.yml b/metadata/org.calyxinstitute.vpn.yml
index c0b2f96532..65a9022f9b 100644
--- a/metadata/org.calyxinstitute.vpn.yml
+++ b/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