From 2f5f36bf04f04246f5a263c8a04479574598fb29 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 12 Feb 2020 11:06:42 +0000 Subject: [PATCH] Misc fixes after this cycle --- metadata/com.android.keepass.yml | 1 + metadata/com.asdoi.gymwen.yml | 1 + metadata/com.cookiegames.smartcookie.yml | 1 + metadata/com.gianlu.pretendyourexyzzy.yml | 6 +++++- metadata/com.indieweb.indigenous.yml | 1 + metadata/com.kunzisoft.keepass.libre.yml | 2 +- metadata/com.mkulesh.onpc.yml | 2 +- metadata/com.nextcloud.android.beta.yml | 12 ------------ metadata/com.nextcloud.client.yml | 12 ------------ metadata/com.nononsenseapps.feeder.yml | 4 ---- metadata/design.codeux.authpass.fdroid.yml | 15 --------------- metadata/ga.testapp.testapp.yml | 1 + metadata/org.koreader.launcher.yml | 7 ++----- metadata/org.navitproject.navit.yml | 2 ++ 14 files changed, 16 insertions(+), 51 deletions(-) diff --git a/metadata/com.android.keepass.yml b/metadata/com.android.keepass.yml index abd3ea2332..f4cc50438b 100644 --- a/metadata/com.android.keepass.yml +++ b/metadata/com.android.keepass.yml @@ -391,6 +391,7 @@ Builds: - versionName: 2.5.1 versionCode: 183 + disable: fails to build commit: v2.5.1 subdir: app gradle: diff --git a/metadata/com.asdoi.gymwen.yml b/metadata/com.asdoi.gymwen.yml index beaa3ad705..3156327efd 100644 --- a/metadata/com.asdoi.gymwen.yml +++ b/metadata/com.asdoi.gymwen.yml @@ -45,6 +45,7 @@ Builds: - versionName: 1.1.1 versionCode: 111 + disable: non-FOSS play-services-oss-licenses commit: v1.1.1 subdir: app gradle: diff --git a/metadata/com.cookiegames.smartcookie.yml b/metadata/com.cookiegames.smartcookie.yml index c494d95e35..f0d37dbd43 100644 --- a/metadata/com.cookiegames.smartcookie.yml +++ b/metadata/com.cookiegames.smartcookie.yml @@ -39,6 +39,7 @@ Builds: - versionName: 6.6.0 versionCode: 70 + disable: no such tag commit: v6.6.0 subdir: app gradle: diff --git a/metadata/com.gianlu.pretendyourexyzzy.yml b/metadata/com.gianlu.pretendyourexyzzy.yml index e0dac63787..21dd0be401 100644 --- a/metadata/com.gianlu.pretendyourexyzzy.yml +++ b/metadata/com.gianlu.pretendyourexyzzy.yml @@ -249,6 +249,7 @@ Builds: - versionName: 3.1.1 versionCode: 90 + disable: non-FOSS deps Firebase commit: v3.1.1 subdir: app submodules: true @@ -259,6 +260,7 @@ Builds: - versionName: 3.1.2 versionCode: 91 + disable: non-FOSS deps Firebase commit: v3.1.2 subdir: app submodules: true @@ -267,7 +269,9 @@ Builds: prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle ../CommonUtils/build.gradle -AutoUpdateMode: Version v%v +AutoUpdateMode: None UpdateCheckMode: Tags CurrentVersion: 3.1.2 CurrentVersionCode: 91 + +NoSourceSince: 3.1.1 diff --git a/metadata/com.indieweb.indigenous.yml b/metadata/com.indieweb.indigenous.yml index a970f2add4..599335577f 100644 --- a/metadata/com.indieweb.indigenous.yml +++ b/metadata/com.indieweb.indigenous.yml @@ -116,6 +116,7 @@ Builds: - versionName: '0.56' versionCode: 56 + disable: fails to build missing Mapbox key commit: '0.56' subdir: app gradle: diff --git a/metadata/com.kunzisoft.keepass.libre.yml b/metadata/com.kunzisoft.keepass.libre.yml index 8e864f3e7d..5c19f84944 100644 --- a/metadata/com.kunzisoft.keepass.libre.yml +++ b/metadata/com.kunzisoft.keepass.libre.yml @@ -125,7 +125,7 @@ Builds: subdir: app gradle: - libre - ndk: r20 + ndk: r20b AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.mkulesh.onpc.yml b/metadata/com.mkulesh.onpc.yml index 262a7be126..7e512f04f6 100644 --- a/metadata/com.mkulesh.onpc.yml +++ b/metadata/com.mkulesh.onpc.yml @@ -108,7 +108,7 @@ Builds: - versionName: 1.9.2 versionCode: 22 - commit: v1.9.2 + commit: v1.9 subdir: app gradle: - yes diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml index d81f09e495..5e219441a2 100644 --- a/metadata/com.nextcloud.android.beta.yml +++ b/metadata/com.nextcloud.android.beta.yml @@ -4150,18 +4150,6 @@ Builds: scandelete: - src/androidTest - - versionName: '20200201' - versionCode: 20200201 - commit: dev-20200201 - submodules: true - gradle: - - versionDev - rm: - - user_manual - - gplay.gradle - scandelete: - - src/androidTest - - versionName: '20200205' versionCode: 20200205 commit: dev-20200205 diff --git a/metadata/com.nextcloud.client.yml b/metadata/com.nextcloud.client.yml index e934166da4..5cb20bfee9 100644 --- a/metadata/com.nextcloud.client.yml +++ b/metadata/com.nextcloud.client.yml @@ -1028,18 +1028,6 @@ Builds: scandelete: - src/androidTest - - versionName: 3.10.0 - versionCode: 30100090 - commit: stable-3.10.0 - submodules: true - gradle: - - generic - rm: - - user_manual - - gplay.gradle - scandelete: - - src/androidTest - - versionName: 3.10.1 versionCode: 30100190 commit: stable-3.10.1 diff --git a/metadata/com.nononsenseapps.feeder.yml b/metadata/com.nononsenseapps.feeder.yml index deac2e5988..fbbe3f404b 100644 --- a/metadata/com.nononsenseapps.feeder.yml +++ b/metadata/com.nononsenseapps.feeder.yml @@ -564,10 +564,6 @@ Builds: - gradle-version.patch gradle: - yes - rm: - - rome/rome/src/site/resources/Fetcher/Releases/* - - rome/rome/src/site/resources/Modules/* - - rome/rome/src/site/resources/ROMEReleases/* prebuild: echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties AutoUpdateMode: Version %v diff --git a/metadata/design.codeux.authpass.fdroid.yml b/metadata/design.codeux.authpass.fdroid.yml index 6624c23aa0..60fdfb85e0 100644 --- a/metadata/design.codeux.authpass.fdroid.yml +++ b/metadata/design.codeux.authpass.fdroid.yml @@ -47,21 +47,6 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release - - versionName: 1.3.0 - versionCode: 114 - commit: v1.3.0 - subdir: authpass - submodules: true - output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk - srclibs: - - flutter@v1.12.13+hotfix.5 - rm: - - authpass/ios - - authpass/macos - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release - - versionName: 1.3.0 versionCode: 115 commit: v1.3.0 diff --git a/metadata/ga.testapp.testapp.yml b/metadata/ga.testapp.testapp.yml index 9734de492f..d70ad255bd 100644 --- a/metadata/ga.testapp.testapp.yml +++ b/metadata/ga.testapp.testapp.yml @@ -80,6 +80,7 @@ Builds: - versionName: 3.4.0 versionCode: 43 + disable: fails to build commit: 3.4.0 output: build/app/outputs/apk/release/app-release.apk srclibs: diff --git a/metadata/org.koreader.launcher.yml b/metadata/org.koreader.launcher.yml index d3fd769d32..17ca5fa8c9 100644 --- a/metadata/org.koreader.launcher.yml +++ b/metadata/org.koreader.launcher.yml @@ -3,7 +3,7 @@ Categories: License: AGPL-3.0-only SourceCode: https://github.com/koreader/koreader IssueTracker: https://github.com/koreader/koreader/issues -Translation: https://www.transifex.com/projects/p/koreader/ +Translation: https://hosted.weblate.org/engage/koreader/ Changelog: https://github.com/koreader/koreader/releases RepoType: git @@ -229,6 +229,7 @@ Builds: - versionName: v2020.01 versionCode: 7278 + disable: fails to build commit: v2020.01 submodules: true sudo: @@ -247,10 +248,6 @@ Builds: - ANDROID_FLAVOR=fdroid ./kodev release android ndk: r15c -MaintainerNotes: The app is English-only for now, because it requires fetching the - translations from Transifex (see [https://github.com/koreader/koreader/tree/master/l10n - here]) and we can not do this without credentials. - AutoUpdateMode: Version %v UpdateCheckMode: HTTP UpdateCheckData: https://ota.koreader.rocks/koreader-android-fdroid-latest|(\d+)$|.|(v.*) diff --git a/metadata/org.navitproject.navit.yml b/metadata/org.navitproject.navit.yml index 9c5b6e0e95..a6e48d85db 100644 --- a/metadata/org.navitproject.navit.yml +++ b/metadata/org.navitproject.navit.yml @@ -790,6 +790,7 @@ Builds: - versionName: v0.5.4 versionCode: 2001180336 + disable: fails to build commit: v0.5.4 sudo: - apt-get update || apt-get update @@ -808,6 +809,7 @@ Builds: - versionName: v0.5.4-fdroid.1 versionCode: 2002100212 + disable: fails to build commit: v0.5.4-fdroid.1 sudo: - apt-get update || apt-get update