From ee5b8a07c2f1a1ca2531f5b096ea0a3c7f72bc3b Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 28 Feb 2022 00:02:29 +0800 Subject: [PATCH] misc fixes --- metadata/com.apk.editor.yml | 4 +-- ....greenaddress.greenbits_android_wallet.yml | 4 --- metadata/com.serwylo.babyphone.yml | 4 +++ metadata/com.unciv.app.yml | 2 ++ metadata/com.wire.yml | 2 +- .../de.markusfisch.android.pielauncher.yml | 4 +++ metadata/de.tutao.tutanota.yml | 1 + metadata/dev.linwood.butterfly.yml | 2 +- metadata/eu.pretix.pretixscan.droid.yml | 36 +------------------ metadata/it.danieleverducci.nextcloudmaps.yml | 4 +++ metadata/org.tether.tether.yml | 7 ++-- 11 files changed, 21 insertions(+), 49 deletions(-) diff --git a/metadata/com.apk.editor.yml b/metadata/com.apk.editor.yml index ca5c3d5f97..1212431de0 100644 --- a/metadata/com.apk.editor.yml +++ b/metadata/com.apk.editor.yml @@ -157,12 +157,10 @@ Builds: subdir: app sudo: - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk + - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java gradle: - full - scanignore: - - app/src/full/assets/APKEditor AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index 3f4e746ab6..cd581037d2 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -2384,10 +2384,6 @@ Builds: - cpython@v3.9.6 - rustup@1.24.3 prebuild: sed -i -e 's/-p python3/-p python3.9/' crypto/prepare_gdk_clang.sh - scanignore: - - app/src/main/assets/production/checkpoints - scandelete: - - app/src/main/assets/btctestnet/checkpoints build: - $$rustup$$/rustup-init.sh -y - source $HOME/.cargo/env diff --git a/metadata/com.serwylo.babyphone.yml b/metadata/com.serwylo.babyphone.yml index bee97e5ff2..4e766a9913 100644 --- a/metadata/com.serwylo.babyphone.yml +++ b/metadata/com.serwylo.babyphone.yml @@ -59,6 +59,10 @@ Builds: versionCode: 9 commit: ed101e787e2065d0ef65b004ee8ac4294f2a4573 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 41ba5900a9..b372d35d6b 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -2690,6 +2690,8 @@ Builds: - desktop prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' > /dev/null + scandelete: + - site/sitemap.xml.gz AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.wire.yml b/metadata/com.wire.yml index 6e9616f2cc..6236a78a30 100644 --- a/metadata/com.wire.yml +++ b/metadata/com.wire.yml @@ -68,7 +68,7 @@ Builds: - versionName: 3.80.23 versionCode: 2649586 - commit: 3.80.23 + commit: f3b14e9a2b5eae6758ffe89d158fe9b8bf6b76d2 subdir: app gradle: - fdroid diff --git a/metadata/de.markusfisch.android.pielauncher.yml b/metadata/de.markusfisch.android.pielauncher.yml index 6913bfffd7..f0fffeca6b 100644 --- a/metadata/de.markusfisch.android.pielauncher.yml +++ b/metadata/de.markusfisch.android.pielauncher.yml @@ -32,6 +32,10 @@ Builds: versionCode: 20 commit: cd1efbba234873475051f53af82e928d45010dae subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index 953ae965f4..d802459b3a 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -1543,6 +1543,7 @@ Builds: - versionName: 3.93.2 versionCode: 393020 + disable: https://github.com/tutao/tutanota/issues/3930 commit: c897c6654aef716016d2a5f3deec984dc2e363de subdir: app-android/app sudo: diff --git a/metadata/dev.linwood.butterfly.yml b/metadata/dev.linwood.butterfly.yml index 88ed2277c9..40778b9496 100644 --- a/metadata/dev.linwood.butterfly.yml +++ b/metadata/dev.linwood.butterfly.yml @@ -210,7 +210,7 @@ Builds: - update-alternatives --auto java output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.8.1 + - flutter@2.10.1 rm: - app/ios - app/linux diff --git a/metadata/eu.pretix.pretixscan.droid.yml b/metadata/eu.pretix.pretixscan.droid.yml index da7ff4b485..e122fe680a 100644 --- a/metadata/eu.pretix.pretixscan.droid.yml +++ b/metadata/eu.pretix.pretixscan.droid.yml @@ -169,43 +169,9 @@ Builds: - gradle publishToMavenLocal - popd - - versionName: 1.13.2 - versionCode: 63 - disable: Could not determine java version from '11.0.6'. - commit: 3f71098dc7f1c86cc473397f316fd3c8a07c373c - subdir: pretixscan/app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - pretix - srclibs: - - saki4510t-libcommon@2.12.4 - - covpass-android@v-1.165.6 - prebuild: - - sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|' - -e 's|maven.pkg.github.com/ehn-dcc-development/*|jitpack.io|' -i -e '/repositories - {/a mavenLocal()' ../build.gradle - - sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2') - {exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2') - {exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^ }/d' - -i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle - scandelete: - - pretixscan/libpretixui-repo - build: - - pushd $$saki4510t-libcommon$$/common - - gradle uploadArchives - - popd - - mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar - ../libpretixui-repo/common/common.aar - - pushd $$covpass-android$$ - - gradle publishToMavenLocal - - popd - - versionName: 1.13.3 versionCode: 64 + disable: Could not determine java version from '11.0.6'. commit: 0957482cee7b17d224da04805d4853cb24e9aaae subdir: pretixscan/app submodules: true diff --git a/metadata/it.danieleverducci.nextcloudmaps.yml b/metadata/it.danieleverducci.nextcloudmaps.yml index e88aa03642..44c8a8f90e 100644 --- a/metadata/it.danieleverducci.nextcloudmaps.yml +++ b/metadata/it.danieleverducci.nextcloudmaps.yml @@ -39,6 +39,10 @@ Builds: versionCode: 7 commit: 7efd2a2f8b27003d26f30bd24a8fde5402108b48 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.tether.tether.yml b/metadata/org.tether.tether.yml index db3b178d1b..b10fddd2b6 100644 --- a/metadata/org.tether.tether.yml +++ b/metadata/org.tether.tether.yml @@ -332,11 +332,8 @@ Builds: submodules: true output: build/app/outputs/apk/release/app-release.apk srclibs: - - flutter@2.5.3 - prebuild: - - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output - -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle - - $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' + - flutter@2.10.1 + prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404' build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get