From 6e0ea15ec89e5f90e5f993993c41b0c00273a61f Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 25 Mar 2024 01:24:18 +0800 Subject: [PATCH] misc fixes --- metadata/net.bible.android.activity.yml | 5 +---- metadata/net.leodesouza.blitz.yml | 6 +++--- metadata/org.briarproject.briar.android.yml | 5 +++++ metadata/org.olpc_france.sugarizer.yml | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index 3a54f42faf..e72f7a69d6 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -1571,10 +1571,7 @@ Builds: subdir: app sudo: - apt-get update - - curl -Lo node.tar.gz https://nodejs.org/dist/v20.9.0/node-v20.9.0-linux-x64.tar.gz - - echo "f0919f092fbf74544438907fa083c21e76b2d7a4bc287f0607ada1553ef16f60 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y npm gradle: - standard - fdroid diff --git a/metadata/net.leodesouza.blitz.yml b/metadata/net.leodesouza.blitz.yml index 08a8c49cc0..55d081b856 100644 --- a/metadata/net.leodesouza.blitz.yml +++ b/metadata/net.leodesouza.blitz.yml @@ -58,9 +58,9 @@ Builds: gradle: - yes - - versionName: 1.5.8 - versionCode: 158 - commit: 9fefc801cd4643db4a1e4c9c027cabaaf3d65b68 + - versionName: 1.5.4 + versionCode: 154 + commit: c82d72a785b1947742fc77419805ed19030ab21a subdir: app gradle: - yes diff --git a/metadata/org.briarproject.briar.android.yml b/metadata/org.briarproject.briar.android.yml index 9ead41b64d..94ce0d8f84 100644 --- a/metadata/org.briarproject.briar.android.yml +++ b/metadata/org.briarproject.briar.android.yml @@ -632,6 +632,11 @@ Builds: versionCode: 10510 commit: fe6ce2fe6728ba7506ed535ad1b74109f2c57ae8 subdir: briar-android + sudo: + - 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: - official rm: diff --git a/metadata/org.olpc_france.sugarizer.yml b/metadata/org.olpc_france.sugarizer.yml index 7d5a94720c..176a5ad547 100644 --- a/metadata/org.olpc_france.sugarizer.yml +++ b/metadata/org.olpc_france.sugarizer.yml @@ -121,6 +121,10 @@ Builds: commit: 5ccb1fee3fd3f36669fbbed4d8822f07cedccac1 subdir: app sudo: + - 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 - sdkmanager 'build-tools;33.0.0' 'build-tools;30.0.3' - cp /opt/android-sdk/build-tools/30.0.3/lib/dx.jar /opt/android-sdk/build-tools/33.0.0/lib/dx.jar - cp /opt/android-sdk/build-tools/30.0.3/dx /opt/android-sdk/build-tools/33.0.0/dx