From 348a2d8fc42019c6ae551cec3ab8938592243d21 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 25 Oct 2022 01:53:38 +0800 Subject: [PATCH] misc fixes --- metadata/com.activitymanager.yml | 4 ---- metadata/com.calcitem.sanmill.yml | 1 + metadata/com.caydey.ffshare.yml | 6 +----- metadata/com.forrestguice.suntimeswidget.yml | 1 + metadata/com.fox2code.mmm.fdroid.yml | 2 -- metadata/com.rtbishop.look4sat.yml | 4 ---- metadata/com.tughi.aggregator.yml | 3 +-- metadata/edu.rit.csh.devin.yml | 4 ---- metadata/me.blog.korn123.easydiary.yml | 7 +++---- metadata/me.konyaco.collinsdictionary.yml | 2 +- metadata/open.com.permissionsmanager.yml | 4 ---- metadata/org.hlwd.bible.yml | 4 ---- metadata/org.koreader.launcher.fdroid.yml | 3 ++- metadata/souch.smp.yml | 22 ++++++++++---------- 14 files changed, 21 insertions(+), 46 deletions(-) diff --git a/metadata/com.activitymanager.yml b/metadata/com.activitymanager.yml index 70e71a62ae..84344cdaf5 100644 --- a/metadata/com.activitymanager.yml +++ b/metadata/com.activitymanager.yml @@ -96,10 +96,6 @@ Builds: versionCode: 511 commit: d9cd30d59e4d8b729ebf16dbeaa695cd3ae1df57 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - prod diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml index dee738f933..fae98a5d64 100644 --- a/metadata/com.calcitem.sanmill.yml +++ b/metadata/com.calcitem.sanmill.yml @@ -1635,6 +1635,7 @@ Builds: - versionName: 2.0.12 versionCode: 3124 + disable: https://github.com/calcitem/Sanmill/issues/612 commit: 31bb146be081f3449dcebca751fed26a59089b7c subdir: src/ui/flutter_app output: build/app/outputs/flutter-apk/app-fdroid-release.apk diff --git a/metadata/com.caydey.ffshare.yml b/metadata/com.caydey.ffshare.yml index 8661e9c5f6..ff95e15100 100644 --- a/metadata/com.caydey.ffshare.yml +++ b/metadata/com.caydey.ffshare.yml @@ -93,14 +93,10 @@ Builds: versionCode: 8 commit: 0b56dc05dfe76dd3c976cd9ad67f19637a5f4926 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes -AutoUpdateMode: Version v%v +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.2.0 CurrentVersionCode: 8 diff --git a/metadata/com.forrestguice.suntimeswidget.yml b/metadata/com.forrestguice.suntimeswidget.yml index cde2848e59..a104524451 100644 --- a/metadata/com.forrestguice.suntimeswidget.yml +++ b/metadata/com.forrestguice.suntimeswidget.yml @@ -697,6 +697,7 @@ Builds: - versionName: 0.14.9 versionCode: 93 + disable: https://github.com/forrestguice/SuntimesWidget/issues/637 commit: b194e3bc99567edf26bf06e4c93b23dc3ed0feda subdir: app gradle: diff --git a/metadata/com.fox2code.mmm.fdroid.yml b/metadata/com.fox2code.mmm.fdroid.yml index 51fa4dacf0..bd97cc38eb 100644 --- a/metadata/com.fox2code.mmm.fdroid.yml +++ b/metadata/com.fox2code.mmm.fdroid.yml @@ -285,8 +285,6 @@ Builds: - fdroid rm: - examples - scanignore: - - app/src/main/res/raw/androidacy_root_ca MaintainerNotes: |- * NonFreeNet — Depends on GitHub for modules downloading. diff --git a/metadata/com.rtbishop.look4sat.yml b/metadata/com.rtbishop.look4sat.yml index 4689a53d94..325a05f0e8 100644 --- a/metadata/com.rtbishop.look4sat.yml +++ b/metadata/com.rtbishop.look4sat.yml @@ -232,10 +232,6 @@ Builds: versionCode: 312 commit: b156f666ef27a1407a57ce915ebd3d8caa2ffc3b subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.tughi.aggregator.yml b/metadata/com.tughi.aggregator.yml index 19d316b167..7de0f2e546 100644 --- a/metadata/com.tughi.aggregator.yml +++ b/metadata/com.tughi.aggregator.yml @@ -31,8 +31,7 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y openjdk-11-jdk-headless tree - - update-alternatives --auto java + - apt-get install -y tree gradle: - fdroid diff --git a/metadata/edu.rit.csh.devin.yml b/metadata/edu.rit.csh.devin.yml index 89a6d75c3e..9315503b3a 100644 --- a/metadata/edu.rit.csh.devin.yml +++ b/metadata/edu.rit.csh.devin.yml @@ -55,10 +55,6 @@ Builds: - versionName: 1.1.1 versionCode: 5 commit: 0e65941d185ab7e14b2d0a4472dfa02c168c2230 - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@3.0.5 diff --git a/metadata/me.blog.korn123.easydiary.yml b/metadata/me.blog.korn123.easydiary.yml index bfb8beedf2..5c8abad256 100644 --- a/metadata/me.blog.korn123.easydiary.yml +++ b/metadata/me.blog.korn123.easydiary.yml @@ -743,10 +743,9 @@ Builds: gradle: - foss - - versionName: 1.4.282.202210220 - versionCode: 282 - disable: https://github.com/hanjoongcho/aaf-easydiary/issues/199 - commit: b52897d86b2bea98253638118dce482d65f0eb21 + - versionName: 1.4.283.202210240 + versionCode: 283 + commit: 0a6bab9f822cff19d3c1a51b6d903cc90e31064b subdir: app gradle: - foss diff --git a/metadata/me.konyaco.collinsdictionary.yml b/metadata/me.konyaco.collinsdictionary.yml index 1989c5a9ab..42c21abd3b 100644 --- a/metadata/me.konyaco.collinsdictionary.yml +++ b/metadata/me.konyaco.collinsdictionary.yml @@ -44,7 +44,7 @@ Builds: subdir: android gradle: - yes - prebuild: sed -i -e '/maven.pkg.jetbrains.space/d' build.gradle.kts settings.gradle.kts + prebuild: sed -i -e '/maven.pkg.jetbrains.space/d' ../build.gradle.kts ../settings.gradle.kts AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/open.com.permissionsmanager.yml b/metadata/open.com.permissionsmanager.yml index d8f2a926b0..0a510324ee 100644 --- a/metadata/open.com.permissionsmanager.yml +++ b/metadata/open.com.permissionsmanager.yml @@ -71,10 +71,6 @@ Builds: versionCode: 8 commit: c503f6fadcf959d0a278bb04a2c004082521cd93 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes prebuild: echo 'android { lintOptions { abortOnError false } }' >> build.gradle diff --git a/metadata/org.hlwd.bible.yml b/metadata/org.hlwd.bible.yml index 7250296fb2..394928bcdc 100644 --- a/metadata/org.hlwd.bible.yml +++ b/metadata/org.hlwd.bible.yml @@ -401,10 +401,6 @@ Builds: versionCode: 20221020 commit: e6e835fdf4e5c5a5a39713ea4632e746dfc12541 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.koreader.launcher.fdroid.yml b/metadata/org.koreader.launcher.fdroid.yml index 5b6758d3b2..b3cd6a52cb 100644 --- a/metadata/org.koreader.launcher.fdroid.yml +++ b/metadata/org.koreader.launcher.fdroid.yml @@ -343,7 +343,8 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y gcc-multilib luarocks p7zip-full ragel + - apt-get install -y make gcc-multilib luarocks ragel python-is-python3 wget + cmake autoconf automake libtool pkg-config nasm gettext output: koreader-android-*.apk rm: - platform/ubuntu-touch/ diff --git a/metadata/souch.smp.yml b/metadata/souch.smp.yml index 9b9176531a..f26e9d862b 100644 --- a/metadata/souch.smp.yml +++ b/metadata/souch.smp.yml @@ -253,16 +253,6 @@ Builds: versionCode: 28 commit: fd394ec7af5701ec2e0322a09abab17c66bc65e4 subdir: app - gradle: - - free - prebuild: - - sed -i -e '18a google()' ../build.gradle - - echo 'android { lintOptions { isAbortOnError = false }}' >> build.gradle - - - versionName: '2.1' - versionCode: 29 - commit: 64cc1e976e2cb53c2c6d48ee0a057a2d2b00b199 - subdir: app sudo: - apt-get update - apt-get install -y openjdk-11-jdk-headless @@ -271,7 +261,17 @@ Builds: - free prebuild: sed -i -e '18a google()' ../build.gradle -AutoUpdateMode: Version v%v + - versionName: '2.1' + versionCode: 29 + commit: 64cc1e976e2cb53c2c6d48ee0a057a2d2b00b199 + subdir: app + gradle: + - free + prebuild: + - sed -i -e '18a google()' ../build.gradle + - echo 'android { lintOptions { isAbortOnError = false }}' >> build.gradle + +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: '2.1' CurrentVersionCode: 29