From 929d5086d731c919a961ec1550a9a8c097b1d153 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 25 Mar 2020 17:01:30 +0000 Subject: [PATCH] Bypass proxy some more --- metadata/ar.rulosoft.mimanganu.yml | 16 +--------------- .../com.adrienpoupa.attestationcoronavirus.yml | 1 + metadata/com.gianlu.aria2android.yml | 4 +++- metadata/com.gianlu.dnshero.yml | 4 +++- metadata/com.simplemobiletools.clock.yml | 8 -------- .../com.simplemobiletools.filemanager.pro.yml | 10 +--------- metadata/com.simplemobiletools.flashlight.yml | 12 +++--------- metadata/com.stealthcotper.networktools.yml | 1 + metadata/com.tutpro.baresip.yml | 1 + .../info.guardianproject.locationprivacy.yml | 1 + metadata/joshuatee.wx.yml | 15 +++------------ metadata/jp.ddo.hotmist.unicodepad.yml | 7 ------- metadata/org.commonvoice.saverio.yml | 1 + metadata/org.jak_linux.dns66.yml | 1 + metadata/org.koreader.launcher.yml | 1 + metadata/org.xphnx.ameixa.yml | 1 + metadata/se.leap.riseupvpn.yml | 4 +++- metadata/xyz.deepdaikon.xeonjia.yml | 6 ++++-- metadata/xyz.deepdaikon.zoysii.yml | 6 ++++-- 19 files changed, 33 insertions(+), 67 deletions(-) diff --git a/metadata/ar.rulosoft.mimanganu.yml b/metadata/ar.rulosoft.mimanganu.yml index 743ea36c49..5adb8092d8 100644 --- a/metadata/ar.rulosoft.mimanganu.yml +++ b/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: diff --git a/metadata/com.adrienpoupa.attestationcoronavirus.yml b/metadata/com.adrienpoupa.attestationcoronavirus.yml index 5bafca256a..337338fafa 100644 --- a/metadata/com.adrienpoupa.attestationcoronavirus.yml +++ b/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 diff --git a/metadata/com.gianlu.aria2android.yml b/metadata/com.gianlu.aria2android.yml index 90c3629713..a6255b6610 100644 --- a/metadata/com.gianlu.aria2android.yml +++ b/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 diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index 0d28bdcf74..11d7025a48 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/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 diff --git a/metadata/com.simplemobiletools.clock.yml b/metadata/com.simplemobiletools.clock.yml index 13879f3027..5bfc3996d3 100644 --- a/metadata/com.simplemobiletools.clock.yml +++ b/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 diff --git a/metadata/com.simplemobiletools.filemanager.pro.yml b/metadata/com.simplemobiletools.filemanager.pro.yml index dce48b8bd2..b7714ede0a 100644 --- a/metadata/com.simplemobiletools.filemanager.pro.yml +++ b/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 diff --git a/metadata/com.simplemobiletools.flashlight.yml b/metadata/com.simplemobiletools.flashlight.yml index b471bd21f3..fc48c462e3 100644 --- a/metadata/com.simplemobiletools.flashlight.yml +++ b/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 diff --git a/metadata/com.stealthcotper.networktools.yml b/metadata/com.stealthcotper.networktools.yml index fe868d38ff..431565e600 100644 --- a/metadata/com.stealthcotper.networktools.yml +++ b/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 diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index bcb0653473..1e2e1a3357 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/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|' diff --git a/metadata/info.guardianproject.locationprivacy.yml b/metadata/info.guardianproject.locationprivacy.yml index d14d312f3b..bbe61c6d4e 100644 --- a/metadata/info.guardianproject.locationprivacy.yml +++ b/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 diff --git a/metadata/joshuatee.wx.yml b/metadata/joshuatee.wx.yml index 26d1abaae1..4beb67863a 100644 --- a/metadata/joshuatee.wx.yml +++ b/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 diff --git a/metadata/jp.ddo.hotmist.unicodepad.yml b/metadata/jp.ddo.hotmist.unicodepad.yml index 71e110e9d7..3db04b993b 100644 --- a/metadata/jp.ddo.hotmist.unicodepad.yml +++ b/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 diff --git a/metadata/org.commonvoice.saverio.yml b/metadata/org.commonvoice.saverio.yml index 7fbcad1f0a..011cf73e71 100644 --- a/metadata/org.commonvoice.saverio.yml +++ b/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: diff --git a/metadata/org.jak_linux.dns66.yml b/metadata/org.jak_linux.dns66.yml index 7a31248996..ac37675b84 100644 --- a/metadata/org.jak_linux.dns66.yml +++ b/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 diff --git a/metadata/org.koreader.launcher.yml b/metadata/org.koreader.launcher.yml index 3225a99e24..288304408d 100644 --- a/metadata/org.koreader.launcher.yml +++ b/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: diff --git a/metadata/org.xphnx.ameixa.yml b/metadata/org.xphnx.ameixa.yml index 2178e7aefa..b4625c9d09 100644 --- a/metadata/org.xphnx.ameixa.yml +++ b/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 diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml index c15e561c76..2716139d6f 100644 --- a/metadata/se.leap.riseupvpn.yml +++ b/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 diff --git a/metadata/xyz.deepdaikon.xeonjia.yml b/metadata/xyz.deepdaikon.xeonjia.yml index ed737359a5..66834721f9 100644 --- a/metadata/xyz.deepdaikon.xeonjia.yml +++ b/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 - { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle + prebuild: + - 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 diff --git a/metadata/xyz.deepdaikon.zoysii.yml b/metadata/xyz.deepdaikon.zoysii.yml index ebede86d79..02c08a46de 100644 --- a/metadata/xyz.deepdaikon.zoysii.yml +++ b/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 - { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle + prebuild: + - 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