Merge remote-tracking branch 'refs/remotes/fdroid/master'

This commit is contained in:
Joris Bodin 2019-11-29 10:19:17 +01:00
commit 85eb7b57d8
No known key found for this signature in database
GPG key ID: 3144433DBB0C5A21
31 changed files with 559 additions and 85 deletions

View file

@ -110,7 +110,7 @@ to appear in our repository.
- You may like to add [localization and screenshots], so users can have a glance - You may like to add [localization and screenshots], so users can have a glance
at the app in pictures and in their preferred language. at the app in pictures and in their preferred language.
- You can advertise the download of your app in this app store using the - 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].
<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75"> <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75">
``` ```
@ -127,9 +127,9 @@ to appear in our repository.
``` ```
https://img.shields.io/github/release/USER/REPO.svg?logo=github 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 [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 [shields.io]: https://shields.io/#/examples/version

View file

@ -31,7 +31,11 @@ Builds:
gradle: gradle:
- yes - yes
AutoUpdateMode: Version v%v MaintainerNotes: Versions after 1.1 include Firebase and Crashlytics.
UpdateCheckMode: Tags
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: '1.1' CurrentVersion: '1.1'
CurrentVersionCode: 5 CurrentVersionCode: 5
NoSourceSince: '1.1'

View file

@ -345,6 +345,7 @@ Builds:
- versionName: 2.6.3 - versionName: 2.6.3
versionCode: 216 versionCode: 216
disable: unknown maven repo 'https://kotlin.bintray.com/kotlinx'
commit: v2.6.3 commit: v2.6.3
subdir: mobile subdir: mobile
gradle: gradle:

View file

@ -109,7 +109,7 @@ Builds:
- versionName: '2.10' - versionName: '2.10'
versionCode: 40 versionCode: 40
disable: fails to build disable: Could not find moe.shizuku.privilege:api:3.0.0-alpha10
commit: '2.10' commit: '2.10'
subdir: app subdir: app
gradle: gradle:
@ -129,6 +129,7 @@ Builds:
- versionName: '3.0' - versionName: '3.0'
versionCode: 41 versionCode: 41
disable: Could not find moe.shizuku.privilege:api:3.0.0-alpha10
commit: '3.0' commit: '3.0'
subdir: app subdir: app
gradle: gradle:

View file

@ -491,7 +491,17 @@ Builds:
prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle
../CommonUtils/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 AutoUpdateMode: Version v%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 5.4.4 CurrentVersion: 5.4.5
CurrentVersionCode: 195 CurrentVersionCode: 196

View file

@ -93,7 +93,14 @@ Builds:
gradle: gradle:
- fdroid - fdroid
- versionName: '0.49'
versionCode: 49
commit: '0.49'
subdir: app
gradle:
- fdroid
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '0.48' CurrentVersion: '0.49'
CurrentVersionCode: 48 CurrentVersionCode: 49

View file

@ -510,7 +510,19 @@ Builds:
- sed -i -e '/Jitsi repo/,+5d' ../build.gradle - sed -i -e '/Jitsi repo/,+5d' ../build.gradle
- sed -i -e 's/enable true/enable false/g' 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 AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: 0.9.8 CurrentVersion: 0.9.9
CurrentVersionCode: 90800 CurrentVersionCode: 90900

View file

@ -3981,9 +3981,21 @@ Builds:
scandelete: scandelete:
- src/androidTest - 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. MaintainerNotes: Tags get removed. See https://github.com/nextcloud/android/issues/969.
AutoUpdateMode: Version dev-%c AutoUpdateMode: Version dev-%c
UpdateCheckMode: Tags ^dev UpdateCheckMode: Tags ^dev
CurrentVersion: '20191123' CurrentVersion: '20191127'
CurrentVersionCode: 20191123 CurrentVersionCode: 20191127

View file

@ -153,7 +153,15 @@ Builds:
- yes - yes
prebuild: sed -i -e '/keystore/d' build.gradle 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 AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 5.0.5 CurrentVersion: 5.1.0
CurrentVersionCode: 28 CurrentVersionCode: 29

View file

@ -157,6 +157,7 @@ Builds:
- yes - yes
rm: rm:
- vendor/react-native-aes/android/build/ - vendor/react-native-aes/android/build/
- vendor/TrustKit/
prebuild: prebuild:
- truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel - 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 - sed -i -e 's/gradle-4.1/gradle-5.4.1/' gradle/wrapper/gradle-wrapper.properties

View file

@ -34,7 +34,14 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: '1.1'
versionCode: 6
commit: '1.1'
subdir: app
gradle:
- yes
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 1.0.3 CurrentVersion: '1.1'
CurrentVersionCode: 5 CurrentVersionCode: 6

View file

@ -1005,10 +1005,27 @@ Builds:
- popd - popd
ndk: r20 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; MaintainerNotes: make download-sources checks out master branches of several libraries;
this can cause build failures. this can cause build failures.
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 15.0.0 CurrentVersion: 15.1.0
CurrentVersionCode: 104 CurrentVersionCode: 105

View file

@ -205,7 +205,17 @@ Builds:
scandelete: scandelete:
- android/libs - 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 AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 3.3.1 CurrentVersion: 3.3.2
CurrentVersionCode: 330 CurrentVersionCode: 332

View file

@ -977,6 +977,33 @@ Builds:
- ./compile.sh --release --no-gradle - ./compile.sh --release --no-gradle
ndk: r20 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: |- MaintainerNotes: |-
Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures. 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. 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 AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: 20191122-01 CurrentVersion: 20191127-01
CurrentVersionCode: 201 CurrentVersionCode: 202

View file

@ -134,6 +134,8 @@ Builds:
subdir: app subdir: app
gradle: gradle:
- yes - yes
scandelete:
- buildSrc
gradleprops: gradleprops:
- ITAD_CLIENT_ID=6bf49a5917670519 - ITAD_CLIENT_ID=6bf49a5917670519
- ITAD_CLIENT_SECRET=4fad0634c8176d83a21e140f83793e96e56a41be - ITAD_CLIENT_SECRET=4fad0634c8176d83a21e140f83793e96e56a41be

View file

@ -286,7 +286,35 @@ Builds:
- bash copy.sh - bash copy.sh
ndk: r14b 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 AutoUpdateMode: Version SnoopSnitch-%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 2.0.9-nbc CurrentVersion: 2.0.10-nbc
CurrentVersionCode: 38 CurrentVersionCode: 39

View file

@ -651,7 +651,26 @@ Builds:
- npm install - npm install
- node dist prod - 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 AutoUpdateMode: Version tutanota-android-release-%v
UpdateCheckMode: Tags tutanota-android-release-* UpdateCheckMode: Tags tutanota-android-release-*
CurrentVersion: 3.60.15 CurrentVersion: 3.64.3
CurrentVersionCode: 360150 CurrentVersionCode: 364030

View file

@ -56,7 +56,14 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: 0.0.15
versionCode: 15
commit: v0.0.15
subdir: app
gradle:
- yes
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.0.14 CurrentVersion: 0.0.15
CurrentVersionCode: 14 CurrentVersionCode: 15

View file

@ -1873,7 +1873,16 @@ Builds:
- full - full
prebuild: sed -i -e '/keystoreProperties/d' build.gradle 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 AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '1.826' CurrentVersion: '1.827'
CurrentVersionCode: 826 CurrentVersionCode: 827

View file

@ -1867,6 +1867,20 @@ Builds:
scanignore: scanignore:
- build.gradle - 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 - versionName: 0.9.4
versionCode: 20090400 versionCode: 20090400
commit: v0.9.4 commit: v0.9.4
@ -1894,6 +1908,20 @@ Builds:
scanignore: scanignore:
- build.gradle - 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 - versionName: 0.9.4
versionCode: 30090400 versionCode: 30090400
commit: v0.9.4 commit: v0.9.4
@ -1921,6 +1949,20 @@ Builds:
scanignore: scanignore:
- build.gradle - 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 - versionName: 0.9.4
versionCode: 40090400 versionCode: 40090400
commit: v0.9.4 commit: v0.9.4
@ -1948,11 +1990,25 @@ Builds:
scanignore: scanignore:
- build.gradle - 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 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 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 AutoUpdateMode: None
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.9.8 CurrentVersion: 0.9.9
CurrentVersionCode: 40090800 CurrentVersionCode: 40090900

View file

@ -64,7 +64,16 @@ Builds:
- world - world
ndk: r18b ndk: r18b
- versionName: '2019.11'
versionCode: 75
commit: '2019.11'
subdir: app/
gradle:
- full
- world
ndk: r18b
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '2019.10' CurrentVersion: '2019.11'
CurrentVersionCode: 74 CurrentVersionCode: 75

View file

@ -2782,6 +2782,198 @@ Builds:
- cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/ - cp $$icu50-2-1-patched$$/icu4j/icu4j.jar ../OsmAnd-java/libs/
ndk: r17c 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: |- MaintainerNotes: |-
Update CV only after sucessfully built and tested. Update CV only after sucessfully built and tested.
@ -2843,5 +3035,5 @@ MaintainerNotes: |-
AutoUpdateMode: None AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: 3.5.3 CurrentVersion: 3.5.5
CurrentVersionCode: 353 CurrentVersionCode: 355

View file

@ -93,7 +93,14 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: 0.22.30
versionCode: 2230
commit: v0.22.30
subdir: app
gradle:
- yes
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.22.20 CurrentVersion: 0.22.30
CurrentVersionCode: 2220 CurrentVersionCode: 2230

View file

@ -292,7 +292,7 @@ Builds:
- versionName: 7.9.9b - versionName: 7.9.9b
versionCode: 800 versionCode: 800
commit: 7.9.9b commit: 8.0.0
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags

View file

@ -172,6 +172,7 @@ Builds:
- versionName: 7.6.5 - versionName: 7.6.5
versionCode: 60 versionCode: 60
disable: no tag
commit: 7.6.5 commit: 7.6.5
output: bin/app.apk output: bin/app.apk
rm: rm:

View file

@ -1164,10 +1164,20 @@ Builds:
prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
-e '/google-services/d' build.gradle -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 MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
it to not trigger fdroid/fdroidserver#463. it to not trigger fdroid/fdroidserver#463.
AutoUpdateMode: Version %v-fdroid AutoUpdateMode: Version %v-fdroid
UpdateCheckMode: Tags ^[0-9.]+-beta-fdroid$ UpdateCheckMode: Tags ^[0-9.]+-beta-fdroid$
CurrentVersion: 2.10.14-beta CurrentVersion: 2.10.15-beta
CurrentVersionCode: 224 CurrentVersionCode: 225

View file

@ -302,33 +302,6 @@ Builds:
prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d'
-e '/crashlytics/d' ../build.gradle build.gradle -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' - versionName: '6.1'
versionCode: 62 versionCode: 62
commit: v6.1 commit: v6.1

View file

@ -457,6 +457,16 @@ Builds:
- online - online
prebuild: sed -i -e '/kotlin.bintray.com/d' ../build.gradle 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: |- MaintainerNotes: |-
We remove https://kotlin.bintray.com/kotlinx Maven repo from build.gradle We remove https://kotlin.bintray.com/kotlinx Maven repo from build.gradle
because it isn't whitelisted while all needed artifacts are available via because it isn't whitelisted while all needed artifacts are available via
@ -464,5 +474,5 @@ MaintainerNotes: |-
AutoUpdateMode: Version %v AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.46.8 CurrentVersion: 0.47.1
CurrentVersionCode: 468 CurrentVersionCode: 471

View file

@ -224,13 +224,6 @@ Builds:
gradle: gradle:
- yes - yes
- versionName: 0.11.3
versionCode: 188
commit: v0.11.3
subdir: FlymFork
gradle:
- yes
- versionName: 0.11.5 - versionName: 0.11.5
versionCode: 189 versionCode: 189
commit: v0.11.5 commit: v0.11.5

View file

@ -1068,11 +1068,52 @@ Builds:
- npm run build-android-assets - npm run build-android-assets
ndk: r19c 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" MaintainerNotes: scanignore is used to allow the "node_modules/react-native/android"
local Maven repository which contains the prebuilt react-native library which local Maven repository which contains the prebuilt react-native library which
we get from npm. we get from npm.
AutoUpdateMode: Version v%v AutoUpdateMode: Version v%v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: 0.1911.19-beta CurrentVersion: 0.1911.27-beta
CurrentVersionCode: 77 CurrentVersionCode: 78

View file

@ -1,6 +1,6 @@
GPL-3.0-only 1114 GPL-3.0-only 1114
Apache-2.0 683 Apache-2.0 683
GPL-3.0-or-later 473 GPL-3.0-or-later 474
MIT 369 MIT 369
GPL-2.0-only 147 GPL-2.0-only 147
GPL-2.0-or-later 109 GPL-2.0-or-later 109
@ -14,8 +14,8 @@ Unlicense 15
BSD-2-Clause-FreeBSD 13 BSD-2-Clause-FreeBSD 13
PublicDomain 12 PublicDomain 12
ISC 8 ISC 8
LGPL-2.1-only 6
CC-BY-SA-4.0 5 CC-BY-SA-4.0 5
LGPL-2.1-only 5
Artistic-2.0 4 Artistic-2.0 4
LGPL-2.1-or-later 4 LGPL-2.1-or-later 4
BSD-2-Clause 3 BSD-2-Clause 3