From 482bfdad7b8cef0dbc3e7bd51db821410947ce5b Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 31 Aug 2021 12:40:47 +0800 Subject: [PATCH] misc fixes --- metadata/app.organicmaps.yml | 1 + metadata/au.com.darkside.xdemo.yml | 1 + metadata/ca.ramzan.delist.yml | 4 + metadata/com.better.alarm.yml | 4 + metadata/com.dimowner.audiorecorder.yml | 4 + metadata/com.headi.app.yml | 4 + metadata/com.hearham.repeaterstart.yml | 4 + .../com.jarsilio.android.autoautorotate.yml | 4 + metadata/com.jarsilio.android.drowser.yml | 14 ++-- .../com.jarsilio.android.scrambledeggsif.yml | 4 + metadata/com.jarsilio.android.waveup.yml | 4 + metadata/com.madlonkay.orgro.yml | 16 ---- ...m.shatteredpixel.shatteredpixeldungeon.yml | 1 + metadata/com.tailscale.ipn.yml | 17 ----- metadata/com.unciv.app.yml | 29 ++------ metadata/cx.ring.yml | 74 ------------------- metadata/de.blinkt.openvpn.yml | 2 + metadata/de.reimardoeffinger.quickdic.yml | 4 + metadata/io.github.sds100.keymapper.yml | 4 + metadata/me.rosuh.easywatermark.yml | 2 +- metadata/org.wikipedia.yml | 4 + metadata/org.xcsoar.yml | 1 + metadata/rkr.simplekeyboard.inputmethod.yml | 4 + metadata/slowscript.warpinator.yml | 4 + 24 files changed, 74 insertions(+), 136 deletions(-) diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml index ff6e301601..0ee376f03e 100644 --- a/metadata/app.organicmaps.yml +++ b/metadata/app.organicmaps.yml @@ -313,6 +313,7 @@ Builds: - tools/shaders_compiler - xcode prebuild: + - $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null - sed -i -e '/com.google.firebase/d; /com.google.gms/d; /com.google.android.gms/d' build.gradle - touch secure.properties diff --git a/metadata/au.com.darkside.xdemo.yml b/metadata/au.com.darkside.xdemo.yml index 5af07eae8b..d6b220e27a 100644 --- a/metadata/au.com.darkside.xdemo.yml +++ b/metadata/au.com.darkside.xdemo.yml @@ -22,6 +22,7 @@ Builds: - versionName: '1.31' versionCode: 31 + disable: build failed commit: '1.31' timeout: 14400 subdir: demo diff --git a/metadata/ca.ramzan.delist.yml b/metadata/ca.ramzan.delist.yml index 6ccdb34d98..1328d619de 100644 --- a/metadata/ca.ramzan.delist.yml +++ b/metadata/ca.ramzan.delist.yml @@ -23,6 +23,10 @@ Builds: versionCode: 3 commit: e758ba3b4593bea071f25fd4793a89a1c159a6b4 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.better.alarm.yml b/metadata/com.better.alarm.yml index 51d7f9ab6d..1f75efc1c9 100644 --- a/metadata/com.better.alarm.yml +++ b/metadata/com.better.alarm.yml @@ -140,6 +140,10 @@ Builds: versionCode: 30908 commit: 06212b4ca9de606f50e71afbc830b771c4397ae9 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - develop prebuild: sed -i -e 's/\r//' ../gradle/wrapper/gradle-wrapper.properties diff --git a/metadata/com.dimowner.audiorecorder.yml b/metadata/com.dimowner.audiorecorder.yml index 955e5adf1c..115d54f414 100644 --- a/metadata/com.dimowner.audiorecorder.yml +++ b/metadata/com.dimowner.audiorecorder.yml @@ -49,6 +49,10 @@ Builds: versionCode: 922 commit: 5a23bff336261e402a859779389a1594600e2a2d subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes output: build/outputs/apk/releaseConfig/release/app-releaseConfig-release-unsigned.apk diff --git a/metadata/com.headi.app.yml b/metadata/com.headi.app.yml index a966d07a7a..8450593362 100644 --- a/metadata/com.headi.app.yml +++ b/metadata/com.headi.app.yml @@ -94,6 +94,10 @@ Builds: versionCode: 1109 commit: 630b4de792337a3b766f3e6c44f2c8d397c4c092 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.hearham.repeaterstart.yml b/metadata/com.hearham.repeaterstart.yml index 87addfc263..8d82dbac40 100644 --- a/metadata/com.hearham.repeaterstart.yml +++ b/metadata/com.hearham.repeaterstart.yml @@ -42,6 +42,10 @@ Builds: versionCode: 6 commit: 236fb160f473add2357b19db40086e8d37cf7d53 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.jarsilio.android.autoautorotate.yml b/metadata/com.jarsilio.android.autoautorotate.yml index 27052faf4c..0cfacaef5e 100644 --- a/metadata/com.jarsilio.android.autoautorotate.yml +++ b/metadata/com.jarsilio.android.autoautorotate.yml @@ -185,6 +185,10 @@ Builds: commit: 15ab7fd34935d217920e28870d3f49afbe38dff7 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.jarsilio.android.drowser.yml b/metadata/com.jarsilio.android.drowser.yml index 82231b5365..79919b90c0 100644 --- a/metadata/com.jarsilio.android.drowser.yml +++ b/metadata/com.jarsilio.android.drowser.yml @@ -134,15 +134,19 @@ Builds: gradle: - yes - - versionName: 1.0.2 - versionCode: 24 - commit: 056fa40cac87815161b7b7782b1160d4869f020f + - versionName: 1.0.3 + versionCode: 25 + commit: 3ca810a55a34de83f70b9088c95f31bbada50675 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v[0-9.]+$ -CurrentVersion: 1.0.2 -CurrentVersionCode: 24 +CurrentVersion: 1.0.3 +CurrentVersionCode: 25 diff --git a/metadata/com.jarsilio.android.scrambledeggsif.yml b/metadata/com.jarsilio.android.scrambledeggsif.yml index 51b53bf6ab..20af3bb232 100644 --- a/metadata/com.jarsilio.android.scrambledeggsif.yml +++ b/metadata/com.jarsilio.android.scrambledeggsif.yml @@ -445,6 +445,10 @@ Builds: commit: 1cedca128f649b1ee293912c21346908a7c60f55 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - standard diff --git a/metadata/com.jarsilio.android.waveup.yml b/metadata/com.jarsilio.android.waveup.yml index 24e153d130..a52d6a5bd7 100644 --- a/metadata/com.jarsilio.android.waveup.yml +++ b/metadata/com.jarsilio.android.waveup.yml @@ -770,6 +770,10 @@ Builds: commit: 7fe831a3027a161934d4a1aa517ca58ef95fa903 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - standard diff --git a/metadata/com.madlonkay.orgro.yml b/metadata/com.madlonkay.orgro.yml index d7529c2d30..6b6d95059a 100644 --- a/metadata/com.madlonkay.orgro.yml +++ b/metadata/com.madlonkay.orgro.yml @@ -136,22 +136,6 @@ Builds: - $$flutter$$/bin/flutter packages pub get - $$flutter$$/bin/flutter build apk - - versionName: 1.20.0 - versionCode: 48 - commit: 1864886853bc5d1b23785363225706d24283d946 - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - flutter@2.5.0-5.2.pre - prebuild: touch android/key.properties - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter packages pub get - - $$flutter$$/bin/flutter build apk - - versionName: 1.20.1 versionCode: 49 commit: 25740231857a8ca9c85aa501e08ccdbb9cc57062 diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml index a509cb8e78..35ffca9f5f 100644 --- a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml +++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml @@ -894,6 +894,7 @@ Builds: - versionName: 1.0.2 versionCode: 572 + disable: https://github.com/00-Evan/shattered-pixel-dungeon/issues/798 commit: e3ffc875ba1cc2abf12293fa3a8ebd94bc527ab0 subdir: android sudo: diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml index d1bc323d7d..c52f37e25e 100644 --- a/metadata/com.tailscale.ipn.yml +++ b/metadata/com.tailscale.ipn.yml @@ -468,23 +468,6 @@ Builds: - make -C .. release_aar ndk: r21e - - versionName: 1.14.0-t62a458f7f-gff91342ecc8 - versionCode: 64 - commit: da4515eaaf2f09c6350b36caa86097cc479c29b5 - subdir: android - sudo: - - apt-get update || apt-get update - - apt-get install -y git -t stretch-backports - gradle: - - fdroid - prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - > /dev/null - build: - - export ANDROID_SDK_ROOT=$$SDK$$ - - export ANDROID_NDK_ROOT=$$NDK$$ - - make -C .. release_aar - ndk: r21e - - versionName: 1.15.3-t1925fb584-g7aa8ae9a47e versionCode: 65 disable: https://github.com/tailscale/tailscale/issues/2603 diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 7a77224936..de04d9e53e 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -1836,9 +1836,10 @@ Builds: rm: - desktop - - versionName: 3.16.7 - versionCode: 616 - commit: e62fdc22187264577167c7c558c3b2f984f983c9 + - versionName: 3.16.10 + versionCode: 619 + disable: https://github.com/yairm210/Unciv/issues/5036 + commit: 3.16.10 subdir: android sudo: - apt-get update || apt-get update @@ -1849,27 +1850,9 @@ Builds: rm: - desktop - - versionName: 3.16.8 - versionCode: 617 - commit: b74cd5c83e986d0b87b50c2aef87164502908f5b - subdir: android - gradle: - - yes - rm: - - desktop - - - versionName: 3.16.9 - versionCode: 618 - commit: 6a3fddc757c4c748c0be1a12464dd7ef98146777 - subdir: android - gradle: - - yes - rm: - - desktop - AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: buildSrc/src/main/kotlin/BuildConfig.kt|appCodeNumber = (.*)|.|appVersion = "(.*)" -CurrentVersion: 3.16.9 -CurrentVersionCode: 618 +CurrentVersion: 3.16.10 +CurrentVersionCode: 619 diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index 890d810a93..ee4c07854c 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -1415,80 +1415,6 @@ Builds: - ./compile.sh --release --daemon ndk: r22b - - versionName: 20210611-01 - versionCode: 314 - commit: android/release_314 - timeout: 10800 - subdir: client-android/ring-android/app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y -t testing swig - - apt-get install -y -t stretch-backports-sloppy libarchive13 - - apt-get install -y -t stretch-backports cmake - gradle: - - noPush - rm: - - client-gnome - - client-ios - - client-macosx - - client-qt - - client-uwp - - lrc - - plugins - - docker - - docs - - guix - - packaging - - patches - - scripts - prebuild: - - $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - - sed -i -e "s/ndkVersion '.*'/ndkVersion '22.1.7171670'/" build.gradle - build: - - cd ../.. - - export ANDROID_NDK_ROOT="$ANDROID_NDK" - - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64" - - ./compile.sh --release --daemon - ndk: r22b - - - versionName: 20210813-01 - versionCode: 316 - commit: android/release_316 - timeout: 10800 - subdir: client-android/ring-android/app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y -t testing swig - - apt-get install -y -t stretch-backports-sloppy libarchive13 - - apt-get install -y -t stretch-backports cmake - gradle: - - noPush - rm: - - client-gnome - - client-ios - - client-macosx - - client-qt - - client-uwp - - lrc - - plugins - - docker - - docs - - guix - - packaging - - patches - - scripts - prebuild: - - $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' - - sed -i -e "s/ndkVersion '.*'/ndkVersion '22.1.7171670'/" build.gradle - build: - - cd ../.. - - export ANDROID_NDK_ROOT="$ANDROID_NDK" - - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64" - - ./compile.sh --release --daemon - ndk: r22b - - versionName: 20210813-01 versionCode: 317 commit: android/release_317 diff --git a/metadata/de.blinkt.openvpn.yml b/metadata/de.blinkt.openvpn.yml index fcd91452a2..a515fbafce 100644 --- a/metadata/de.blinkt.openvpn.yml +++ b/metadata/de.blinkt.openvpn.yml @@ -483,6 +483,8 @@ Builds: - main/src/main/cpp/mbedtls/programs/fuzz - main/src/main/cpp/mbedtls/tests - main/src/main/cpp/openvpn3/test/unittests + - main/src/main/cpp/lz4/tmpsparse + - main/src/main/cpp/lz4/tmp prebuild: sed -i -e '/signingConfigs.getByName/d' -e 's/isEnable\ =\ true/isEnable\ =\ false/' build.gradle.kts ndk: r19c diff --git a/metadata/de.reimardoeffinger.quickdic.yml b/metadata/de.reimardoeffinger.quickdic.yml index d5aaf70827..28bf1ec46c 100644 --- a/metadata/de.reimardoeffinger.quickdic.yml +++ b/metadata/de.reimardoeffinger.quickdic.yml @@ -278,6 +278,10 @@ Builds: versionCode: 114 commit: abd7512d20cd6fba56002a0a7e83cae11a98146c submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/io.github.sds100.keymapper.yml b/metadata/io.github.sds100.keymapper.yml index 4edb685d79..fd0a5b2243 100644 --- a/metadata/io.github.sds100.keymapper.yml +++ b/metadata/io.github.sds100.keymapper.yml @@ -127,6 +127,10 @@ Builds: versionCode: 49 commit: 3f680137abc3db727db010559e233b2043a60bc1 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/me.rosuh.easywatermark.yml b/metadata/me.rosuh.easywatermark.yml index d1dd313d9d..f8e2283339 100644 --- a/metadata/me.rosuh.easywatermark.yml +++ b/metadata/me.rosuh.easywatermark.yml @@ -50,7 +50,7 @@ Builds: - apt-get install -y openjdk-11-jdk - update-alternatives --auto java gradle: - - others + - yes AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/org.wikipedia.yml b/metadata/org.wikipedia.yml index a3004311fe..71cef9e832 100644 --- a/metadata/org.wikipedia.yml +++ b/metadata/org.wikipedia.yml @@ -906,6 +906,10 @@ Builds: versionCode: 50372 commit: a5bad6505d9d7f786c92eb59fb66f720dfd095ee subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - fdroid forceversion: true diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml index f0329de20a..47f02a658a 100644 --- a/metadata/org.xcsoar.yml +++ b/metadata/org.xcsoar.yml @@ -359,6 +359,7 @@ Builds: - versionName: '7.16' versionCode: 137 + disable: https://github.com/XCSoar/XCSoar/issues/704 commit: 58f0eb628e9c52bfdb0f7237f912c6891d14c8b1 submodules: true sudo: diff --git a/metadata/rkr.simplekeyboard.inputmethod.yml b/metadata/rkr.simplekeyboard.inputmethod.yml index 7be2cf2631..e16df7e445 100644 --- a/metadata/rkr.simplekeyboard.inputmethod.yml +++ b/metadata/rkr.simplekeyboard.inputmethod.yml @@ -369,6 +369,10 @@ Builds: versionCode: 89 commit: cf168a1e7e1b4c425e2e050864d3b6f9eac5b27a subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/slowscript.warpinator.yml b/metadata/slowscript.warpinator.yml index a4c80eba0a..186ad7ba0d 100644 --- a/metadata/slowscript.warpinator.yml +++ b/metadata/slowscript.warpinator.yml @@ -29,6 +29,10 @@ Builds: versionCode: 1032 commit: e5d1ea32d9fa6edf622466ec9a81a03a495336d9 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes