From cbfb3e4b4d9fdd03921eca8c313563acc32ab6d9 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 15 Mar 2024 23:16:54 +0800 Subject: [PATCH] misc fixes --- metadata/com.appmindlab.nano.yml | 4 ---- metadata/com.bobek.compass.yml | 3 --- metadata/com.bobek.metronome.yml | 3 --- metadata/com.corphish.quicktools.yml | 3 --- metadata/com.donnnno.arcticons.daynight.yml | 3 --- metadata/com.donnnno.arcticons.light.yml | 3 --- metadata/com.donnnno.arcticons.yml | 3 --- metadata/com.donnnno.arcticons.you.yml | 3 --- metadata/com.elasticrock.candle.yml | 3 --- metadata/com.github.andreyasadchy.xtra.yml | 3 --- metadata/com.mrsep.musicrecognizer.yml | 3 --- metadata/com.nextcloud.android.beta.yml | 3 --- metadata/com.orgzlyrevived.yml | 4 ++-- metadata/com.stypox.mastercom_workbook.yml | 3 --- metadata/com.termoneplus.yml | 3 --- metadata/com.unciv.app.yml | 4 ---- metadata/de.chadenas.cpudefense.yml | 4 ++++ metadata/de.tnmgl.ntodotxt.yml | 3 --- metadata/eu.faircode.email.yml | 4 ---- metadata/me.x2gd4.dollphone.yml | 4 ++++ metadata/mobi.maptrek.yml | 4 ---- metadata/org.xphnx.ameixa.yml | 2 +- metadata/org.xphnx.ameixamonochrome.yml | 2 +- metadata/top.fumiama.copymanga.yml | 3 --- 24 files changed, 12 insertions(+), 65 deletions(-) diff --git a/metadata/com.appmindlab.nano.yml b/metadata/com.appmindlab.nano.yml index f7fc41f84e..186693e507 100644 --- a/metadata/com.appmindlab.nano.yml +++ b/metadata/com.appmindlab.nano.yml @@ -806,10 +806,6 @@ Builds: versionCode: 1321 commit: 8302f1a875d0e8b08e3e446e51300b707121e75b subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a gradle: - yes prebuild: echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties diff --git a/metadata/com.bobek.compass.yml b/metadata/com.bobek.compass.yml index d948c59a58..41419f45b9 100644 --- a/metadata/com.bobek.compass.yml +++ b/metadata/com.bobek.compass.yml @@ -180,9 +180,6 @@ Builds: versionCode: 20 commit: 0b9f0bbe6137179129c9eba99497289bf54a4c17 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.bobek.metronome.yml b/metadata/com.bobek.metronome.yml index 66b53fe72b..e62230298b 100644 --- a/metadata/com.bobek.metronome.yml +++ b/metadata/com.bobek.metronome.yml @@ -115,9 +115,6 @@ Builds: versionCode: 11 commit: 5f6a60e2cbe106608d4c080a42f6211e96a7f4db subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.corphish.quicktools.yml b/metadata/com.corphish.quicktools.yml index ccd204b5e2..d43da0e52a 100644 --- a/metadata/com.corphish.quicktools.yml +++ b/metadata/com.corphish.quicktools.yml @@ -39,9 +39,6 @@ Builds: versionCode: 6 commit: 67d8a0ff1d3471626497158c3d0f88f7d30aa473 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.donnnno.arcticons.daynight.yml b/metadata/com.donnnno.arcticons.daynight.yml index 9959406ca2..6882a4c777 100644 --- a/metadata/com.donnnno.arcticons.daynight.yml +++ b/metadata/com.donnnno.arcticons.daynight.yml @@ -65,9 +65,6 @@ Builds: versionCode: 131 commit: 12aad418f25c81302ed981cfbce499dc46f9d452 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - dayNight srclibs: diff --git a/metadata/com.donnnno.arcticons.light.yml b/metadata/com.donnnno.arcticons.light.yml index 33d6812126..47d4fc6682 100644 --- a/metadata/com.donnnno.arcticons.light.yml +++ b/metadata/com.donnnno.arcticons.light.yml @@ -65,9 +65,6 @@ Builds: versionCode: 131 commit: 12aad418f25c81302ed981cfbce499dc46f9d452 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - black srclibs: diff --git a/metadata/com.donnnno.arcticons.yml b/metadata/com.donnnno.arcticons.yml index 7b30c2922a..56a14d4187 100644 --- a/metadata/com.donnnno.arcticons.yml +++ b/metadata/com.donnnno.arcticons.yml @@ -65,9 +65,6 @@ Builds: versionCode: 131 commit: 12aad418f25c81302ed981cfbce499dc46f9d452 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - normal srclibs: diff --git a/metadata/com.donnnno.arcticons.you.yml b/metadata/com.donnnno.arcticons.you.yml index c4b2cc15da..0c4a196757 100644 --- a/metadata/com.donnnno.arcticons.you.yml +++ b/metadata/com.donnnno.arcticons.you.yml @@ -204,9 +204,6 @@ Builds: versionCode: 131 commit: 12aad418f25c81302ed981cfbce499dc46f9d452 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - you srclibs: diff --git a/metadata/com.elasticrock.candle.yml b/metadata/com.elasticrock.candle.yml index 67133b78cc..80a9891b5e 100644 --- a/metadata/com.elasticrock.candle.yml +++ b/metadata/com.elasticrock.candle.yml @@ -72,9 +72,6 @@ Builds: versionCode: 8 commit: 71ac187b38c056836411872bb80d4cb854cde3e5 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes srclibs: diff --git a/metadata/com.github.andreyasadchy.xtra.yml b/metadata/com.github.andreyasadchy.xtra.yml index b555b22cf9..8774af9d9c 100644 --- a/metadata/com.github.andreyasadchy.xtra.yml +++ b/metadata/com.github.andreyasadchy.xtra.yml @@ -1358,9 +1358,6 @@ Builds: versionCode: 230 commit: 38fd9cd12cce661105fc6394f848d59844059e0f subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.mrsep.musicrecognizer.yml b/metadata/com.mrsep.musicrecognizer.yml index 747475b2e2..9b813d0ec0 100644 --- a/metadata/com.mrsep.musicrecognizer.yml +++ b/metadata/com.mrsep.musicrecognizer.yml @@ -174,9 +174,6 @@ Builds: versionCode: 15 commit: fd7031365632a9e11e17d945e7f649ec119f9a62 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml index cfac451aa4..6e238ae5a8 100644 --- a/metadata/com.nextcloud.android.beta.yml +++ b/metadata/com.nextcloud.android.beta.yml @@ -13371,9 +13371,6 @@ Builds: versionCode: 20240315 commit: 3bff3de738db7f35321d0ac61f67089c1267072d subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - versionDev rm: diff --git a/metadata/com.orgzlyrevived.yml b/metadata/com.orgzlyrevived.yml index 5714f70fb5..b6a339a2cc 100644 --- a/metadata/com.orgzlyrevived.yml +++ b/metadata/com.orgzlyrevived.yml @@ -47,8 +47,8 @@ Builds: sudo: - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update - - apt-get remove openjdk-17-jdk-headless openjdk-17-jre-headless - - apt-get install -y -t bullseye apksigner openjdk-11-jdk-headless + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 gradle: - fdroid diff --git a/metadata/com.stypox.mastercom_workbook.yml b/metadata/com.stypox.mastercom_workbook.yml index 887669c379..5a15307cd0 100644 --- a/metadata/com.stypox.mastercom_workbook.yml +++ b/metadata/com.stypox.mastercom_workbook.yml @@ -99,9 +99,6 @@ Builds: versionCode: 703 commit: 864dd5576920690a42e5adc5af97c0982c3ad084 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.termoneplus.yml b/metadata/com.termoneplus.yml index f3313d6234..88d1b16a1f 100644 --- a/metadata/com.termoneplus.yml +++ b/metadata/com.termoneplus.yml @@ -300,9 +300,6 @@ Builds: versionCode: 471 commit: 5b72c8a267bddb01676bbe05ce7e7803e65132d4 subdir: term - sudo: - - apt-get update - - update-java-alternatives -a gradle: - full prebuild: sed -i -e 's/elf-cleaner/echo/' build.gradle diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 0d59bc0922..44f429c3ae 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -5583,10 +5583,6 @@ Builds: versionCode: 978 commit: 0eb79c520934f65a95fd24e9aede1b5379f0dba4 subdir: android - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a gradle: - yes rm: diff --git a/metadata/de.chadenas.cpudefense.yml b/metadata/de.chadenas.cpudefense.yml index 45bf0d4075..702b7f7ae3 100644 --- a/metadata/de.chadenas.cpudefense.yml +++ b/metadata/de.chadenas.cpudefense.yml @@ -189,6 +189,10 @@ Builds: - export CPUS=$(getconf _NPROCESSORS_ONLN) - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online ; done + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list + - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 gradle: - yes diff --git a/metadata/de.tnmgl.ntodotxt.yml b/metadata/de.tnmgl.ntodotxt.yml index 6636206fd5..11ccbcf895 100644 --- a/metadata/de.tnmgl.ntodotxt.yml +++ b/metadata/de.tnmgl.ntodotxt.yml @@ -1030,9 +1030,6 @@ Builds: commit: de32c4ceb20962140bb0d7aa2fac1e20662e0019 submodules: true sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a - mkdir -p /home/runner/ - chown vagrant /home/runner/ output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index 574d54656f..1c922c8579 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -7264,10 +7264,6 @@ Builds: commit: 2be24ec28191a2fe581dc3f4a365f4e5487852d2 subdir: app submodules: true - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a gradle: - fdroid prebuild: sdkmanager 'cmake;3.22.1' diff --git a/metadata/me.x2gd4.dollphone.yml b/metadata/me.x2gd4.dollphone.yml index 39dc4df71f..64e5192a43 100644 --- a/metadata/me.x2gd4.dollphone.yml +++ b/metadata/me.x2gd4.dollphone.yml @@ -94,6 +94,10 @@ Builds: versionCode: 10 commit: 34f8a757366172f4d4a17cd2391350df42b5de0e subdir: app + sudo: + - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 gradle: - yes srclibs: diff --git a/metadata/mobi.maptrek.yml b/metadata/mobi.maptrek.yml index 18a0697ebb..d944bb295e 100644 --- a/metadata/mobi.maptrek.yml +++ b/metadata/mobi.maptrek.yml @@ -221,10 +221,6 @@ Builds: versionCode: 106 commit: 797e83c4891875544af6ad3093f5a5dfd2b85b62 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a gradle: - yes prebuild: sed -i -e '/testOptions {/,/^ }/d' build.gradle diff --git a/metadata/org.xphnx.ameixa.yml b/metadata/org.xphnx.ameixa.yml index 53f88ef1a3..d45dcefe4b 100644 --- a/metadata/org.xphnx.ameixa.yml +++ b/metadata/org.xphnx.ameixa.yml @@ -280,8 +280,8 @@ Builds: sudo: - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update - - apt-get remove openjdk-17-jdk-headless openjdk-17-jre-headless - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 gradle: - chromatic prebuild: sed -i -e 's/gradle:4.1.1/gradle:4.2.0/' ../build.gradle diff --git a/metadata/org.xphnx.ameixamonochrome.yml b/metadata/org.xphnx.ameixamonochrome.yml index 009c520876..a06e0c0832 100644 --- a/metadata/org.xphnx.ameixamonochrome.yml +++ b/metadata/org.xphnx.ameixamonochrome.yml @@ -261,8 +261,8 @@ Builds: sudo: - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update - - apt-get remove openjdk-17-jdk-headless openjdk-17-jre-headless - apt-get install -y -t bullseye openjdk-11-jdk-headless + - update-java-alternatives --set java-1.11.0-openjdk-amd64 gradle: - monochromatic prebuild: diff --git a/metadata/top.fumiama.copymanga.yml b/metadata/top.fumiama.copymanga.yml index 5a363d68e0..3ef1268bfe 100644 --- a/metadata/top.fumiama.copymanga.yml +++ b/metadata/top.fumiama.copymanga.yml @@ -155,9 +155,6 @@ Builds: versionCode: 53 commit: f0e7802eb28a84ac910fbb49d5cf60cd2c596989 subdir: app - sudo: - - apt-get update - - update-java-alternatives -a gradle: - yes