From 5a55017ea6f2c136cc965afe783ce7d1e857f79c Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 12 Apr 2024 12:13:24 +0800 Subject: [PATCH] misc fixes --- metadata/com.karin.idTech4Amm.yml | 5 +- metadata/com.osfans.trime.yml | 7 +-- metadata/com.podverse.fdroid.yml | 52 ++++++------------- .../dev.develsinthedetails.eatpoopyoucat.yml | 11 ++-- 4 files changed, 27 insertions(+), 48 deletions(-) diff --git a/metadata/com.karin.idTech4Amm.yml b/metadata/com.karin.idTech4Amm.yml index 074417f438..2fd0eb6518 100644 --- a/metadata/com.karin.idTech4Amm.yml +++ b/metadata/com.karin.idTech4Amm.yml @@ -102,15 +102,18 @@ Builds: - versionName: 1.1.0harmattan39natasha versionCode: 11039 + disable: https://github.com/glKarin/com.n0n3m4.diii4a/issues/164 commit: 36605f305ead4af8411cfbbdf6203d10358704da subdir: idTech4Amm sudo: - apt-get update - - apt-get install -y build-essential libtinfo5 + - apt-get install -y g++ libc-dev make libtinfo5 gradle: - yes scanignore: - idTech4Amm/src/main/assets/source + scandelete: + - Q3E/src/main/jni AutoUpdateMode: Version +natasha %v UpdateCheckMode: Tags .*-free diff --git a/metadata/com.osfans.trime.yml b/metadata/com.osfans.trime.yml index f3f07b1fc7..81a76a459f 100644 --- a/metadata/com.osfans.trime.yml +++ b/metadata/com.osfans.trime.yml @@ -399,15 +399,12 @@ Builds: - versionName: 3.2.17 versionCode: 20240301 - disable: nightly - commit: af709fea6d9c37ee4936606c0222d9afc946093a + commit: 98e201b9a95db15dc4eb6683e09475c3e5d0b0d3 subdir: app submodules: true sudo: - apt-get update - - apt-get -y install automake g++ libtool make - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a + - apt-get -y install automake g++ libtool make python-is-python3 gradle: - yes prebuild: diff --git a/metadata/com.podverse.fdroid.yml b/metadata/com.podverse.fdroid.yml index 42d4e2d0d8..572d63cc61 100644 --- a/metadata/com.podverse.fdroid.yml +++ b/metadata/com.podverse.fdroid.yml @@ -7539,14 +7539,8 @@ Builds: commit: 7063bd4c5d42551b5ea5d9992eccaab2b9cb9c39 subdir: android/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 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz - - echo "c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y npm - npm install -g yarn - sysctl fs.inotify.max_user_watches=524288 || true init: @@ -7559,10 +7553,11 @@ Builds: rm: - functions prebuild: - - echo -e '\norg.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g' >> ../gradle.properties + - echo -e '\norg.gradle.jvmargs=-Xmx4g' >> ../gradle.properties - echo -e "android { packagingOptions { pickFirst 'lib/**/*.so' } }" >> build.gradle - sed -i -e 's/enable enable.*/enable true/' -e 's/"armeabi-v7a", "x86", "arm64-v8a", - "x86_64"/"armeabi-v7a"/' build.gradle + "x86_64"/"armeabi-v7a"/' -e '/project.ext.react = \[/a nodeExecutableAndArgs:["node", + "--openssl-legacy-provider"],' build.gradle scanignore: - android/build.gradle - node_modules/hermes-engine @@ -7594,14 +7589,8 @@ Builds: commit: 7063bd4c5d42551b5ea5d9992eccaab2b9cb9c39 subdir: android/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 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz - - echo "c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y npm - npm install -g yarn - sysctl fs.inotify.max_user_watches=524288 || true init: @@ -7614,10 +7603,11 @@ Builds: rm: - functions prebuild: - - echo -e '\norg.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g' >> ../gradle.properties + - echo -e '\norg.gradle.jvmargs=-Xmx4g' >> ../gradle.properties - echo -e "android { packagingOptions { pickFirst 'lib/**/*.so' } }" >> build.gradle - sed -i -e 's/enable enable.*/enable true/' -e 's/"armeabi-v7a", "x86", "arm64-v8a", - "x86_64"/"x86"/' build.gradle + "x86_64"/"armeabi-v7a"/' -e '/project.ext.react = \[/a nodeExecutableAndArgs:["node", + "--openssl-legacy-provider"],' build.gradle scanignore: - android/build.gradle - node_modules/hermes-engine @@ -7649,14 +7639,8 @@ Builds: commit: 7063bd4c5d42551b5ea5d9992eccaab2b9cb9c39 subdir: android/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 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz - - echo "c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y npm - npm install -g yarn - sysctl fs.inotify.max_user_watches=524288 || true init: @@ -7669,10 +7653,11 @@ Builds: rm: - functions prebuild: - - echo -e '\norg.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g' >> ../gradle.properties + - echo -e '\norg.gradle.jvmargs=-Xmx4g' >> ../gradle.properties - echo -e "android { packagingOptions { pickFirst 'lib/**/*.so' } }" >> build.gradle - sed -i -e 's/enable enable.*/enable true/' -e 's/"armeabi-v7a", "x86", "arm64-v8a", - "x86_64"/"arm64-v8a"/' build.gradle + "x86_64"/"armeabi-v7a"/' -e '/project.ext.react = \[/a nodeExecutableAndArgs:["node", + "--openssl-legacy-provider"],' build.gradle scanignore: - android/build.gradle - node_modules/hermes-engine @@ -7704,14 +7689,8 @@ Builds: commit: 7063bd4c5d42551b5ea5d9992eccaab2b9cb9c39 subdir: android/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 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz - - echo "c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y npm - npm install -g yarn - sysctl fs.inotify.max_user_watches=524288 || true init: @@ -7724,10 +7703,11 @@ Builds: rm: - functions prebuild: - - echo -e '\norg.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g' >> ../gradle.properties + - echo -e '\norg.gradle.jvmargs=-Xmx4g' >> ../gradle.properties - echo -e "android { packagingOptions { pickFirst 'lib/**/*.so' } }" >> build.gradle - sed -i -e 's/enable enable.*/enable true/' -e 's/"armeabi-v7a", "x86", "arm64-v8a", - "x86_64"/"x86_64"/' build.gradle + "x86_64"/"armeabi-v7a"/' -e '/project.ext.react = \[/a nodeExecutableAndArgs:["node", + "--openssl-legacy-provider"],' build.gradle scanignore: - android/build.gradle - node_modules/hermes-engine diff --git a/metadata/dev.develsinthedetails.eatpoopyoucat.yml b/metadata/dev.develsinthedetails.eatpoopyoucat.yml index 6304ff2877..9b4c03db33 100644 --- a/metadata/dev.develsinthedetails.eatpoopyoucat.yml +++ b/metadata/dev.develsinthedetails.eatpoopyoucat.yml @@ -82,10 +82,9 @@ Builds: gradle: - yes - - versionName: 1.3.0 - versionCode: 15 - disable: https://github.com/JamesOsborn-SE/eat-poop-you-cat-android/issues/39 - commit: 61b94b6a8b6b690805c1021fe49578058c81c8c5 + - versionName: 1.3.2 + versionCode: 16 + commit: 105409d684fce63f5dcbcb1bd0cb735f5808f69d subdir: app gradle: - yes @@ -94,5 +93,5 @@ AllowedAPKSigningKeys: e2f023f08f83f2b25b38389ee89f17ad981ecfe22239a70c2e6857b56 AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 1.3.0 -CurrentVersionCode: 15 +CurrentVersion: 1.3.2 +CurrentVersionCode: 16