From f92228ad13559daa92c0efa6a8040db3931a764b Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 13 Apr 2022 00:22:33 +0800 Subject: [PATCH] misc fixes --- metadata/com.example.barcodescanner.yml | 1 + metadata/com.exifthumbnailadder.app.yml | 6 +- metadata/com.foxdebug.acode.yml | 86 ++------------------- metadata/com.looker.droidify.yml | 18 +---- metadata/com.nextcloud_cookbook_flutter.yml | 2 +- metadata/com.shadow.blackhole.yml | 2 +- metadata/pro.kherel.selfprivacy.yml | 2 +- 7 files changed, 19 insertions(+), 98 deletions(-) diff --git a/metadata/com.example.barcodescanner.yml b/metadata/com.example.barcodescanner.yml index c75a54ea17..e388e1c01e 100644 --- a/metadata/com.example.barcodescanner.yml +++ b/metadata/com.example.barcodescanner.yml @@ -71,6 +71,7 @@ Builds: - versionName: '1.10' versionCode: 12 + disable: https://github.com/wewewe718/QrAndBarcodeScanner/issues/131 commit: da922e7b96906ec55a7437733378e850ca9262f7 subdir: app sudo: diff --git a/metadata/com.exifthumbnailadder.app.yml b/metadata/com.exifthumbnailadder.app.yml index 32ce6e844d..84c5bbe87b 100644 --- a/metadata/com.exifthumbnailadder.app.yml +++ b/metadata/com.exifthumbnailadder.app.yml @@ -141,13 +141,17 @@ Builds: versionCode: 232 commit: 694342a66e5501477242d05dbe6cfabd412673df subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - standard prebuild: sed -i -e '/keystoreProperties/d' build.gradle scandelete: - library - libs.prebuilt - ndk: r22b + ndk: r23b AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml index 66a5648f91..c5f63d5382 100644 --- a/metadata/com.foxdebug.acode.yml +++ b/metadata/com.foxdebug.acode.yml @@ -183,84 +183,9 @@ Builds: - cd platforms/android/app - gradle assembleRelease - - versionName: 1.5.1 - versionCode: 173 - disable: no assembleRelease task - commit: 780f2e36e541b6fd253464662fe4f4f810c2216f - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.6/node-v14.17.6-linux-x64.tar.xz - - echo "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - npm install -g npm@latest - - npm install -g cordova - output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk - srclibs: - - ftp4j@86 - rm: - - test - prebuild: - - sed -i -e '/const promotion/,/^ });/d' src/lib/main.js - - sed -i -e 's/acodefree/acode/' utils/config.js - - npm install - - ./node_modules/.bin/webpack - - cordova platform add android - - sed -i -e '/signingConfig signingConfigs.release/d' -e '/gms/d' -e '/core-google-shortcuts/d' - platforms/android/app/build.gradle - scandelete: - - src/plugins - - platforms/android - - plugins - build: - - pushd $$ftp4j$$/tags/1.7.2 - - sed -i -e 's/else="rv\${revision}"/else="1.7.2"/' build.xml - - ant jar - - popd - - cp $$ftp4j$$/tags/1.7.2/ftp4j-1.7.2.jar platforms/android/app/libs/ - - cd platforms/android/app - - gradle assembleRelease - - - versionName: 1.5.3 - versionCode: 175 - disable: no assembleRelease task - commit: 71db2063b3dbcae9c9924cda377bdce68207fcfc - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.6/node-v14.17.6-linux-x64.tar.xz - - echo "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - npm install -g npm@latest - - npm install -g cordova - output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk - srclibs: - - ftp4j@86 - rm: - - test - prebuild: - - sed -i -e '/const promotion/,/^ });/d' src/lib/main.js - - sed -i -e 's/acodefree/acode/' utils/config.js - - npm install - - ./node_modules/.bin/webpack - - cordova platform add android - - sed -i -e '/signingConfig signingConfigs.release/d' -e '/gms/d' -e '/core-google-shortcuts/d' - platforms/android/app/build.gradle - scandelete: - - src/plugins - - platforms/android - - plugins - build: - - pushd $$ftp4j$$/tags/1.7.2 - - sed -i -e 's/else="rv\${revision}"/else="1.7.2"/' build.xml - - ant jar - - popd - - cp $$ftp4j$$/tags/1.7.2/ftp4j-1.7.2.jar platforms/android/app/libs/ - - cd platforms/android/app - - gradle assembleRelease - - versionName: 1.5.4 versionCode: 177 + disable: webpack fails commit: 02406867803c6f1b73c0e3c11d65aec57bc18c44 sudo: - sysctl fs.inotify.max_user_watches=524288 @@ -269,18 +194,19 @@ Builds: | sha256sum -c - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - npm install -g npm@latest - - npm install -g cordova + - npm install -g cordova yarn output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk srclibs: - ftp4j@86 rm: - test prebuild: - - sed -i -e '/const promotion/,/^ });/d' src/lib/main.js - - sed -i -e 's/acodefree/acode/' utils/config.js + - mkdir -p platforms - npm install - - ./node_modules/.bin/webpack + - node ./utils/config.js p paid + - ./node_modules/.bin/webpack --progress --mode production - cordova platform add android + - node ./utils/loadStyles.js - sed -i -e '/signingConfig signingConfigs.release/d' -e '/gms/d' -e '/core-google-shortcuts/d' platforms/android/app/build.gradle scandelete: diff --git a/metadata/com.looker.droidify.yml b/metadata/com.looker.droidify.yml index 79dfff9ae6..b24bf0cd38 100644 --- a/metadata/com.looker.droidify.yml +++ b/metadata/com.looker.droidify.yml @@ -105,17 +105,7 @@ Builds: gradle: - yes - - versionName: 0.9.0 - versionCode: 903 - commit: 57003a4684490e0775629b913700af8fa17c3b53 - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags -CurrentVersion: 0.9.0 -CurrentVersionCode: 903 +AutoUpdateMode: Version +UpdateCheckMode: Tags ^[v\d.]+$ +CurrentVersion: 0.4.3 +CurrentVersionCode: 43 diff --git a/metadata/com.nextcloud_cookbook_flutter.yml b/metadata/com.nextcloud_cookbook_flutter.yml index 37375ec9cd..e4f9fa4c16 100644 --- a/metadata/com.nextcloud_cookbook_flutter.yml +++ b/metadata/com.nextcloud_cookbook_flutter.yml @@ -104,7 +104,7 @@ Builds: commit: 2b00673796232e7ac89c8df2f6d87d2402d5d14f output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.5.3 + - flutter@2.10.4 rm: - ios build: diff --git a/metadata/com.shadow.blackhole.yml b/metadata/com.shadow.blackhole.yml index 6337589735..7e87c24da5 100644 --- a/metadata/com.shadow.blackhole.yml +++ b/metadata/com.shadow.blackhole.yml @@ -96,7 +96,7 @@ Builds: - update-alternatives --auto java output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.5.1 + - flutter@2.10.4 rm: - docs - linux diff --git a/metadata/pro.kherel.selfprivacy.yml b/metadata/pro.kherel.selfprivacy.yml index 9820d091a7..10599a9382 100644 --- a/metadata/pro.kherel.selfprivacy.yml +++ b/metadata/pro.kherel.selfprivacy.yml @@ -166,7 +166,7 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get - $$flutter$$/bin/flutter build apk - ndk: r21e + ndk: r20b AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$