From 5711f48875dec3864c6e5cd49b4420acfd537cb2 Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 23 Jul 2022 15:52:49 +0800 Subject: [PATCH] misc fixes --- metadata/com.czy0729.bangumi.yml | 1 + metadata/com.gianlu.aria2android.yml | 22 ++----------------- metadata/com.gianlu.aria2app.yml | 22 ++----------------- ....greenaddress.greenbits_android_wallet.yml | 1 + metadata/com.jerboa.yml | 1 + metadata/com.nextcloud.talk2.yml | 4 ++++ metadata/com.pvpc.precio_luz.yml | 1 + metadata/com.torrents_csv_android.yml | 4 +++- metadata/de.monocles.mail.yml | 4 +--- metadata/network.loki.messenger.fdroid.yml | 1 + 10 files changed, 17 insertions(+), 44 deletions(-) diff --git a/metadata/com.czy0729.bangumi.yml b/metadata/com.czy0729.bangumi.yml index 789ad1932b..693bde16f5 100644 --- a/metadata/com.czy0729.bangumi.yml +++ b/metadata/com.czy0729.bangumi.yml @@ -139,6 +139,7 @@ Builds: - versionName: 6.6.0 versionCode: 60600 + disable: https://github.com/czy0729/Bangumi/issues/41 commit: 43335bf1d3985761df37756634f19f35d45cfdf3 subdir: android/app sudo: diff --git a/metadata/com.gianlu.aria2android.yml b/metadata/com.gianlu.aria2android.yml index 49131469f2..b3d5b17f12 100644 --- a/metadata/com.gianlu.aria2android.yml +++ b/metadata/com.gianlu.aria2android.yml @@ -334,24 +334,6 @@ Builds: - aria2lib/src/main/jniLibs ndk: r21d - - versionName: 2.6.4 - versionCode: 72 - commit: 10db1cce5742cefcbd1d0bdd450312571933071d - timeout: 14400 - subdir: app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java - gradle: - - foss - prebuild: sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle - ../CommonUtils/build.gradle - scandelete: - - aria2lib/src/main/jniLibs - ndk: r21d - - versionName: 2.6.5 versionCode: 73 commit: aefc7b9fd78ed6669f3ffc65e1403069e5607251 @@ -360,7 +342,7 @@ Builds: submodules: true 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: - foss @@ -368,7 +350,7 @@ Builds: ../CommonUtils/build.gradle scandelete: - aria2lib/src/main/jniLibs - ndk: r21d + ndk: r25 AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.gianlu.aria2app.yml b/metadata/com.gianlu.aria2app.yml index 8e81972e51..a500ba2478 100644 --- a/metadata/com.gianlu.aria2app.yml +++ b/metadata/com.gianlu.aria2app.yml @@ -728,24 +728,6 @@ Builds: - aria2lib/src/main/jniLibs ndk: r21d - - versionName: 5.9.10 - versionCode: 222 - commit: 353023c14260d757324bba6c012159f9d82952ed - timeout: 14400 - subdir: app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java - gradle: - - foss - prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle - ../CommonUtils/build.gradle - scandelete: - - aria2lib/src/main/jniLibs - ndk: r21d - - versionName: 5.9.11 versionCode: 223 commit: 50d1ff537dd29df3e76cc1cc5bf3b8282c65a0d1 @@ -754,7 +736,7 @@ Builds: submodules: true 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: - foss @@ -762,7 +744,7 @@ Builds: ../CommonUtils/build.gradle scandelete: - aria2lib/src/main/jniLibs - ndk: r21d + ndk: r25 AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index d874a9b833..e0a9a0d477 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -2494,6 +2494,7 @@ Builds: - versionName: 3.8.5 versionCode: 22000385 + disable: https://github.com/Blockstream/green_android/issues/150 commit: 5354b9dab14e2daf488be287477d10041d330eb1 timeout: 25200 subdir: green diff --git a/metadata/com.jerboa.yml b/metadata/com.jerboa.yml index 73a8588f42..e4940b9b26 100644 --- a/metadata/com.jerboa.yml +++ b/metadata/com.jerboa.yml @@ -147,6 +147,7 @@ Builds: - update-alternatives --auto java gradle: - yes + prebuild: sed -i -e 's/7.5-rc-2/7.5/' ../gradle/wrapper/gradle-wrapper.properties AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.nextcloud.talk2.yml b/metadata/com.nextcloud.talk2.yml index 8740aa594d..b54ba2650d 100644 --- a/metadata/com.nextcloud.talk2.yml +++ b/metadata/com.nextcloud.talk2.yml @@ -617,6 +617,10 @@ Builds: versionCode: 140010090 commit: 2596bc1ab183f6829df1b8779bf49f5560c1bf51 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - generic prebuild: sed -i -e '/work-firebase/d' build.gradle diff --git a/metadata/com.pvpc.precio_luz.yml b/metadata/com.pvpc.precio_luz.yml index 303f1ddf7e..4122a5fc1c 100644 --- a/metadata/com.pvpc.precio_luz.yml +++ b/metadata/com.pvpc.precio_luz.yml @@ -20,6 +20,7 @@ Builds: - apt-get update || apt-get update - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java + - rm -fr /opt/android-sdk/ndk/* output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@2.5.3 diff --git a/metadata/com.torrents_csv_android.yml b/metadata/com.torrents_csv_android.yml index f25e5a8544..9d1ea5f7b1 100644 --- a/metadata/com.torrents_csv_android.yml +++ b/metadata/com.torrents_csv_android.yml @@ -51,7 +51,9 @@ Builds: - update-alternatives --auto java gradle: - yes - prebuild: sed -i -e '/keystoreProperties.load/d' build.gradle + prebuild: + - sed -i -e '/keystoreProperties.load/d' build.gradle + - sed -i -e 's/7.5-rc-2/7.5/' ../gradle/wrapper/gradle-wrapper.properties AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/de.monocles.mail.yml b/metadata/de.monocles.mail.yml index a477273b14..d2def76afb 100644 --- a/metadata/de.monocles.mail.yml +++ b/metadata/de.monocles.mail.yml @@ -75,15 +75,13 @@ Builds: - versionName: '2.0' versionCode: 6 commit: eabb637cd2f5deed39b59ab57f6cc4a2eb9fa79b - subdir: monoclesmail + subdir: app/k9mail sudo: - apt-get update || apt-get update - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java gradle: - yes - rm: - - tools/android-studio/settings.jar AutoUpdateMode: Version v%v UpdateCheckMode: Tags v\d+\.\d+(\.\d+)? diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml index f08eeb2f73..342b615ffc 100644 --- a/metadata/network.loki.messenger.fdroid.yml +++ b/metadata/network.loki.messenger.fdroid.yml @@ -83,6 +83,7 @@ Builds: - app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt - app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt prebuild: + - echo -e '\nandroid.jetifier.blacklist=protobuf-lite-3.0.1.jar' >> ../gradle.properties - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' ../build.gradle - sed -i -e '/gms/d' -e '/firebase-messaging/,/^ }/d' -e '/enable true/d' -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/android-database-sqlcipher/s/org.signal/net.zetetic/'