Merge branch 'master' of https://gitlab.com/fdroid/fdroiddata

2018-05-18 21:50:42 +02:00 · 2018-05-18 21:50:42 +02:00 · d801d7330f
parent 3c1821f138 0dbb674ded
commit d801d7330f
7 changed files with 136 additions and 19 deletions
--- a/metadata/com.farmerbb.notepad.txt
+++ b/metadata/com.farmerbb.notepad.txt
@ -0,0 +1,50 @@
+Categories:Writing
+License:Apache-2.0
+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.
+
+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:Version %c
+Update Check Mode:Tags
+Current Version:2.3
+Current Version Code:100
--- 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
--- a/metadata/com.waist.line.txt
+++ 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
--- 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
--- 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.
--- 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
--- a/srclibs/BarcodeScanner.txt
+++ b/srclibs/BarcodeScanner.txt
@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/EddyVerbruggen/barcodescanner-lib-aar.git