From 7afc1e96b711cdcdbd10842f0b720a64e1ed240c Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 5 Feb 2024 12:23:01 +0800 Subject: [PATCH] misc fixes --- metadata/co.localmonero.app.yml | 3 +++ metadata/com.agoradesk.app.yml | 3 +++ metadata/com.donnnno.arcticons.daynight.yml | 11 +++++---- metadata/com.donnnno.arcticons.light.yml | 11 +++++---- metadata/com.donnnno.arcticons.yml | 11 +++++---- metadata/com.donnnno.arcticons.you.yml | 11 +++++---- metadata/de.tnmgl.ntodotxt.yml | 25 +++++++++------------ metadata/net.cozic.joplin.yml | 2 +- metadata/org.atalk.android.yml | 3 +-- 9 files changed, 39 insertions(+), 41 deletions(-) diff --git a/metadata/co.localmonero.app.yml b/metadata/co.localmonero.app.yml index 1a4c38e0fc..04fb8b465d 100644 --- a/metadata/co.localmonero.app.yml +++ b/metadata/co.localmonero.app.yml @@ -2265,6 +2265,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-localmonero-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get @@ -2286,6 +2287,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-localmonero-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get @@ -2307,6 +2309,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-localmonero-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get diff --git a/metadata/com.agoradesk.app.yml b/metadata/com.agoradesk.app.yml index 0f1afe3a89..388de8ea17 100644 --- a/metadata/com.agoradesk.app.yml +++ b/metadata/com.agoradesk.app.yml @@ -1956,6 +1956,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-agoradesk-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get @@ -1977,6 +1978,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-agoradesk-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get @@ -1998,6 +2000,7 @@ Builds: output: build/app/outputs/flutter-apk/app-*-agoradesk-release.apk prebuild: - sed -i -e '/ndk {/,/^ }/d' android/app/build.gradle + - sed -i -e 's/download.flutter.io/maven.google.com/' android/build.gradle - export PUB_CACHE=$(pwd)/.pub-cache - submodules/flutter/bin/flutter config --no-analytics - submodules/flutter/bin/flutter packages pub get diff --git a/metadata/com.donnnno.arcticons.daynight.yml b/metadata/com.donnnno.arcticons.daynight.yml index be7fa2b26d..e7708d4843 100644 --- a/metadata/com.donnnno.arcticons.daynight.yml +++ b/metadata/com.donnnno.arcticons.daynight.yml @@ -46,10 +46,9 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'assets/*.xml' - - versionName: 8.7.1 - versionCode: 129 - disable: https://github.com/Arcticons-Team/Arcticons/issues/1952 - commit: d0d1895280689416afdf101b578ea54fe9048d0b + - versionName: 8.7.1-hotfix + versionCode: 130 + commit: b61f6cb819c7ba57c7ca46bc0c7199240dbb30ee subdir: app sudo: - apt-get update @@ -58,9 +57,9 @@ Builds: gradle: - dayNight srclibs: - - reproducible-apk-tools@v0.2.3 + - reproducible-apk-tools@2134d90b7afcc1e65bb860b3a50e38d559a450a2 postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'assets/*.xml' + 'assets/*.xml' '!assets/drawable.xml' - versionName: 8.7.1-hotfix versionCode: 130 diff --git a/metadata/com.donnnno.arcticons.light.yml b/metadata/com.donnnno.arcticons.light.yml index acd94001b8..81ba676c40 100644 --- a/metadata/com.donnnno.arcticons.light.yml +++ b/metadata/com.donnnno.arcticons.light.yml @@ -46,10 +46,9 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'assets/*.xml' - - versionName: 8.7.1 - versionCode: 129 - disable: https://github.com/Arcticons-Team/Arcticons/issues/1952 - commit: d0d1895280689416afdf101b578ea54fe9048d0b + - versionName: 8.7.1-hotfix + versionCode: 130 + commit: b61f6cb819c7ba57c7ca46bc0c7199240dbb30ee subdir: app sudo: - apt-get update @@ -58,9 +57,9 @@ Builds: gradle: - black srclibs: - - reproducible-apk-tools@v0.2.3 + - reproducible-apk-tools@2134d90b7afcc1e65bb860b3a50e38d559a450a2 postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'assets/*.xml' + 'assets/*.xml' '!assets/drawable.xml' - versionName: 8.7.1-hotfix versionCode: 130 diff --git a/metadata/com.donnnno.arcticons.yml b/metadata/com.donnnno.arcticons.yml index d65c349ca5..5d90e8aac3 100644 --- a/metadata/com.donnnno.arcticons.yml +++ b/metadata/com.donnnno.arcticons.yml @@ -46,10 +46,9 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'assets/*.xml' - - versionName: 8.7.1 - versionCode: 129 - disable: https://github.com/Arcticons-Team/Arcticons/issues/1952 - commit: d0d1895280689416afdf101b578ea54fe9048d0b + - versionName: 8.7.1-hotfix + versionCode: 130 + commit: b61f6cb819c7ba57c7ca46bc0c7199240dbb30ee subdir: app sudo: - apt-get update @@ -58,9 +57,9 @@ Builds: gradle: - normal srclibs: - - reproducible-apk-tools@v0.2.3 + - reproducible-apk-tools@2134d90b7afcc1e65bb860b3a50e38d559a450a2 postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'assets/*.xml' + 'assets/*.xml' '!assets/drawable.xml' - versionName: 8.7.1-hotfix versionCode: 130 diff --git a/metadata/com.donnnno.arcticons.you.yml b/metadata/com.donnnno.arcticons.you.yml index 8918c5e1c0..be74141ed1 100644 --- a/metadata/com.donnnno.arcticons.you.yml +++ b/metadata/com.donnnno.arcticons.you.yml @@ -185,10 +185,9 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'assets/*.xml' - - versionName: 8.7.1 - versionCode: 129 - disable: https://github.com/Arcticons-Team/Arcticons/issues/1952 - commit: d0d1895280689416afdf101b578ea54fe9048d0b + - versionName: 8.7.1-hotfix + versionCode: 130 + commit: b61f6cb819c7ba57c7ca46bc0c7199240dbb30ee subdir: app sudo: - apt-get update @@ -197,9 +196,9 @@ Builds: gradle: - you srclibs: - - reproducible-apk-tools@v0.2.3 + - reproducible-apk-tools@2134d90b7afcc1e65bb860b3a50e38d559a450a2 postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'assets/*.xml' + 'assets/*.xml' '!assets/drawable.xml' - versionName: 8.7.1-hotfix versionCode: 130 diff --git a/metadata/de.tnmgl.ntodotxt.yml b/metadata/de.tnmgl.ntodotxt.yml index cf154fdbef..62f1221818 100644 --- a/metadata/de.tnmgl.ntodotxt.yml +++ b/metadata/de.tnmgl.ntodotxt.yml @@ -277,10 +277,9 @@ Builds: - popd - mv $root_ws/ntodotxt de.tnmgl.ntodotxt - - versionName: 0.4.5 - versionCode: 91 - disable: https://github.com/tmaegel/ntodotxt/issues/19 - commit: f2d69fda203cf5a9132fed8a60a84049c54d50de + - versionName: 0.4.6 + versionCode: 101 + commit: 1e15dd55f970a1de95b99cfacda3a434da2a9ae0 submodules: true sudo: - apt-get update @@ -322,10 +321,9 @@ Builds: - popd - mv $root_ws/ntodotxt de.tnmgl.ntodotxt - - versionName: 0.4.5 - versionCode: 92 - disable: https://github.com/tmaegel/ntodotxt/issues/19 - commit: f2d69fda203cf5a9132fed8a60a84049c54d50de + - versionName: 0.4.6 + versionCode: 102 + commit: 1e15dd55f970a1de95b99cfacda3a434da2a9ae0 submodules: true sudo: - apt-get update @@ -367,10 +365,9 @@ Builds: - popd - mv $root_ws/ntodotxt de.tnmgl.ntodotxt - - versionName: 0.4.5 - versionCode: 93 - disable: https://github.com/tmaegel/ntodotxt/issues/19 - commit: f2d69fda203cf5a9132fed8a60a84049c54d50de + - versionName: 0.4.6 + versionCode: 103 + commit: 1e15dd55f970a1de95b99cfacda3a434da2a9ae0 submodules: true sudo: - apt-get update @@ -421,5 +418,5 @@ VercodeOperation: - 10 * %c + 2 - 10 * %c + 3 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ -CurrentVersion: 0.4.5 -CurrentVersionCode: 93 +CurrentVersion: 0.4.6 +CurrentVersionCode: 103 diff --git a/metadata/net.cozic.joplin.yml b/metadata/net.cozic.joplin.yml index 2972caab69..6be7c23e18 100644 --- a/metadata/net.cozic.joplin.yml +++ b/metadata/net.cozic.joplin.yml @@ -2193,7 +2193,7 @@ MaintainerNotes: |- is for "react-native-0.66.1.aar", and the JSC Android folder for "android-jsc-intl-r241213.jar". - we build libvips from source for the sharp library -AutoUpdateMode: None +AutoUpdateMode: Version UpdateCheckMode: Tags android-.* CurrentVersion: 2.14.5 CurrentVersionCode: 2097735 diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml index 0eb447fa0c..fd5137ba83 100644 --- a/metadata/org.atalk.android.yml +++ b/metadata/org.atalk.android.yml @@ -2569,8 +2569,7 @@ Builds: - versionName: 3.3.4 versionCode: 303040 - disable: The certificate of gitlab.linphone.org has expired. - commit: e53ab97e7d7bdb7555d73c8963574a894a0cdb88 + commit: e4d933080332a3c0df6ab8328c2b453eb28df6e5 subdir: aTalk sudo: - sdkmanager 'build-tools;33.0.2' 'build-tools;30.0.3'