From 03d6b284a13878cc19cad9fc3814ca36b51adbbb Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 1 Apr 2020 05:33:55 -0400 Subject: [PATCH] Misc fixes after cycle --- metadata/au.com.wallaceit.reddinator.yml | 4 +++- metadata/ch.blinkenlights.android.vanilla.yml | 5 +++++ metadata/com.flxrs.dankchat.yml | 1 + metadata/design.codeux.authpass.fdroid.yml | 1 + metadata/fr.cph.chicago.foss.yml | 1 - metadata/hr.kravarscan.enchantedfortress.yml | 5 +++++ metadata/net.ivpn.client.yml | 1 + metadata/org.wownero.cyberwow.yml | 18 ------------------ metadata/se.manyver.yml | 4 +++- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/metadata/au.com.wallaceit.reddinator.yml b/metadata/au.com.wallaceit.reddinator.yml index 4ffa9d2cc0..bd84527e3d 100644 --- a/metadata/au.com.wallaceit.reddinator.yml +++ b/metadata/au.com.wallaceit.reddinator.yml @@ -444,8 +444,10 @@ Builds: forceversion: true rm: - build.gradle - prebuild: sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' + prebuild: + - sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle + - sed -i -e 's/2.2.1/5.4.1/' gradle/wrapper/gradle-wrapper.properties AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/ch.blinkenlights.android.vanilla.yml b/metadata/ch.blinkenlights.android.vanilla.yml index 2ce29ce609..46f7595ad0 100644 --- a/metadata/ch.blinkenlights.android.vanilla.yml +++ b/metadata/ch.blinkenlights.android.vanilla.yml @@ -331,6 +331,11 @@ Builds: subdir: app gradle: - yes + prebuild: + - pushd ../gradle/wrapper + - mv gradle-wrapper.properties gradle-wrapper.properties_orig + - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties + - popd AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.flxrs.dankchat.yml b/metadata/com.flxrs.dankchat.yml index e94034992d..41f8a22625 100644 --- a/metadata/com.flxrs.dankchat.yml +++ b/metadata/com.flxrs.dankchat.yml @@ -190,6 +190,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/design.codeux.authpass.fdroid.yml b/metadata/design.codeux.authpass.fdroid.yml index 3911793b69..00b376d190 100644 --- a/metadata/design.codeux.authpass.fdroid.yml +++ b/metadata/design.codeux.authpass.fdroid.yml @@ -89,6 +89,7 @@ Builds: - authpass/ios - authpass/macos - deps/kdbx.dart/libargon2* + prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release diff --git a/metadata/fr.cph.chicago.foss.yml b/metadata/fr.cph.chicago.foss.yml index 816abfe03c..07fd4a0192 100644 --- a/metadata/fr.cph.chicago.foss.yml +++ b/metadata/fr.cph.chicago.foss.yml @@ -487,7 +487,6 @@ Builds: - echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties scandelete: - buildSrc/ - - .gradle/ AutoUpdateMode: Version %v-fdroid UpdateCheckMode: Tags diff --git a/metadata/hr.kravarscan.enchantedfortress.yml b/metadata/hr.kravarscan.enchantedfortress.yml index 1544d0705b..da1a60e8b9 100644 --- a/metadata/hr.kravarscan.enchantedfortress.yml +++ b/metadata/hr.kravarscan.enchantedfortress.yml @@ -122,6 +122,11 @@ Builds: subdir: app gradle: - yes + prebuild: + - pushd ../gradle/wrapper + - mv gradle-wrapper.properties gradle-wrapper.properties_orig + - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties + - popd AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/net.ivpn.client.yml b/metadata/net.ivpn.client.yml index d7baa040e4..2d0bcd1514 100644 --- a/metadata/net.ivpn.client.yml +++ b/metadata/net.ivpn.client.yml @@ -25,6 +25,7 @@ Builds: gradle: - fdroidProduction prebuild: sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties + ndk: r21 AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/org.wownero.cyberwow.yml b/metadata/org.wownero.cyberwow.yml index fa47b76995..526831363b 100644 --- a/metadata/org.wownero.cyberwow.yml +++ b/metadata/org.wownero.cyberwow.yml @@ -29,24 +29,6 @@ Builds: - PATH=$flutter_dir:$PATH ANDROID_NDK_ROOT=$$NDK$$ make wow ndk: r20 - - versionName: 0.7.0.0-j - versionCode: 23 - commit: v0.7.0.0-j - subdir: cyberwow - sudo: - - apt-get update || apt-get update - - apt install -y build-essential - - apt install -y -t stretch-backports cmake - output: build/app/outputs/apk/release/app-release.apk - srclibs: - - flutter@stable - build: - - flutter_dir=$(realpath $$flutter$$/bin) - - $flutter_dir/flutter config --no-analytics - - cd .. - - PATH=$flutter_dir:$PATH ANDROID_NDK_ROOT=$$NDK$$ make wow - ndk: r20b - - versionName: 0.7.0.0-k versionCode: 24 commit: v0.7.0.0-k diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml index 3d154886c4..3c9469e08b 100644 --- a/metadata/se.manyver.yml +++ b/metadata/se.manyver.yml @@ -1218,7 +1218,9 @@ Builds: - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar - node_modules/react-native/template/ - e2e/apple-app-store-demo - prebuild: sed -i -e '/lifecycle/d' ../build.gradle + prebuild: + - sed -i -e '/lifecycle/d' ../build.gradle + - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties scanignore: - android/build.gradle scandelete: