diff --git a/metadata/com.otago.open.yml b/metadata/com.otago.open.yml index 4bd5b4447a..849dfc5214 100644 --- a/metadata/com.otago.open.yml +++ b/metadata/com.otago.open.yml @@ -19,6 +19,7 @@ Builds: subdir: app gradle: - yes + ndk: r21d AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.termux.yml b/metadata/com.termux.yml index 4f24449991..eab89ce02d 100644 --- a/metadata/com.termux.yml +++ b/metadata/com.termux.yml @@ -643,7 +643,7 @@ Builds: subdir: app gradle: - yes - ndk: r21d + ndk: r22 AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.tunerly.yml b/metadata/com.tunerly.yml index 4535062de3..26bc843951 100644 --- a/metadata/com.tunerly.yml +++ b/metadata/com.tunerly.yml @@ -29,7 +29,7 @@ Builds: - versionName: 1.0.1 versionCode: 2 - commit: v1.0.1 + commit: 1.0.2 subdir: app/ gradle: - yes @@ -44,7 +44,7 @@ Builds: - popd - mv $$TarsosDSP$$/build/TarsosDSP-Android-2.4.jar libs/TarsosDSP-2.4.jar -AutoUpdateMode: Version v%v +AutoUpdateMode: Version %v UpdateCheckMode: Tags CurrentVersion: 1.0.1 CurrentVersionCode: 2 diff --git a/metadata/com.tunjid.fingergestures.yml b/metadata/com.tunjid.fingergestures.yml index 309c97aca0..6c1bc3f72c 100644 --- a/metadata/com.tunjid.fingergestures.yml +++ b/metadata/com.tunjid.fingergestures.yml @@ -81,6 +81,7 @@ Builds: - versionName: 10.0.0 versionCode: 53 + disable: fails to build commit: v10.0.0 subdir: app gradle: diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index d070d656d3..9d6787fc60 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -3608,9 +3608,19 @@ Builds: prebuild: sed -i -e '/keystoreProperties/d' build.gradle ndk: r21d + - versionName: '1.1446' + versionCode: 1446 + commit: '1.1446' + subdir: app + submodules: true + gradle: + - fdroid + prebuild: sed -i -e '/keystoreProperties/d' build.gradle + ndk: r21d + MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore. AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: '1.1445' -CurrentVersionCode: 1445 +CurrentVersion: '1.1446' +CurrentVersionCode: 1446 diff --git a/metadata/fr.free.nrw.commons.yml b/metadata/fr.free.nrw.commons.yml index 30e80c54e6..a8c2a3ef69 100644 --- a/metadata/fr.free.nrw.commons.yml +++ b/metadata/fr.free.nrw.commons.yml @@ -326,7 +326,7 @@ Builds: - versionName: 3.0.0 versionCode: 876 - commit: v3.0.0 + commit: v3.0 subdir: app gradle: - prod diff --git a/metadata/org.adaway.yml b/metadata/org.adaway.yml index 04a0f711ed..c6cd07cf8b 100644 --- a/metadata/org.adaway.yml +++ b/metadata/org.adaway.yml @@ -548,16 +548,6 @@ Builds: - Resources/symlink_hosts_to_data.zip ndk: r21d - - versionName: 5.2.0 - versionCode: 50200 - commit: v5.2.0 - subdir: app - gradle: - - yes - scanignore: - - Resources/symlink_hosts_to_data.zip - ndk: r21d - - versionName: 5.2.1 versionCode: 50201 commit: v5.2.1 @@ -566,7 +556,7 @@ Builds: - yes scanignore: - Resources/symlink_hosts_to_data.zip - ndk: r21d + ndk: r22 AutoUpdateMode: Version v%v UpdateCheckMode: Tags .*[0-9]$ diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml index 925de792cb..cc28ac37a5 100644 --- a/metadata/org.atalk.android.yml +++ b/metadata/org.atalk.android.yml @@ -1395,56 +1395,9 @@ Builds: - mv jni/static_library_built/openssl/output/android/ jni/openssl/ ndk: r15c - - versionName: 2.4.5 - versionCode: 1145 - disable: fails to build - commit: 2.4.5 - subdir: aTalk/ - gradle: - - fdroid - srclibs: - - fmj@r122 - - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512 - rm: - - aTalk/lib/src_reference/ - - aTalk/jni/ffmpeg/android/ - - aTalk/jni/openssl/android/ - - aTalk/jni/vpx/android/ - prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle - scanignore: - - aTalk/build.gradle - scandelete: - - aTalk/jni/static_library_built/libvpx/sources/*.gz - - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar - build: - - pushd $$fmj$$ - - ant - - popd - - pushd $$jitsi-zrtp4j$$ - - ant jar - - popd - - mkdir -p lib/bundles - - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar - - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar - - pushd jni/static_library_built/ffmpeg-x264/ - - ./init_update_libs.sh - - ./ffmpeg-atalk_build.sh - - popd - - mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/ - - pushd jni/static_library_built/libvpx/ - - ./init_libvpx.sh - - ./build-libvpx4android.sh - - popd - - mv jni/static_library_built/libvpx/output/android/ jni/vpx/ - - pushd jni/static_library_built/openssl/ - - ./init_libopenssl.sh - - ./build-openssl4android.sh - - popd - - mv jni/static_library_built/openssl/output/android/ jni/openssl/ - ndk: r15c - - versionName: 2.4.6 versionCode: 1146 + disable: fails to build commit: 2.4.6 subdir: aTalk/ gradle: diff --git a/metadata/org.courville.nova.yml b/metadata/org.courville.nova.yml index da09052a49..1ae9d75acc 100644 --- a/metadata/org.courville.nova.yml +++ b/metadata/org.courville.nova.yml @@ -337,6 +337,7 @@ Builds: - versionName: 4.49.12 versionCode: 404912 + disable: fails to build commit: v4.49.12_c404912 subdir: Video submodules: true diff --git a/metadata/org.kde.kdeconnect_tp.yml b/metadata/org.kde.kdeconnect_tp.yml index 0d41495d07..e14b1e8a43 100644 --- a/metadata/org.kde.kdeconnect_tp.yml +++ b/metadata/org.kde.kdeconnect_tp.yml @@ -499,7 +499,7 @@ Builds: - versionName: 1.16.0 versionCode: 11600 - commit: v1.16.0 + commit: v1.16 gradle: - yes prebuild: sed -i -e '/javaMaxHeapSize/s/4g/2g/g' build.gradle diff --git a/metadata/org.kristbaum.como.yml b/metadata/org.kristbaum.como.yml index 85b00020c0..8037602a5f 100644 --- a/metadata/org.kristbaum.como.yml +++ b/metadata/org.kristbaum.como.yml @@ -22,7 +22,7 @@ Builds: - versionName: '2.5' versionCode: 19 - commit: v2.5 + commit: v2.6 subdir: app gradle: - yes diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml index 2177015026..86999fb8ca 100644 --- a/metadata/se.manyver.yml +++ b/metadata/se.manyver.yml @@ -1499,55 +1499,9 @@ Builds: - npm run build-android-assets ndk: r21d - - versionName: 0.2012.4-beta-fdroid - versionCode: 94 - disable: fails to build - commit: v0.2012.4-beta - timeout: 30000 - subdir: android/app - sudo: - - apt-get update || apt-get update - - apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386 - ninja-build linux-libc-dev linux-libc-dev:i386 - - curl -Lo node.tar.xz https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.xz - - echo "1956e196e3c3c8ef5f0c45db76d7c1245af4ccdda2b7ab30a57ce91d6e165caa node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v12.16.3-linux-x64/. /usr/local/ - - npm install -g react-native-cli - init: npm install --no-optional - patch: - - build.patch - gradle: - - fdroid - srclibs: - - NodejsMobile@nodejs-mobile-v0.3.1 - rm: - - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar - - node_modules/react-native/template/ - - e2e/apple-app-store-demo - prebuild: sed -i -e '/lifecycle/d' ../build.gradle - scanignore: - - android/build.gradle - - node_modules/@react-native-community/async-storage/android/build.gradle - - node_modules/react-native-localize/android/build.gradle - - node_modules/react-native/android - - node_modules/jsc-android - scandelete: - - node_modules - build: - - pushd $$NodejsMobile$$ - - ./tools/android_build.sh $$NDK$$ arm - - ./tools/android_build.sh $$NDK$$ arm64 - - popd - - mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so - - mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so - - npm run build-android-assets - ndk: r21d - - versionName: 0.2101.5-beta-fdroid-fdroid versionCode: 95 - commit: v0.2101.5-beta-fdroid + commit: v0.2101.5-beta timeout: 30000 subdir: android/app sudo: