diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec423d2dd7..ca18777c29 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,7 +110,7 @@ to appear in our repository. - You may like to add [localization and screenshots], so users can have a glance at the app in pictures and in their preferred language. - You can advertise the download of your app in this app store using the - [official grafic][get-it-on-fdroid]. + [official grafic][get-it-on-fdroid]. ``` @@ -127,9 +127,9 @@ to appear in our repository. ``` https://img.shields.io/github/release/USER/REPO.svg?logo=github ``` - -[localization and screenshots]: https://fdroid.gitlab.io/fdroid-website/docs/All_About_Descriptions_Graphics_and_Screenshots/ + +[localization and screenshots]: https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/ [get-it-on-fdroid]: https://f-droid.org/badge/get-it-on.png -[auto-updates]: https://f-droid.org/en/docs/Build_Metadata_Reference/#Auto-Update-Mode +[auto-updates]: https://f-droid.org/en/docs/Build_Metadata_Reference/#autoupdatemode [shields.io]: https://shields.io/#/examples/version diff --git a/metadata/apps.jizzu.simpletodo.yml b/metadata/apps.jizzu.simpletodo.yml index 9be34cfdd2..27ade1d646 100644 --- a/metadata/apps.jizzu.simpletodo.yml +++ b/metadata/apps.jizzu.simpletodo.yml @@ -31,7 +31,11 @@ Builds: gradle: - yes -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags +MaintainerNotes: Versions after 1.1 include Firebase and Crashlytics. + +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: '1.1' CurrentVersionCode: 5 + +NoSourceSince: '1.1' diff --git a/metadata/be.mygod.vpnhotspot.yml b/metadata/be.mygod.vpnhotspot.yml index be164dce95..456093e800 100644 --- a/metadata/be.mygod.vpnhotspot.yml +++ b/metadata/be.mygod.vpnhotspot.yml @@ -345,6 +345,7 @@ Builds: - versionName: 2.6.3 versionCode: 216 + disable: unknown maven repo 'https://kotlin.bintray.com/kotlinx' commit: v2.6.3 subdir: mobile gradle: diff --git a/metadata/com.aefyr.sai.fdroid.yml b/metadata/com.aefyr.sai.fdroid.yml index 22635ae09b..058fea82f5 100644 --- a/metadata/com.aefyr.sai.fdroid.yml +++ b/metadata/com.aefyr.sai.fdroid.yml @@ -109,7 +109,7 @@ Builds: - versionName: '2.10' versionCode: 40 - disable: fails to build + disable: Could not find moe.shizuku.privilege:api:3.0.0-alpha10 commit: '2.10' subdir: app gradle: @@ -129,6 +129,7 @@ Builds: - versionName: '3.0' versionCode: 41 + disable: Could not find moe.shizuku.privilege:api:3.0.0-alpha10 commit: '3.0' subdir: app gradle: diff --git a/metadata/com.gianlu.aria2app.yml b/metadata/com.gianlu.aria2app.yml index 31464d7fd4..55f8058483 100644 --- a/metadata/com.gianlu.aria2app.yml +++ b/metadata/com.gianlu.aria2app.yml @@ -491,7 +491,17 @@ Builds: prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle ../CommonUtils/build.gradle + - versionName: 5.4.5 + versionCode: 196 + commit: v5.4.5 + subdir: app + submodules: true + gradle: + - foss + prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle + ../CommonUtils/build.gradle + AutoUpdateMode: Version v%v UpdateCheckMode: Tags -CurrentVersion: 5.4.4 -CurrentVersionCode: 195 +CurrentVersion: 5.4.5 +CurrentVersionCode: 196 diff --git a/metadata/com.indieweb.indigenous.yml b/metadata/com.indieweb.indigenous.yml index 00fbdae404..8fb56ffbee 100644 --- a/metadata/com.indieweb.indigenous.yml +++ b/metadata/com.indieweb.indigenous.yml @@ -93,7 +93,14 @@ Builds: gradle: - fdroid + - versionName: '0.49' + versionCode: 49 + commit: '0.49' + subdir: app + gradle: + - fdroid + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: '0.48' -CurrentVersionCode: 48 +CurrentVersion: '0.49' +CurrentVersionCode: 49 diff --git a/metadata/com.lavadip.miniVector.yml b/metadata/com.lavadip.miniVector.yml index fb7bf77dd3..8bdc2b584f 100644 --- a/metadata/com.lavadip.miniVector.yml +++ b/metadata/com.lavadip.miniVector.yml @@ -510,7 +510,19 @@ Builds: - sed -i -e '/Jitsi repo/,+5d' ../build.gradle - sed -i -e 's/enable true/enable false/g' build.gradle + - versionName: 0.9.9 + versionCode: 90900 + commit: 335a1665fc4cd3cc1e97da85ca8e7c43e3792a9f + subdir: vector + gradle: + - appfdroid + prebuild: + - sed -i -e '/com.google.firebase/,+5d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - sed -i -e '/Jitsi repo/,+5d' ../build.gradle + - sed -i -e 's/enable true/enable false/g' build.gradle + AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 0.9.8 -CurrentVersionCode: 90800 +CurrentVersion: 0.9.9 +CurrentVersionCode: 90900 diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml index ce3257c7b5..55cf031cc5 100644 --- a/metadata/com.nextcloud.android.beta.yml +++ b/metadata/com.nextcloud.android.beta.yml @@ -3981,9 +3981,21 @@ Builds: scandelete: - src/androidTest + - versionName: '20191127' + versionCode: 20191127 + commit: dev-20191127 + submodules: true + gradle: + - versionDev + rm: + - user_manual + - gplay.gradle + scandelete: + - src/androidTest + MaintainerNotes: Tags get removed. See https://github.com/nextcloud/android/issues/969. AutoUpdateMode: Version dev-%c UpdateCheckMode: Tags ^dev -CurrentVersion: '20191123' -CurrentVersionCode: 20191123 +CurrentVersion: '20191127' +CurrentVersionCode: 20191127 diff --git a/metadata/com.simplemobiletools.calculator.yml b/metadata/com.simplemobiletools.calculator.yml index 428f598dfc..c0e90fe214 100644 --- a/metadata/com.simplemobiletools.calculator.yml +++ b/metadata/com.simplemobiletools.calculator.yml @@ -153,7 +153,15 @@ Builds: - yes prebuild: sed -i -e '/keystore/d' build.gradle + - versionName: 5.1.0 + versionCode: 29 + commit: 5.1.0 + subdir: app + gradle: + - yes + prebuild: sed -i -e '/keystore/d' build.gradle + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 5.0.5 -CurrentVersionCode: 28 +CurrentVersion: 5.1.0 +CurrentVersionCode: 29 diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml index e4ffc7f60e..0553746cb8 100644 --- a/metadata/com.standardnotes.yml +++ b/metadata/com.standardnotes.yml @@ -157,6 +157,7 @@ Builds: - yes rm: - vendor/react-native-aes/android/build/ + - vendor/TrustKit/ prebuild: - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel - sed -i -e 's/gradle-4.1/gradle-5.4.1/' gradle/wrapper/gradle-wrapper.properties diff --git a/metadata/com.tachibana.downloader.yml b/metadata/com.tachibana.downloader.yml index 5cf125d79b..2cce287bc2 100644 --- a/metadata/com.tachibana.downloader.yml +++ b/metadata/com.tachibana.downloader.yml @@ -34,7 +34,14 @@ Builds: gradle: - yes + - versionName: '1.1' + versionCode: 6 + commit: '1.1' + subdir: app + gradle: + - yes + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 1.0.3 -CurrentVersionCode: 5 +CurrentVersion: '1.1' +CurrentVersionCode: 6 diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index 9180cb8d47..dfa4af468c 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1005,10 +1005,27 @@ Builds: - popd ndk: r20 + - versionName: 15.1.0 + versionCode: 105 + commit: 15.1.0 + subdir: app + gradle: + - yes + srclibs: + - libbaresip-android@7.0 + build: + - pushd $$libbaresip-android$$ + - sed -i -e 's|/opt/Android/Sdk/ndk-bundle|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip|' + Makefile + - make download-sources + - make install-all + - popd + ndk: r20 + MaintainerNotes: make download-sources checks out master branches of several libraries; this can cause build failures. AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 15.0.0 -CurrentVersionCode: 104 +CurrentVersion: 15.1.0 +CurrentVersionCode: 105 diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 65aeb53e73..84ae431d9b 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -205,7 +205,17 @@ Builds: scandelete: - android/libs + - versionName: 3.3.2 + versionCode: 332 + commit: 3.3.2 + subdir: android + gradle: + - yes + prebuild: sed -i -e '/maven.aliyun.com/d' ../build.gradle + scandelete: + - android/libs + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 3.3.1 -CurrentVersionCode: 330 +CurrentVersion: 3.3.2 +CurrentVersionCode: 332 diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index 5e24ac3a1f..c4b9d9f0b5 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -977,6 +977,33 @@ Builds: - ./compile.sh --release --no-gradle ndk: r20 + - versionName: 20191127-01 + versionCode: 202 + commit: android/release_202 + timeout: 10800 + subdir: client-android/ring-android/app + submodules: true + gradle: + - noPush + rm: + - client-electron + - client-gnome + - client-ios + - client-macosx + - client-uwp + - client-windows + - docker + - docs + - lrc + - packaging + - scripts + build: + - cd ../.. + - export ANDROID_NDK_ROOT="$ANDROID_NDK" + - export ANDROID_ABI="armeabi-v7a arm64-v8a x86" + - ./compile.sh --release --no-gradle + ndk: r20 + MaintainerNotes: |- Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures. Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports. @@ -986,5 +1013,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 20191122-01 -CurrentVersionCode: 201 +CurrentVersion: 20191127-01 +CurrentVersionCode: 202 diff --git a/metadata/de.r4md4c.gamedealz.yml b/metadata/de.r4md4c.gamedealz.yml index 428213b191..e4c33eba85 100644 --- a/metadata/de.r4md4c.gamedealz.yml +++ b/metadata/de.r4md4c.gamedealz.yml @@ -134,6 +134,8 @@ Builds: subdir: app gradle: - yes + scandelete: + - buildSrc gradleprops: - ITAD_CLIENT_ID=6bf49a5917670519 - ITAD_CLIENT_SECRET=4fad0634c8176d83a21e140f83793e96e56a41be diff --git a/metadata/de.srlabs.snoopsnitch.yml b/metadata/de.srlabs.snoopsnitch.yml index ca476021a4..f51ed08d33 100644 --- a/metadata/de.srlabs.snoopsnitch.yml +++ b/metadata/de.srlabs.snoopsnitch.yml @@ -286,7 +286,35 @@ Builds: - bash copy.sh ndk: r14b + - versionName: 2.0.10-nbc + versionCode: 39 + commit: SnoopSnitch-2.0.10-nbc + subdir: SnoopSnitch/app + submodules: true + sudo: + - apt update || apt update + - apt install -y texinfo + gradle: + - nobuildcheck + rm: + - SnoopSnitch/app/src/main/jniLibs/*/*.so + - contrib/prebuilt/*.so + prebuild: sed -i -e '/versionNameSuffix/d' build.gradle + scandelete: + - SnoopSnitch/patchanalysis + build: + - export NDK_DIR=$$NDK$$ + - cd ../../contrib + - bash compile.sh -t android -u + - cd ../SnoopSnitch/patchanalysis/contrib + - bash compile.sh -t android -u + - bash copy.sh + - cp builds/*.so ../../../contrib/prebuilt + - cd ../.. + - bash copy.sh + ndk: r14b + AutoUpdateMode: Version SnoopSnitch-%v UpdateCheckMode: Tags -CurrentVersion: 2.0.9-nbc -CurrentVersionCode: 38 +CurrentVersion: 2.0.10-nbc +CurrentVersionCode: 39 diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index ef52fe3b01..e2ec94d364 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -651,7 +651,26 @@ Builds: - npm install - node dist prod + - versionName: 3.64.3 + versionCode: 364030 + commit: tutanota-android-release-3.64.3 + subdir: app-android/app + sudo: + - curl -Lo node.tar.xz https://nodejs.org/dist/v10.11.0/node-v10.11.0-linux-x64.tar.xz + - echo "c2eab149e7f0712a6a3eb672a76d657b049a3b3ae0c2edc2e0571df5049fe82c node.tar.xz" + | sha256sum -c - + - tar xJf node.tar.xz + - cp -a node-v10.11.0-linux-x64/. /usr/local/ + gradle: + - yes + prebuild: + - cd ../.. + - rm -rf app-ios + - node fdroid-fix-deps + - npm install + - node dist prod + AutoUpdateMode: Version tutanota-android-release-%v UpdateCheckMode: Tags tutanota-android-release-* -CurrentVersion: 3.60.15 -CurrentVersionCode: 360150 +CurrentVersion: 3.64.3 +CurrentVersionCode: 364030 diff --git a/metadata/eu.droogers.smsmatrix.yml b/metadata/eu.droogers.smsmatrix.yml index c0fefb4c8a..dfe4fab2e7 100644 --- a/metadata/eu.droogers.smsmatrix.yml +++ b/metadata/eu.droogers.smsmatrix.yml @@ -56,7 +56,14 @@ Builds: gradle: - yes + - versionName: 0.0.15 + versionCode: 15 + commit: v0.0.15 + subdir: app + gradle: + - yes + AutoUpdateMode: Version v%v UpdateCheckMode: Tags -CurrentVersion: 0.0.14 -CurrentVersionCode: 14 +CurrentVersion: 0.0.15 +CurrentVersionCode: 15 diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index 5818063c06..61581e55d3 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -1873,7 +1873,16 @@ Builds: - full prebuild: sed -i -e '/keystoreProperties/d' build.gradle + - versionName: '1.827' + versionCode: 827 + commit: '1.827' + subdir: app + submodules: true + gradle: + - full + prebuild: sed -i -e '/keystoreProperties/d' build.gradle + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: '1.826' -CurrentVersionCode: 826 +CurrentVersion: '1.827' +CurrentVersionCode: 827 diff --git a/metadata/im.vector.alpha.yml b/metadata/im.vector.alpha.yml index 976d5c2524..6ba01c5a1f 100644 --- a/metadata/im.vector.alpha.yml +++ b/metadata/im.vector.alpha.yml @@ -1867,6 +1867,20 @@ Builds: scanignore: - build.gradle + - versionName: 0.9.9 + versionCode: 10090900 + commit: v0.9.9 + subdir: vector + gradle: + - appfdroid + output: build/outputs/apk/appfdroid/release/vector-appfdroid-armeabi-v7a-release-unsigned.apk + prebuild: + - sed -i -e '/com.google.firebase/,+5d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - echo "org.gradle.jvmargs=-Xmx4g" >> ../gradle.properties + scanignore: + - build.gradle + - versionName: 0.9.4 versionCode: 20090400 commit: v0.9.4 @@ -1894,6 +1908,20 @@ Builds: scanignore: - build.gradle + - versionName: 0.9.9 + versionCode: 20090900 + commit: v0.9.9 + subdir: vector + gradle: + - appfdroid + output: build/outputs/apk/appfdroid/release/vector-appfdroid-arm64-v8a-release-unsigned.apk + prebuild: + - sed -i -e '/com.google.firebase/,+5d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - echo "org.gradle.jvmargs=-Xmx4g" >> ../gradle.properties + scanignore: + - build.gradle + - versionName: 0.9.4 versionCode: 30090400 commit: v0.9.4 @@ -1921,6 +1949,20 @@ Builds: scanignore: - build.gradle + - versionName: 0.9.9 + versionCode: 30090900 + commit: v0.9.9 + subdir: vector + gradle: + - appfdroid + output: build/outputs/apk/appfdroid/release/vector-appfdroid-x86-release-unsigned.apk + prebuild: + - sed -i -e '/com.google.firebase/,+5d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - echo "org.gradle.jvmargs=-Xmx4g" >> ../gradle.properties + scanignore: + - build.gradle + - versionName: 0.9.4 versionCode: 40090400 commit: v0.9.4 @@ -1948,11 +1990,25 @@ Builds: scanignore: - build.gradle + - versionName: 0.9.9 + versionCode: 40090900 + commit: v0.9.9 + subdir: vector + gradle: + - appfdroid + output: build/outputs/apk/appfdroid/release/vector-appfdroid-x86_64-release-unsigned.apk + prebuild: + - sed -i -e '/com.google.firebase/,+5d' build.gradle + - sed -i -e '/com.google.gms.google-services/d' build.gradle + - echo "org.gradle.jvmargs=-Xmx4g" >> ../gradle.properties + scanignore: + - build.gradle + MaintainerNotes: Upstream builds and publishes a libre build of the jitsi sdk. The sdk build and riot use that sdk. The maven repo can be re=created by using ./build_jitsi_libs.sh -ArchivePolicy: 10 versions +ArchivePolicy: 12 versions AutoUpdateMode: None UpdateCheckMode: Tags -CurrentVersion: 0.9.8 -CurrentVersionCode: 40090800 +CurrentVersion: 0.9.9 +CurrentVersionCode: 40090900 diff --git a/metadata/mobi.maptrek.yml b/metadata/mobi.maptrek.yml index 78a8bbb669..a9b11c5275 100644 --- a/metadata/mobi.maptrek.yml +++ b/metadata/mobi.maptrek.yml @@ -64,7 +64,16 @@ Builds: - world ndk: r18b + - versionName: '2019.11' + versionCode: 75 + commit: '2019.11' + subdir: app/ + gradle: + - full + - world + ndk: r18b + AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: '2019.10' -CurrentVersionCode: 74 +CurrentVersion: '2019.11' +CurrentVersionCode: 75 diff --git a/metadata/net.osmand.plus.yml b/metadata/net.osmand.plus.yml index 3881402f08..7fab621e72 100644 --- a/metadata/net.osmand.plus.yml +++ b/metadata/net.osmand.plus.yml @@ -2782,6 +2782,198 @@ Builds: - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/ ndk: r17c + - versionName: 3.5.4 + versionCode: 354 + commit: v3.5.4 + subdir: android/OsmAnd + submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install --yes swig + gradle: + - full + - legacy + - fat + srclibs: + - icu50-2-1-patched@0d825a9779eeb8ee35977ddf8bb4bea4119bf638 + - osmand-external-skia@android/oreo + rm: + - android/OsmAnd-java/libs/*.jar + - android/OsmAnd-java/*.jar + - android/OsmAnd/libs/*.jar + - android/OsmAndCore-sample + prebuild: + - sed -i -e "/.*OsmAndCore.*SNAPSHOT.*/d" ../OsmAnd/build.gradle + - sed -i -e "/ivy {/,+6d" ../OsmAnd/build.gradle + - sed -i -e '/qt.*Compile/d' -e '/com.google.firebase/d' build.gradle ../plugins/Osmand-ParkingPlugin/build.gradle + ../plugins/Osmand-SRTMPlugin/build.gradle ../plugins/Osmand-Skimaps/build.gradle + ../plugins/Osmand-Nautical/build.gradle + - sed -i -e "s/System.getenv(\"APK_VERSION\")/\"$$VERSION$$\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APK_NUMBER_VERSION\")/\"$$VERCODE$$\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APP_FEATURES\")/\"+play_market +gps_status -parking_plugin + -blackberry -amazon -route_nav\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APP_NAME\")/\"OsmAnd~\"/g" build.gradle + - sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle + - sed -i -e '/com.android.vending.BILLING/d' AndroidManifest.xml + - "sed -i -e \"s/implementation fileTree.*/ implementation fileTree(include:\ + \ ['icu4j.jar'], dir: 'libs')\\n implementation 'commons-logging:commons-logging:1.1.1'\\\ + n implementation group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'\\\ + n implementation 'org.json:json:20090211'\\n implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'\\\ + n implementation 'net.sf.kxml:kxml2:2.3.0'\\n implementation 'org.beanshell:bsh-core:2.0b4'\\\ + n implementation 'fr.univ-valenciennes:bzip2:1.0'\\n implementation 'com.moparisthebest:junidecode:0.1.1'\\\ + n implementation 'com.vividsolutions:jts-core:1.14.0'/\" ../OsmAnd-java/build.gradle" + - "sed -i -e \"s/implementation fileTree.*/implementation fileTree(include:\ + \ ['classes.jar','icu4j.jar'], dir: 'libs')\\n implementation group: 'net.sf.trove4j',\ + \ name: 'trove4j', version: '3.0.3'\\n/\" build.gradle" + - sed -i -e '/facebook/d' build.gradle + - sed -i -e "s/, ':OsmAndCore-sample'//" ../settings.gradle + - pushd ../../core-legacy/externals + - sed -i "s/# Extract/sha256sum \$SRCLOC\/upstream.tar.bz2 | grep 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 + || { echo 'Failed checksum' 1>\&2; exit; }/" protobuf/configure.sh + - sed -i "/# Download/,+8d" skia/configure.sh + - sed -i "s/# Patch/cp -r $(echo $$osmand-external-skia$$ | sed 's/\//\\\//g') + \$SRCLOC\/upstream.original/" skia/configure.sh + - popd + - echo "org.gradle.jvmargs=-XX:MaxHeapSize=2048m" >> ../gradle.properties + scanignore: + - help/website/help/map-legend_nautical.png + - help/website/help/map-legend_default.png + - help/website/images/dvr/4p-en.png + - help/website/images/blog/ios-2-0/con-scrn-1.png + - help/website/images/blog/ios-2-0/con-scrn-2.png + - help/website/images/blog/ios-2-0/interf-2.png + - help/website/images/blog/ios-2-0/navigat-6.png + - android/OsmAnd/assets/fonts/RobotoSlab-Regular.ttf + - help/website/fonts/Roboto-Regular-webfont.ttf + - help/website/fonts/Roboto-Bold-webfont.woff + - help/website/fonts/Roboto-Regular-webfont.eot + - help/website/fonts/Roboto-Bold-webfont.ttf + - help/website/fonts/Roboto-Regular-webfont.woff + - help/website/fonts/Roboto-Bold-webfont.eot + build: + - pushd ../../OsmAnd-core/wrappers/android/ + - sed -i -e "/Native/d" settings.gradle + - sed -i -e "/Native/d" build.gradle + - sed -i -e "/compileTask.*copyNdkSharedLibs/d" build.gradle + - sed -i -e "/compileTask.*copyQtSharedLibs/d" build.gradle + - sed -i -e "/compileTask.*copyQtJarLibs/d" build.gradle + - sed -i -e "s/mavenCentral()/mavenCentral()\n google()\n jcenter()/" build.gradle + - gradle assembleRelease + - cd build/outputs/aar + - unzip OsmAndCore_android-release.aar + - cp classes.jar ../../../../../../android/OsmAnd/libs/ + - popd + - pushd $$icu50-2-1-patched$$/icu4j + - ant jar + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/brkitr/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/coll/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/curr/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/lang/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/rbnf/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/region/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/translit/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/zone/*" + - popd + - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar libs/ + - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/ + ndk: r17c + + - versionName: 3.5.5 + versionCode: 355 + commit: v3.5.5 + subdir: android/OsmAnd + submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install --yes swig + gradle: + - full + - legacy + - fat + srclibs: + - icu50-2-1-patched@0d825a9779eeb8ee35977ddf8bb4bea4119bf638 + - osmand-external-skia@android/oreo + rm: + - android/OsmAnd-java/libs/*.jar + - android/OsmAnd-java/*.jar + - android/OsmAnd/libs/*.jar + - android/OsmAndCore-sample + prebuild: + - sed -i -e "/.*OsmAndCore.*SNAPSHOT.*/d" ../OsmAnd/build.gradle + - sed -i -e "/ivy {/,+6d" ../OsmAnd/build.gradle + - sed -i -e '/qt.*Compile/d' -e '/com.google.firebase/d' build.gradle ../plugins/Osmand-ParkingPlugin/build.gradle + ../plugins/Osmand-SRTMPlugin/build.gradle ../plugins/Osmand-Skimaps/build.gradle + ../plugins/Osmand-Nautical/build.gradle + - sed -i -e "s/System.getenv(\"APK_VERSION\")/\"$$VERSION$$\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APK_NUMBER_VERSION\")/\"$$VERCODE$$\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APP_FEATURES\")/\"+play_market +gps_status -parking_plugin + -blackberry -amazon -route_nav\"/g" build.gradle + - sed -i -e "s/System.getenv(\"APP_NAME\")/\"OsmAnd~\"/g" build.gradle + - sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle + - sed -i -e '/com.android.vending.BILLING/d' AndroidManifest.xml + - "sed -i -e \"s/implementation fileTree.*/ implementation fileTree(include:\ + \ ['icu4j.jar'], dir: 'libs')\\n implementation 'commons-logging:commons-logging:1.1.1'\\\ + n implementation group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'\\\ + n implementation 'org.json:json:20090211'\\n implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'\\\ + n implementation 'net.sf.kxml:kxml2:2.3.0'\\n implementation 'org.beanshell:bsh-core:2.0b4'\\\ + n implementation 'fr.univ-valenciennes:bzip2:1.0'\\n implementation 'com.moparisthebest:junidecode:0.1.1'\\\ + n implementation 'com.vividsolutions:jts-core:1.14.0'/\" ../OsmAnd-java/build.gradle" + - "sed -i -e \"s/implementation fileTree.*/implementation fileTree(include:\ + \ ['classes.jar','icu4j.jar'], dir: 'libs')\\n implementation group: 'net.sf.trove4j',\ + \ name: 'trove4j', version: '3.0.3'\\n/\" build.gradle" + - sed -i -e '/facebook/d' build.gradle + - sed -i -e "s/, ':OsmAndCore-sample'//" ../settings.gradle + - pushd ../../core-legacy/externals + - sed -i "s/# Extract/sha256sum \$SRCLOC\/upstream.tar.bz2 | grep 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 + || { echo 'Failed checksum' 1>\&2; exit; }/" protobuf/configure.sh + - sed -i "/# Download/,+8d" skia/configure.sh + - sed -i "s/# Patch/cp -r $(echo $$osmand-external-skia$$ | sed 's/\//\\\//g') + \$SRCLOC\/upstream.original/" skia/configure.sh + - popd + - echo "org.gradle.jvmargs=-XX:MaxHeapSize=2048m" >> ../gradle.properties + scanignore: + - help/website/help/map-legend_nautical.png + - help/website/help/map-legend_default.png + - help/website/images/dvr/4p-en.png + - help/website/images/blog/ios-2-0/con-scrn-1.png + - help/website/images/blog/ios-2-0/con-scrn-2.png + - help/website/images/blog/ios-2-0/interf-2.png + - help/website/images/blog/ios-2-0/navigat-6.png + - android/OsmAnd/assets/fonts/RobotoSlab-Regular.ttf + - help/website/fonts/Roboto-Regular-webfont.ttf + - help/website/fonts/Roboto-Bold-webfont.woff + - help/website/fonts/Roboto-Regular-webfont.eot + - help/website/fonts/Roboto-Bold-webfont.ttf + - help/website/fonts/Roboto-Regular-webfont.woff + - help/website/fonts/Roboto-Bold-webfont.eot + build: + - pushd ../../OsmAnd-core/wrappers/android/ + - sed -i -e "/Native/d" settings.gradle + - sed -i -e "/Native/d" build.gradle + - sed -i -e "/compileTask.*copyNdkSharedLibs/d" build.gradle + - sed -i -e "/compileTask.*copyQtSharedLibs/d" build.gradle + - sed -i -e "/compileTask.*copyQtJarLibs/d" build.gradle + - sed -i -e "s/mavenCentral()/mavenCentral()\n google()\n jcenter()/" build.gradle + - gradle assembleRelease + - cd build/outputs/aar + - unzip OsmAndCore_android-release.aar + - cp classes.jar ../../../../../../android/OsmAnd/libs/ + - popd + - pushd $$icu50-2-1-patched$$/icu4j + - ant jar + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/brkitr/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/coll/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/curr/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/lang/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/rbnf/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/region/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/translit/*" + - zip -d icu4j.jar "com/ibm/icu/impl/data/icudt50b/zone/*" + - popd + - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar libs/ + - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/ + ndk: r17c + MaintainerNotes: |- Update CV only after sucessfully built and tested. @@ -2843,5 +3035,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 3.5.3 -CurrentVersionCode: 353 +CurrentVersion: 3.5.5 +CurrentVersionCode: 355 diff --git a/metadata/net.sourceforge.dibdib.android.dib2qm.yml b/metadata/net.sourceforge.dibdib.android.dib2qm.yml index caa38d2093..16918573f1 100644 --- a/metadata/net.sourceforge.dibdib.android.dib2qm.yml +++ b/metadata/net.sourceforge.dibdib.android.dib2qm.yml @@ -93,7 +93,14 @@ Builds: gradle: - yes + - versionName: 0.22.30 + versionCode: 2230 + commit: v0.22.30 + subdir: app + gradle: + - yes + AutoUpdateMode: Version v%v UpdateCheckMode: Tags -CurrentVersion: 0.22.20 -CurrentVersionCode: 2220 +CurrentVersion: 0.22.30 +CurrentVersionCode: 2230 diff --git a/metadata/nl.asymmetrics.droidshows.yml b/metadata/nl.asymmetrics.droidshows.yml index 10ffba0464..d415827d6f 100644 --- a/metadata/nl.asymmetrics.droidshows.yml +++ b/metadata/nl.asymmetrics.droidshows.yml @@ -292,7 +292,7 @@ Builds: - versionName: 7.9.9b versionCode: 800 - commit: 7.9.9b + commit: 8.0.0 AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/org.droidtr.keyboard.yml b/metadata/org.droidtr.keyboard.yml index 6ff87ed5fd..b459cd4b01 100644 --- a/metadata/org.droidtr.keyboard.yml +++ b/metadata/org.droidtr.keyboard.yml @@ -172,6 +172,7 @@ Builds: - versionName: 7.6.5 versionCode: 60 + disable: no tag commit: 7.6.5 output: bin/app.apk rm: diff --git a/metadata/org.openhab.habdroid.beta.yml b/metadata/org.openhab.habdroid.beta.yml index 0f5a296dc0..27dbb2334a 100644 --- a/metadata/org.openhab.habdroid.beta.yml +++ b/metadata/org.openhab.habdroid.beta.yml @@ -1164,10 +1164,20 @@ Builds: prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' build.gradle + - versionName: 2.10.15-beta + versionCode: 225 + commit: 2.10.15-beta-fdroid + subdir: mobile + gradle: + - foss + - beta + prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d + -e '/google-services/d' build.gradle + MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting it to not trigger fdroid/fdroidserver#463. AutoUpdateMode: Version %v-fdroid UpdateCheckMode: Tags ^[0-9.]+-beta-fdroid$ -CurrentVersion: 2.10.14-beta -CurrentVersionCode: 224 +CurrentVersion: 2.10.15-beta +CurrentVersionCode: 225 diff --git a/metadata/org.traccar.client.yml b/metadata/org.traccar.client.yml index 85c6e776f7..5e5d9c8995 100644 --- a/metadata/org.traccar.client.yml +++ b/metadata/org.traccar.client.yml @@ -302,33 +302,6 @@ Builds: prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' -e '/crashlytics/d' ../build.gradle build.gradle - - versionName: '5.21' - versionCode: 58 - commit: v5.21 - subdir: app - gradle: - - regular - prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' - -e '/crashlytics/d' ../build.gradle build.gradle - - - versionName: '5.23' - versionCode: 60 - commit: v5.23 - subdir: app - gradle: - - regular - prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' - -e '/crashlytics/d' ../build.gradle build.gradle - - - versionName: '6.0' - versionCode: 61 - commit: v6.0 - subdir: app - gradle: - - regular - prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' - -e '/crashlytics/d' ../build.gradle build.gradle - - versionName: '6.1' versionCode: 62 commit: v6.1 diff --git a/metadata/org.walleth.yml b/metadata/org.walleth.yml index 503ecc0e0b..cf6e36b85c 100644 --- a/metadata/org.walleth.yml +++ b/metadata/org.walleth.yml @@ -457,6 +457,16 @@ Builds: - online prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle + - versionName: 0.47.1 + versionCode: 471 + commit: 0.47.1 + subdir: app + gradle: + - noGeth + - forFDroid + - online + prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle + MaintainerNotes: |- We remove https://kotlin.bintray.com/kotlinx Maven repo from build.gradle because it isn't whitelisted while all needed artifacts are available via @@ -464,5 +474,5 @@ MaintainerNotes: |- AutoUpdateMode: Version %v UpdateCheckMode: Tags -CurrentVersion: 0.46.8 -CurrentVersionCode: 468 +CurrentVersion: 0.47.1 +CurrentVersionCode: 471 diff --git a/metadata/ru.yanus171.feedexfork.yml b/metadata/ru.yanus171.feedexfork.yml index 3ecbd72de9..147f1992b9 100644 --- a/metadata/ru.yanus171.feedexfork.yml +++ b/metadata/ru.yanus171.feedexfork.yml @@ -224,13 +224,6 @@ Builds: gradle: - yes - - versionName: 0.11.3 - versionCode: 188 - commit: v0.11.3 - subdir: FlymFork - gradle: - - yes - - versionName: 0.11.5 versionCode: 189 commit: v0.11.5 diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml index 16349e3a3b..2ece51da90 100644 --- a/metadata/se.manyver.yml +++ b/metadata/se.manyver.yml @@ -1068,11 +1068,52 @@ Builds: - npm run build-android-assets ndk: r19c + - versionName: 0.1911.27-beta + versionCode: 78 + commit: v0.1911.27-beta + timeout: 20000 + 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/v10.16.3/node-v10.16.3-linux-x64.tar.xz + - echo "d2271fd8cf997fa7447d638dfa92749ff18ca4b0d796bf89f2a82bf7800d5506 node.tar.xz" + | sha256sum -c - + - tar xJf node.tar.xz + - cp -a node-v10.16.3-linux-x64/. /usr/local/ + - npm install -g react-native-cli + init: + - npm install --no-optional + - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel + gradle: + - indie + srclibs: + - NodejsMobile@nodejs-mobile-v0.2.1 + rm: + - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar + - node_modules/react-native/template/ + - node_modules/react-native-android-wifi/Examples/ + prebuild: sed -i -e '/lifecycle/d' ../build.gradle + scanignore: + - android/build.gradle + 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: r19c + MaintainerNotes: scanignore is used to allow the "node_modules/react-native/android" local Maven repository which contains the prebuilt react-native library which we get from npm. AutoUpdateMode: Version v%v UpdateCheckMode: Tags -CurrentVersion: 0.1911.19-beta -CurrentVersionCode: 77 +CurrentVersion: 0.1911.27-beta +CurrentVersionCode: 78 diff --git a/stats/licenses.txt b/stats/licenses.txt index 02b00de8ec..6a4fed04cc 100644 --- a/stats/licenses.txt +++ b/stats/licenses.txt @@ -1,6 +1,6 @@ GPL-3.0-only 1114 Apache-2.0 683 -GPL-3.0-or-later 473 +GPL-3.0-or-later 474 MIT 369 GPL-2.0-only 147 GPL-2.0-or-later 109 @@ -14,8 +14,8 @@ Unlicense 15 BSD-2-Clause-FreeBSD 13 PublicDomain 12 ISC 8 -LGPL-2.1-only 6 CC-BY-SA-4.0 5 +LGPL-2.1-only 5 Artistic-2.0 4 LGPL-2.1-or-later 4 BSD-2-Clause 3