From d3816388fd326d98f85505af109e3ba5d2a5389a Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Fri, 26 Nov 2021 16:55:17 +0000 Subject: [PATCH] misc fixes --- metadata/com.LAPARCELA.nihonoari.yml | 4 +-- metadata/com.antony.muzei.pixiv.yml | 4 +++ metadata/com.asdoi.quicktiles.yml | 4 +++ metadata/com.emanuelef.remote_capture.yml | 4 +++ metadata/com.tutpro.baresip.plus.yml | 44 ----------------------- metadata/com.tutpro.baresip.yml | 42 ---------------------- metadata/io.nekohasekai.sagernet.yml | 44 ++++++----------------- metadata/nekox.messenger.yml | 1 + metadata/org.equeim.tremotesf.yml | 1 + metadata/taco.scoop.yml | 4 +++ 10 files changed, 30 insertions(+), 122 deletions(-) diff --git a/metadata/com.LAPARCELA.nihonoari.yml b/metadata/com.LAPARCELA.nihonoari.yml index 6b02b8d06c..7577e0fe49 100644 --- a/metadata/com.LAPARCELA.nihonoari.yml +++ b/metadata/com.LAPARCELA.nihonoari.yml @@ -31,7 +31,7 @@ Builds: commit: v1.3.0 output: build/app/outputs/apk/release/app-release.apk srclibs: - - flutter@2.5.3 + - flutter@v1.15.21 prebuild: - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle @@ -67,7 +67,7 @@ Builds: commit: 5bac619d3907c1084a672356bff061d5c85d664b output: build/app/outputs/apk/release/app-release.apk srclibs: - - flutter@v1.15.21 + - flutter@2.5.3 prebuild: - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle diff --git a/metadata/com.antony.muzei.pixiv.yml b/metadata/com.antony.muzei.pixiv.yml index 8cc9d9ead0..7d36a08f87 100644 --- a/metadata/com.antony.muzei.pixiv.yml +++ b/metadata/com.antony.muzei.pixiv.yml @@ -147,6 +147,10 @@ Builds: versionCode: 311 commit: de7776dbd9269a21c4dd1b74d9c69a7b31f0c553 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - prod diff --git a/metadata/com.asdoi.quicktiles.yml b/metadata/com.asdoi.quicktiles.yml index 0b3338e629..2897748f5e 100644 --- a/metadata/com.asdoi.quicktiles.yml +++ b/metadata/com.asdoi.quicktiles.yml @@ -33,6 +33,10 @@ Builds: versionCode: 14 commit: 3298fa7a58787d8fec4fea1cbba8aaf072fad447 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.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml index 48a8e7326a..fa81aa3294 100644 --- a/metadata/com.emanuelef.remote_capture.yml +++ b/metadata/com.emanuelef.remote_capture.yml @@ -290,8 +290,12 @@ Builds: prebuild: - sed -i -e '/3.18.1/d' -e 's/23.1.7779620/23.0.7599858/' build.gradle - sed -i -e 's/3.18.1/3.10.2/' src/main/jni/CMakeLists.txt + scanignore: + - submodules/res/raw ndk: r23 +MaintainerNotes: Ignored files are the DB-IP country lite db and the DB-IP ASN lite db licensed under CC-BY-4.0. + AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 1.4.4 diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml index 094e51e562..80502ebacd 100644 --- a/metadata/com.tutpro.baresip.plus.yml +++ b/metadata/com.tutpro.baresip.plus.yml @@ -922,28 +922,6 @@ Builds: - popd ndk: r21e - - versionName: 22.2.0 - versionCode: 60 - commit: 813938f141e488c36c6d5e82222cc80e4f02e5dd - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y --no-install-recommends -t testing nasm - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@v15.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile - - make download-sources - - make install-all - - popd - ndk: r23 - - versionName: 23.0.0 versionCode: 61 commit: 813c8927608db5f6623673ac5c960c9b25b16a2e @@ -966,28 +944,6 @@ Builds: - popd ndk: r23 - - versionName: 23.1.0 - versionCode: 63 - commit: 32a6caa9e344f77c3340c2848bb877c7c4227031 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y --no-install-recommends -t testing nasm - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@v15.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile - - make download-sources - - make install-all - - popd - ndk: r23 - - versionName: 23.2.0 versionCode: 64 commit: e89e7ac348f289be37367090d3323e123e2f94cf diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index 911723cb80..78c31e4737 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1980,27 +1980,6 @@ Builds: - popd ndk: r21e - - versionName: 35.2.0 - versionCode: 182 - commit: b47fed95396c575123b7be070cf054bb5bba4704 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@22.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile - - make download-sources - - make install-all - - popd - ndk: r23 - - versionName: 36.0.0 versionCode: 183 commit: 46122285dc809e53b48c72ddbd6c675b7ff6b6a6 @@ -2022,27 +2001,6 @@ Builds: - popd ndk: r21e - - versionName: 36.1.0 - versionCode: 185 - commit: 318c3e6b235ddcba62af425d674d2f4a5d8d6667 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@22.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile - - make download-sources - - make install-all - - popd - ndk: r21e - - versionName: 36.1.1 versionCode: 186 commit: cf4f9781a6b7e4ec1608a7e37ec91273ff6eb968 diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml index b488b2cac2..ac672a22cb 100644 --- a/metadata/io.nekohasekai.sagernet.yml +++ b/metadata/io.nekohasekai.sagernet.yml @@ -258,10 +258,10 @@ Builds: - ./run fdroid build ndk: r21e - - versionName: 0.5-rc25 - versionCode: 600 - disable: https://github.com/SagerNet/SagerNet/issues/291 - commit: 90c8fd33f350bfdfd75ddefd7570a3d53ff5c014 + - versionName: 0.6-beta09 + versionCode: 635 + disable: ndk r23b + commit: c7b39544e1da792815d2c03fe8916d7d0287ec61 subdir: app sudo: - apt-get update || apt-get update @@ -272,43 +272,19 @@ Builds: gradle: - fdroid prebuild: - - pushd .. + - cd .. - ./run fdroid prebuild scandelete: - library - external build: - - pushd .. - - ./run fdroid build - ndk: r21e - - - versionName: 0.6-beta03 - versionCode: 610 - disable: ndk r23 - commit: c9f234835a9db1b182f99b53941ae9b710ba31fc - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - patch: - - disable-splits-abi.patch - gradle: - - fdroid - prebuild: - - pushd .. - - ./run fdroid prebuild - scandelete: - - library - - external - build: - - pushd .. + - cd .. - ./run fdroid build ndk: r23b -AutoUpdateMode: None -UpdateCheckMode: Tags +AutoUpdateMode: Version +UpdateCheckMode: Tags ^\d.* VercodeOperation: '%c * 5' UpdateCheckData: sager.properties|VERSION_CODE=(\d+)|| -CurrentVersion: naive-plugin-96.0.4664.45-1 -CurrentVersionCode: 630 +CurrentVersion: 0.6-beta09 +CurrentVersionCode: 635 diff --git a/metadata/nekox.messenger.yml b/metadata/nekox.messenger.yml index 07f6dfa136..dcaea1fb67 100644 --- a/metadata/nekox.messenger.yml +++ b/metadata/nekox.messenger.yml @@ -623,6 +623,7 @@ Builds: - versionName: 8.2.7 versionCode: 470 + disable: /home/vagrant/build/nekox.messenger/TMessagesProj/.cxx/RelWithDebInfo/465m52b3/armeabi-v7a/android_gradle_build.json(No such file or directory) commit: v8.2.7 timeout: 10800 subdir: TMessagesProj diff --git a/metadata/org.equeim.tremotesf.yml b/metadata/org.equeim.tremotesf.yml index 50416eedfa..189a459907 100644 --- a/metadata/org.equeim.tremotesf.yml +++ b/metadata/org.equeim.tremotesf.yml @@ -559,6 +559,7 @@ Builds: - versionName: 2.5.2 versionCode: 4044 + disable: https://github.com/equeim/tremotesf-android/issues/62 commit: 2.5.2 subdir: app submodules: true diff --git a/metadata/taco.scoop.yml b/metadata/taco.scoop.yml index d24661dfc0..ccf0d3aaed 100644 --- a/metadata/taco.scoop.yml +++ b/metadata/taco.scoop.yml @@ -51,6 +51,10 @@ Builds: versionCode: 32 commit: 3294bf4a4fd9dc47f779ea715ac8106260ddacf5 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes scandelete: