From 589dcd256300635a7589d92ad4ba393e52b1fc3d Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 2 Apr 2022 23:28:30 +0800 Subject: [PATCH] misc fixes --- metadata/com.miloshpetrov.sol2.android.yml | 2 +- metadata/com.nextcloud.android.beta.yml | 2 +- metadata/com.subtracks.yml | 68 ++----------------- ...hub.sds100.keymapper.inputmethod.latin.yml | 22 +----- metadata/org.blitzortung.android.app.yml | 4 ++ 5 files changed, 14 insertions(+), 84 deletions(-) diff --git a/metadata/com.miloshpetrov.sol2.android.yml b/metadata/com.miloshpetrov.sol2.android.yml index 340eaedb82..ea7812a606 100644 --- a/metadata/com.miloshpetrov.sol2.android.yml +++ b/metadata/com.miloshpetrov.sol2.android.yml @@ -28,7 +28,7 @@ Builds: forceversion: true forcevercode: true prebuild: - - $$SDK$$/tools/bin/sdkmanager 'build-tools;30.0.3' > /dev/nulls + - $$SDK$$/tools/bin/sdkmanager 'build-tools;30.0.3' > /dev/null - printf '\nrootProject.projectDir = file("engine_workspace"); include ":android"; project(":android").projectDir = file(".\"); project(":android").buildFileName = "android.gradle"; apply from:"engine_workspace/settings.gradle";' >> settings.gradle diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml index 7bab9f9026..df351dbf52 100644 --- a/metadata/com.nextcloud.android.beta.yml +++ b/metadata/com.nextcloud.android.beta.yml @@ -9041,7 +9041,7 @@ Builds: - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties scandelete: - - src/androidTest/assets/ + - app/src/androidTest/assets MaintainerNotes: Tags get removed. See https://github.com/nextcloud/android/issues/969. diff --git a/metadata/com.subtracks.yml b/metadata/com.subtracks.yml index 610fd3e6cf..a5cbf60154 100644 --- a/metadata/com.subtracks.yml +++ b/metadata/com.subtracks.yml @@ -168,68 +168,6 @@ Builds: - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-64-hermes.aar ndk: r21e - - versionName: 1.1.2 - versionCode: 6 - commit: b761ad8b84188e62c54e8d4a65f08ee9f9892ce8 - subdir: android/app - submodules: true - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.5/node-v14.17.5-linux-x64.tar.xz - - echo "2d759de07a50cd7f75bd73d67e97b0d0e095ee3c413efac7d1b3d1e84ed76fff node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v14.17.5-linux-x64/. /usr/local/ - - npm -g install yarn - - apt-get update || apt-get update - - apt-get install -y wget - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - react-native-reanimated@2.3.1 - prebuild: - - echo -e '\norg.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g' >> ../gradle.properties - - echo -e "android { packagingOptions { pickFirst 'lib/**/*.so' } }" >> build.gradle - - cd ../.. - - mkdir .yarncache - - yarn install --network-concurrency 1 --cache-folder ./.yarncache - - rm -rf .yarncache - - cd $$react-native-reanimated$$ - - echo -e "android { ndkVersion '21.4.7075529' }" >> build.gradle - - yarn add react-native@0.67.1 - scanignore: - - android/build.gradle - - node_modules/jsc-android - - node_modules/hermes-engine - - node_modules/react-native/android/com/facebook/react/react-native/*/ - - node_modules/react-native-safe-area-context/android/build.gradle - - node_modules/react-native-screens/android/build.gradle - - node_modules/react-native-webview/android/build.gradle - - node_modules/react-native/template/android/build.gradle - - node_modules/react-native-image-colors/android/build.gradle - - node_modules/react-native-track-player/android/build.gradle - - node_modules/react-native-vector-icons/android/build.gradle - - node_modules/@react-native-async-storage/async-storage/android/build.gradle - - node_modules/@react-native-community/masked-view/android/build.gradle - - node_modules/@react-native-community/netinfo/android/build.gradle - scandelete: - - node_modules - - submodules - build: - - ../../scripts/prepare-exoplayer-ffmpeg.sh - - REACT_NATIVE_VERSION=`npm pkg get 'dependencies.react-native' | sed -E 's/^"([0-9]+\.[0-9]+\.[0-9]+)"/\1/'` - - REACT_NATIVE_VERSION_MINOR=`echo ${REACT_NATIVE_VERSION} | sed -E 's/^[0-9]+\.([0-9]+)\.[0-9]+/\1/'` - - pushd $$react-native-reanimated$$ - - pushd .. - - yarn add react-native@"${REACT_NATIVE_VERSION}" - - popd - - FOR_HERMES=True gradle :assembleRelease - - popd - - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-${REACT_NATIVE_VERSION_MINOR}-hermes.aar - ndk: r21e - - versionName: 1.1.3 versionCode: 7 commit: 5a2ab98af55764c0ef4c73d2640a2d8c5c3b0609 @@ -284,7 +222,11 @@ Builds: - pushd $$react-native-reanimated$$ - FOR_HERMES=True gradle :assembleRelease - popd - - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-${REACT_NATIVE_VERSION_MINOR}-hermes.aar + - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-67-hermes.aar + - pushd $$react-native-reanimated$$ + - gradle :assembleRelease + - popd + - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-67-jsc.aar ndk: r21e AutoUpdateMode: Version v%v diff --git a/metadata/io.github.sds100.keymapper.inputmethod.latin.yml b/metadata/io.github.sds100.keymapper.inputmethod.latin.yml index 18a267a8c2..d0294ad855 100644 --- a/metadata/io.github.sds100.keymapper.inputmethod.latin.yml +++ b/metadata/io.github.sds100.keymapper.inputmethod.latin.yml @@ -10,7 +10,7 @@ Changelog: https://github.com/keymapperorg/KeyMapperKeyboard/releases AutoName: Key Mapper GUI Keyboard RepoType: git -Repo: https://github.com/keymapperorg/KeyMapper +Repo: https://github.com/keymapperorg/KeyMapperKeyboard Builds: - versionName: 1.4.2 @@ -24,23 +24,7 @@ Builds: - dictionaries/*_wordlist.combined.gz ndk: r21d - - versionName: v2.4.0-beta.01 - versionCode: 53 - commit: 239f710810ea7fc6fffc56a95be8add7bd7edd50 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - scanignore: - - dictionaries/*_emoji.combined.gz - - dictionaries/*_wordlist.combined.gz - ndk: r21d - AutoUpdateMode: Version UpdateCheckMode: Tags -UpdateCheckData: app/version.properties|VERSION_CODE\s*=\s*([0-9]+)|.|VERSION_NAME\s*=\s*"(.+)" -CurrentVersion: v2.4.0-beta.01 -CurrentVersionCode: 53 +CurrentVersion: 1.4.2 +CurrentVersionCode: 13 diff --git a/metadata/org.blitzortung.android.app.yml b/metadata/org.blitzortung.android.app.yml index df7f45c9f2..9ffc83db76 100644 --- a/metadata/org.blitzortung.android.app.yml +++ b/metadata/org.blitzortung.android.app.yml @@ -299,6 +299,10 @@ Builds: versionCode: 280 commit: 6e2f0fdfc51375da40ef4e7fbfa87f57be135f6a subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes