From 851d3ca9b7716110c611646396b99b178992d598 Mon Sep 17 00:00:00 2001 From: Matthew Hague Date: Fri, 18 May 2018 13:07:30 +0100 Subject: [PATCH 1/7] Build OsmAnd 3.0.0 Fixes #1214. --- metadata/net.osmand.plus.txt | 40 ++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index ad2a4b12f1..c9d0ecb7cf 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -374,6 +374,40 @@ Build:2.9.3,293 popd ndk=r11c +Build:3.0.0,300 + commit=e2054218ab4dec175cd84b1ae48798dd5aeb291e + subdir=android/OsmAnd + submodules=yes + sudo=apt-get update && \ + apt-get install --yes -t jessie-backports swig + gradle=full,legacy,fat + rm=android/OsmAnd-java/libs/*.jar,android/OsmAnd-java/test/libs/*.jar,android/OsmAnd/ant-lib/*.jar,android/OsmAnd/libs/*.jar,android/OsmAndCore-sample + prebuild=sed -i -e "/net.osmand:OsmAndCore_android:.*SNAPSHOT@jar/d" ../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 '/javaMaxHeapSize/s/4g/1536m/g' build.gradle && \ + sed -i -e "s/compile fileTree.*/ compile 'commons-logging:commons-logging:1.1.1'\n compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'\n compile 'org.json:json:20090211'\n compile 'it.unibo.alice.tuprolog:tuprolog:3.2.1'\n compile 'net.sf.kxml:kxml2:2.3.0'\n compile 'org.beanshell:bsh-core:2.0b4'\n compile 'com.ibm.icu:icu4j:50.1'\n compile 'fr.univ-valenciennes:bzip2:1.0'\n compile 'com.moparisthebest:junidecode:0.1.1'\n compile 'com.vividsolutions:jts-core:1.14.0'/" ../OsmAnd-java/build.gradle && \ + sed -i -e "s/implementation fileTree.*/implementation fileTree(include: ['classes.jar'], dir: 'libs')\n implementation 'com.ibm.icu:icu4j:50.1'\n implementation group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'\n/" build.gradle && \ + sed -i -e "s/, ':OsmAndCore-sample'//" ../settings.gradle + 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 + 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 && \ + gradle assembleRelease && \ + cd build/outputs/aar && \ + unzip OsmAndCore_android-release.aar && \ + cp classes.jar ../../../../../../android/OsmAnd/libs/ && \ + popd + ndk=r11c + Maintainer Notes: Update CV only after sucessfully built and tested. @@ -410,12 +444,6 @@ Replacement of jar files in OsmAnd-java where versions did not match: junidecode-0.1.jar replaced with compile 'com.moparisthebest:junidecode:0.1.1' simple-logging.jar not replaced (subset of commons-logging-1.1.1.jar) -In OsmAnd directory, jar files are replaced as above except for those specifically excluded by the compile fileTree command, which are: - android-support-multidex.jar - QtAndroid-bundled.jar was not replaced - QtAndroidAccessibility-bundled.jar was not replaced - simple-logging.jar replaced by commons-logging-api:1.1 with sed addition of missing abstract methods trace(...) in PlatformUtils.java - The final sed command removes OsmAndCore-sample from the settings to prevent its build (which also downloads prebuilt binaries). OsmAndCore-sample is demo code that is not needed. From ee79c544e10d9f6de2713487511fd38895e4e091 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 18 May 2018 14:43:55 +0200 Subject: [PATCH 2/7] Nextcloud Talk: add 1.2.0beta3 --- metadata/com.nextcloud.talk2.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/metadata/com.nextcloud.talk2.txt b/metadata/com.nextcloud.talk2.txt index 19d0822738..d313c51565 100644 --- a/metadata/com.nextcloud.talk2.txt +++ b/metadata/com.nextcloud.talk2.txt @@ -36,6 +36,11 @@ Build:1.2.0beta2,35 subdir=app gradle=generic +Build:1.2.0beta3,36 + commit=v1.2.0beta3 + subdir=app + gradle=generic + Auto Update Mode:Version v%v Update Check Mode:Tags ^v[0-9]+\.[0-9]+\.[0-9]+$ Current Version:1.1.3 From a1eab42bf0f4d0a3086b3864603d94580a17b397 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 18 May 2018 11:27:26 -0300 Subject: [PATCH 3/7] Fix Briar Binary URL --- metadata/org.briarproject.briar.android.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/org.briarproject.briar.android.txt b/metadata/org.briarproject.briar.android.txt index cacef3bbed..b95e25bdbd 100644 --- a/metadata/org.briarproject.briar.android.txt +++ b/metadata/org.briarproject.briar.android.txt @@ -21,7 +21,7 @@ Tor network, protecting users and their relationships from surveillance. Repo Type:git Repo:https://code.briarproject.org/akwizgran/briar.git -Binaries:https://briarproject.org/fdroid/repo/briar-%v.apk +Binaries:https://briarproject.org/apk/briar-%v.apk Build:1.0.1,10001 commit=release-1.0.1 @@ -29,8 +29,8 @@ Build:1.0.1,10001 gradle=yes rm=bramble-j2se -Build:1.0.3,10003 - commit=release-1.0.3 +Build:1.0.4,10004 + commit=release-1.0.4 subdir=briar-android gradle=yes rm=bramble-j2se @@ -38,5 +38,5 @@ Build:1.0.3,10003 Archive Policy:3 versions Auto Update Mode:Version release-%v Update Check Mode:Tags -Current Version:1.0.3 -Current Version Code:10003 +Current Version:1.0.4 +Current Version Code:10004 From a61348f8e397429ee6dda9ce7cf50b42f40fcf58 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 14 May 2018 11:27:50 +0200 Subject: [PATCH 4/7] New app: Notepad --- metadata/com.farmerbb.notepad.txt | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 metadata/com.farmerbb.notepad.txt diff --git a/metadata/com.farmerbb.notepad.txt b/metadata/com.farmerbb.notepad.txt new file mode 100644 index 0000000000..c26dea9916 --- /dev/null +++ b/metadata/com.farmerbb.notepad.txt @@ -0,0 +1,46 @@ +Categories:Writing +License:Apache-2.0 +Web Site: +Source Code:https://github.com/farmerbb/Notepad +Issue Tracker:https://github.com/farmerbb/Notepad/issues + +Summary:A simple, bare-bones, no-frills note taking app +Description: +A simple, bare-bones, no-frills note taking app. + +Features: + +* Quickly create and save plain-text notes +* Optionally create rich-text notes using Markdown or HTML (Android 5.0+) +* Beautiful, easy-to-use UI with Material Design elements +* Dual-pane view for tablets +* Share notes to and receive text from other apps +* Auto-saves drafts +* View Mode for notes with clickable links +* Sort notes by date or by name +* Keyboard shortcuts for common actions (see below) +* Integration with Google Now "note to self" +* Import and export notes to external storage (Android 4.4+) +* Zero permissions and absolutely zero ads +* Open-source + +Keyboard shortcuts: + +* Search+M: launch Notepad from any application +* Ctrl+N: New Note +* Ctrl+E: Edit Note +* Ctrl+S: Save +* Ctrl+D: Delete +* Ctrl+H: Share +. + +Repo Type:git +Repo:https://github.com/farmerbb/Notepad.git + +Build:2.3,100 + commit=100 + subdir=app + gradle=yes + +Auto Update Mode:None +Update Check Mode:None From 272ed668991a2747243b4cd67a1174f45f471abb Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 18 May 2018 16:45:12 +0200 Subject: [PATCH 5/7] Notepad: add UCM/AUM --- metadata/com.farmerbb.notepad.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/metadata/com.farmerbb.notepad.txt b/metadata/com.farmerbb.notepad.txt index c26dea9916..9bdd761e3d 100644 --- a/metadata/com.farmerbb.notepad.txt +++ b/metadata/com.farmerbb.notepad.txt @@ -4,6 +4,8 @@ Web Site: Source Code:https://github.com/farmerbb/Notepad Issue Tracker:https://github.com/farmerbb/Notepad/issues +Name:Notepad +Auto Name:${appName} Summary:A simple, bare-bones, no-frills note taking app Description: A simple, bare-bones, no-frills note taking app. @@ -42,5 +44,7 @@ Build:2.3,100 subdir=app gradle=yes -Auto Update Mode:None -Update Check Mode:None +Auto Update Mode:Version %c +Update Check Mode:Tags +Current Version:2.3 +Current Version Code:100 From 6ff48bf9e85937c6e4ba6ac8ebcc279987fd27a0 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 18 May 2018 16:51:43 +0200 Subject: [PATCH 6/7] Vespucci: don't update to beta versions --- metadata/de.blau.android.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt index 66c42249ac..dfd30d5c07 100644 --- a/metadata/de.blau.android.txt +++ b/metadata/de.blau.android.txt @@ -294,12 +294,7 @@ Build:10.2.4.0,503 gradle=yes prebuild=sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle -Build:11.0.0.2,600 - commit=11.0.0.2 - gradle=yes - prebuild=sed -i -e '/bintray/d' -e '/markdown/d' -e '/preset-utils/d' build.gradle - Auto Update Mode:Version %v -Update Check Mode:Tags -Current Version:11.0.0.2 -Current Version Code:600 +Update Check Mode:Tags ^[0-9.]*$ +Current Version:10.2.4 +Current Version Code:503 From 0da3572b7a7b022e56edf288640599d68dbf627a Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Fri, 18 May 2018 17:29:21 +0000 Subject: [PATCH 7/7] New app: Waistline --- metadata/com.waist.line.txt | 37 +++++++++++++++++++++++++++++++++++++ srclibs/BarcodeScanner.txt | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 metadata/com.waist.line.txt create mode 100644 srclibs/BarcodeScanner.txt diff --git a/metadata/com.waist.line.txt b/metadata/com.waist.line.txt new file mode 100644 index 0000000000..0c4966972e --- /dev/null +++ b/metadata/com.waist.line.txt @@ -0,0 +1,37 @@ +Categories:Sports & Health +License:GPL-3.0-only +Web Site: +Source Code:https://github.com/davidhealey/waistline +Issue Tracker:https://github.com/davidhealey/waistline/issues + +Auto Name:Waistline +Summary:Free calorie counter and weight tracker +Description: +Currently in Beta. Waistline is a calorie counter and weight tracker that allows +the user to keep a diary of the food they eat and variations in their weight. +All data is kept on the user's device and can be exported or imported easily +when needed. The app includes a barcode scanner that connects to the Open Food +Facts database to pull in product information. +. + +Repo Type:git +Repo:https://github.com/davidhealey/waistline.git + +Build:1.0.0,10000 + commit=v1.0 + subdir=platforms/android/app + gradle=yes + srclibs=BarcodeScanner@2.1.5 + rm=node_modules,platforms/android/CordovaLib/build/intermediates,platforms/android/app/build/intermediates,platforms/browser,plugins,platforms/android/app/libs/barcodescanner-release-2.1.5.aar + prebuild=sed -i -e '/gradleVersion/d' build.gradle + scandelete=platforms + build=pushd $$BarcodeScanner$$ && \ + rm local.properties && \ + gradle clean assembleRelease && \ + popd && \ + cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar libs/barcodescanner-release-2.1.5.aar + +Auto Update Mode:Version v%v +Update Check Mode:Tags +Current Version:1.0.0 +Current Version Code:10000 diff --git a/srclibs/BarcodeScanner.txt b/srclibs/BarcodeScanner.txt new file mode 100644 index 0000000000..e6d2304cd4 --- /dev/null +++ b/srclibs/BarcodeScanner.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/EddyVerbruggen/barcodescanner-lib-aar.git