From 4beb66a73d258a3bf87180ffde55fdd81fec35ed Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 1 Aug 2021 23:52:39 +0800 Subject: [PATCH] misc fixes --- metadata/com.jens.automation2.yml | 1 + metadata/com.machiav3lli.derdiedas.yml | 4 +++ metadata/com.newsblur.yml | 34 +++++++++++++++++++++++ metadata/com.tailscale.ipn.yml | 18 ------------ metadata/de.danoeh.antennapod.yml | 1 + metadata/dev.marchello.sharik.yml | 9 +++--- metadata/info.dvkr.screenstream.yml | 1 + metadata/it.niedermann.nextcloud.deck.yml | 4 +++ metadata/org.metabrainz.android.yml | 4 +++ metadata/org.oxycblt.auxio.yml | 4 +++ 10 files changed, 57 insertions(+), 23 deletions(-) diff --git a/metadata/com.jens.automation2.yml b/metadata/com.jens.automation2.yml index 1e647b2c26..395ab83153 100644 --- a/metadata/com.jens.automation2.yml +++ b/metadata/com.jens.automation2.yml @@ -76,6 +76,7 @@ Builds: - versionName: 1.6.36 versionCode: 107 + disable: cannot find symbol commit: 7415830dd774b641d33a9b010c8ad2d03f572323 subdir: app gradle: diff --git a/metadata/com.machiav3lli.derdiedas.yml b/metadata/com.machiav3lli.derdiedas.yml index 6769f08f12..800fca9ecf 100644 --- a/metadata/com.machiav3lli.derdiedas.yml +++ b/metadata/com.machiav3lli.derdiedas.yml @@ -44,6 +44,10 @@ Builds: versionCode: 2002 commit: bf15902e18365b13b968686e92663393786413c4 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.newsblur.yml b/metadata/com.newsblur.yml index d908631d3e..87ada18858 100644 --- a/metadata/com.newsblur.yml +++ b/metadata/com.newsblur.yml @@ -1430,6 +1430,40 @@ Builds: - echo 'package com.newsblur.activity;public class Premium extends NbActivity{}' > src/com/newsblur/activity/Premium.java + - versionName: '11.0' + versionCode: 193 + commit: 3915e3c53b3c7c7e48837b84edb0c17fd879285c + subdir: clients/android/NewsBlur + gradle: + - yes + rm: + - api + - apps + - clients/ios + - config + - docker + - documents + - flask_monitor + - logs + - media + - newsblur_web + - node + - perf + - templates + - terraform + - utils + - vendor + - '[_a-z]*.*' + - clients/android/NewsBlur/libs/*.jar + - clients/android/NewsBlur/buildtools/*.jar + prebuild: + - sed -i -e '/com.google.android.play/d' -e '/billingclient/d' build.gradle + - sed -i -e '/play.core/d' -e '/void checkInAppReview/,/^ }/d' -e '/checkInAppReview/d' + -e '/void onBackPressed/a super.onBackPressed();}' -e '/reviewInfo != null/,/^ }/d' + -e '/Review/d' src/com/newsblur/activity/FeedItemsList.java + - echo 'package com.newsblur.activity;public class Premium extends NbActivity{}' + > src/com/newsblur/activity/Premium.java + AutoUpdateMode: None UpdateCheckMode: RepoManifest CurrentVersion: '11.0' diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml index 673ba642dd..09084abbf1 100644 --- a/metadata/com.tailscale.ipn.yml +++ b/metadata/com.tailscale.ipn.yml @@ -349,24 +349,6 @@ Builds: - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar ndk: r21e - - versionName: 1.11.151-d145c594ad6-g7a00ad639b4 - versionCode: 51 - commit: 0df2377630d3c3c4a7f174287c8e9ca73817a109 - subdir: android - gradle: - - fdroid - prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - > /dev/null - build: - - curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz - - echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz" - | sha256sum -c - - - tar xzf go.tar.gz - - export ANDROID_SDK_ROOT=$$SDK$$ - - export ANDROID_NDK_ROOT=$$NDK$$ - - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar - ndk: r21e - - versionName: 1.11.151-d145c594ad6-g7b2e61e80cd versionCode: 53 commit: b01927dbcc2bce42cb828cb44207a99ef799f53d diff --git a/metadata/de.danoeh.antennapod.yml b/metadata/de.danoeh.antennapod.yml index 6511d36434..44051e7adb 100644 --- a/metadata/de.danoeh.antennapod.yml +++ b/metadata/de.danoeh.antennapod.yml @@ -745,6 +745,7 @@ Builds: gradle: - free prebuild: sed -i -r -e '/play(Api|Implementation)/d' build.gradle ../core/build.gradle + ndk: r20 MaintainerNotes: |- Summary and Description have been moved to the new localizable text files: diff --git a/metadata/dev.marchello.sharik.yml b/metadata/dev.marchello.sharik.yml index 2b52a325eb..73c9192577 100644 --- a/metadata/dev.marchello.sharik.yml +++ b/metadata/dev.marchello.sharik.yml @@ -27,12 +27,11 @@ Builds: - versionName: 3.0.0 versionCode: 11 - commit: 501baf76243156f8eaca3832fa880ce0c617f4c4 - output: build/app/outputs/apk/release/app-release.apk + disable: version mismatch + commit: v3.0.1 + output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@1.22.5 - prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all - { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle + - flutter@2.2.3 build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml index 54b3078d73..cba2453238 100644 --- a/metadata/info.dvkr.screenstream.yml +++ b/metadata/info.dvkr.screenstream.yml @@ -683,6 +683,7 @@ Builds: - versionName: 3.7.4 versionCode: 30704 + disable: https://github.com/dkrivoruchko/ScreenStream/issues/181 commit: 17d75190c9045531e0023687c135d0e57cb27157 subdir: app gradle: diff --git a/metadata/it.niedermann.nextcloud.deck.yml b/metadata/it.niedermann.nextcloud.deck.yml index dd2c6163ca..49a858f0ce 100644 --- a/metadata/it.niedermann.nextcloud.deck.yml +++ b/metadata/it.niedermann.nextcloud.deck.yml @@ -609,6 +609,10 @@ Builds: versionCode: 1019002 commit: 5ac4769517827b2643a3bc0a168f20a6f9056cb4 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - fdroid diff --git a/metadata/org.metabrainz.android.yml b/metadata/org.metabrainz.android.yml index 1eb003f114..47819fac9e 100644 --- a/metadata/org.metabrainz.android.yml +++ b/metadata/org.metabrainz.android.yml @@ -40,6 +40,10 @@ Builds: versionCode: 41 commit: 4c1c57c5e989129872dc664661c9e83f655003cf subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes ndk: r21c diff --git a/metadata/org.oxycblt.auxio.yml b/metadata/org.oxycblt.auxio.yml index f53a18c2bc..a7d2541808 100644 --- a/metadata/org.oxycblt.auxio.yml +++ b/metadata/org.oxycblt.auxio.yml @@ -25,6 +25,10 @@ Builds: versionCode: 7 commit: cd0167405eeba492470632c508ab9150b0e068a1 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes