Merge branch 'miscfixes16' into 'master'

Bypass proxy some more

See merge request fdroid/fdroiddata!6531

metadata/ar.rulosoft.mimanganu.yml

@@ -1414,23 +1414,9 @@ Builds:
       - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
         ../build.gradle
 
-  - versionName: '1.125'
-    versionCode: 125
-    commit: '1.125'
-    subdir: app
-    gradle:
-      - fdroid
-    srclibs:
-      - RapidDecoder@7cdfca4
-    prebuild:
-      - cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
-
   - versionName: '1.126'
     versionCode: 126
+    disable: fails to build
     commit: '1.126'
     subdir: app
     gradle:

metadata/com.adrienpoupa.attestationcoronavirus.yml

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

metadata/com.gianlu.aria2android.yml

@@ -268,8 +268,10 @@ Builds:
     submodules: true
     gradle:
       - foss
-    prebuild: sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle
+    prebuild:
+      - sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle
         ../CommonUtils/build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     scandelete:
       - aria2lib/src/main/jniLibs
     ndk: r21

metadata/com.gianlu.dnshero.yml

@@ -184,8 +184,10 @@ Builds:
     submodules: true
     gradle:
       - foss
-    prebuild: sed -i -e '/maven.fabric.io/d; /io.fabric/d; /com.crashlytics/d' ../build.gradle
+    prebuild:
+      - sed -i -e '/maven.fabric.io/d; /io.fabric/d; /com.crashlytics/d' ../build.gradle
         ../CommonUtils/build.gradle build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.simplemobiletools.clock.yml

@@ -120,14 +120,6 @@ Builds:
       - yes
     prebuild: sed -i -e '/keystore/d' build.gradle
 
-  - versionName: 5.2.0
-    versionCode: 17
-    commit: 5.2.0
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
-
   - versionName: 5.2.1
     versionCode: 18
     commit: 5.2.1

metadata/com.simplemobiletools.filemanager.pro.yml

@@ -181,15 +181,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 6.5.2
-    versionCode: 86
-    commit: 6.5.2
-    subdir: app
-    patch:
-      - build.patch
-    gradle:
-      - yes
-
   - versionName: 6.5.3
     versionCode: 87
     commit: 6.5.3
@@ -198,6 +189,7 @@ Builds:
       - build.patch
     gradle:
       - yes
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/com.simplemobiletools.flashlight.yml

@@ -204,21 +204,15 @@ Builds:
       - yes
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
-  - versionName: 5.0.6
-    versionCode: 38
-    commit: 5.0.6
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
-
   - versionName: 5.1.0
     versionCode: 39
     commit: 5.1.0
     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.stealthcotper.networktools.yml

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

metadata/com.tutpro.baresip.yml

@@ -1065,6 +1065,7 @@ Builds:
       - yes
     srclibs:
       - libbaresip-android@12.0
+    prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     build:
       - pushd $$libbaresip-android$$
       - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip|'

metadata/info.guardianproject.locationprivacy.yml

@@ -45,6 +45,7 @@ Builds:
 
   - versionName: 0.3.1
     versionCode: 31
+    disable: does not verify
     commit: 0.3.1
     timeout: 2000
     subdir: app

metadata/joshuatee.wx.yml

@@ -345,24 +345,15 @@ Builds:
       - app/src/main/res/raw/*
     ndk: r18b
 
-  - versionName: '55379'
-    versionCode: 55379
-    commit: '55379'
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e 's|def ndkDir = ".*"|def ndkDir = "$$NDK$$"|' build.gradle
-    scanignore:
-      - app/src/main/res/raw/*
-    ndk: r18b
-
   - versionName: '55381'
     versionCode: 55381
     commit: '55381'
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e 's|def ndkDir = ".*"|def ndkDir = "$$NDK$$"|' build.gradle
+    prebuild:
+      - sed -i -e 's|def ndkDir = ".*"|def ndkDir = "$$NDK$$"|' build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     scanignore:
       - app/src/main/res/raw/*
     ndk: r18b

metadata/jp.ddo.hotmist.unicodepad.yml

@@ -36,13 +36,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.6.0
-    versionCode: 38
-    commit: v2.6.0
-    subdir: app/
-    gradle:
-      - yes
-
   - versionName: 2.6.1
     versionCode: 39
     commit: v2.6.1

metadata/org.commonvoice.saverio.yml

@@ -21,6 +21,7 @@ Builds:
 
   - versionName: 0.2.6b
     versionCode: 78
+    disable: fails to build
     commit: 0.2.6b
     subdir: app
     gradle:

metadata/org.jak_linux.dns66.yml

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

metadata/org.koreader.launcher.yml

@@ -271,6 +271,7 @@ Builds:
 
   - versionName: v2020.03.2
     versionCode: 7365
+    disable: versionCode different see upstream
     commit: v2020.03.2
     submodules: true
     sudo:

metadata/org.xphnx.ameixa.yml

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

metadata/se.leap.riseupvpn.yml

@@ -91,7 +91,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

metadata/xyz.deepdaikon.xeonjia.yml

@@ -22,8 +22,10 @@ Builds:
       - flutter@v1.12.13+hotfix.8
     rm:
       - ios
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
+    prebuild:
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
+      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
+        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get

metadata/xyz.deepdaikon.zoysii.yml

@@ -78,8 +78,10 @@ Builds:
       - flutter@v1.12.13+hotfix.5
     rm:
       - ios
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
+    prebuild:
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
+      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
+        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
+      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk