Merge branch 'feature/reenable-runnerup' into 'master'

Updates for RunnerUp 2.0

See merge request fdroid/fdroiddata!5102

metadata/org.runnerup.free.yml

@@ -0,0 +1,70 @@
+AntiFeatures:
+  - NonFreeNet
+  - UpstreamNonFree
+Categories:
+  - Sports & Health
+License: GPL-3.0-only
+WebSite: https://github.com/jonasoreland/runnerup/wiki
+SourceCode: https://github.com/jonasoreland/runnerup
+IssueTracker: https://github.com/jonasoreland/runnerup/issues
+Translation: https://www.transifex.com/runner-up/runner-up-android/dashboard
+Changelog: https://htmlpreview.github.io/?https://raw.githubusercontent.com/jonasoreland/runnerup/blob/HEAD/app/assets/changes.html
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=runnerup%2eandroid%40gmail%2ecom&lc=US&item_name=RunnerUp&button_subtype=services&currency_code=EUR&tax_rate=25%2e000&bn=PP%2dBuyNowBF%3abtn_buynow_LG%2egif%3aNonHosted
+
+Name: RunnerUp
+Description: |-
+    Track your sport activities with RunnerUp using the GPS in your Android phone:
+
+    * See detailed stats around your pace, distance and time.
+    * Get stats and progress with built-in highly configurable audio cues.
+    * Run free runs with target pace or target heart rate zone
+    * Easily configure and run effective interval workouts modeled after Garmin
+    * Share your favorite workouts with friends
+    * Heart rate monitor: Bluetooth SMART (BLE)
+    * Configure and use heart rate zones
+
+    Upload your activities to a variety of running sites with a single click:
+
+    * Strava
+    * Endomondo
+    * RunKeeper
+    * RunningAHEAD
+
+    Explanation to anti-features:
+
+    * NonFreeNet: Uploading to Strava and other services makes use of non free net services. (The uploading is open similar to uploading a .tcx file, but the services are not open.)
+    * UpstreamNonFree: The Play version (can be installed at the same time as the F-Droid version) has additional features using non free libraries, see below
+
+    Features removed compared to Play version:
+
+    * Map view (no MapBox API key in free)
+    * WearOS app (requires non-free Play services)
+    * HR ANT+ connectivity (requires closed source lib)
+    * Runalyze and Dropbox upload (Requires API keys. Runalyze test upload possible.)
+    * Download customized apk to device (F-Droid binary is universal for all supported binaries).
+
+RepoType: git
+Repo: https://github.com/jonasoreland/runnerup
+
+Builds:
+  - versionName: 2.0.2.1
+    versionCode: 14000203
+    commit: v2.0.2.1
+    subdir: app
+    gradle:
+      - latest
+    rm:
+      - wear
+      - ANT-Android-SDKs
+    prebuild: sed -i "/play-services/d" build.gradle
+
+MaintainerNotes: This replaces RunnerUp 1.x [[org.runnerup]]
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: HTTP
+UpdateCheckIgnore: (alpha|beta|rc|RC|dev)
+VercodeOperation: '%c + 14000000'
+UpdateCheckName: Ignore
+UpdateCheckData: https://raw.githubusercontent.com/jonasoreland/runnerup/HEAD/build.gradle|versionCode\s*=\s*(\d+)|.|versionName\s*=\s*([^\s]+)
+CurrentVersion: 2.0.2.1
+CurrentVersionCode: 14000203

metadata/org.runnerup.yml

@@ -1,41 +1,61 @@
+AntiFeatures:
+  - NonFreeNet
+  - UpstreamNonFree
 Categories:
   - Sports & Health
 License: GPL-3.0-only
 WebSite: https://github.com/jonasoreland/runnerup/wiki
 SourceCode: https://github.com/jonasoreland/runnerup
 IssueTracker: https://github.com/jonasoreland/runnerup/issues
+Translation: https://www.transifex.com/runner-up/runner-up-android/dashboard
+Changelog: https://htmlpreview.github.io/?https://raw.githubusercontent.com/jonasoreland/runnerup/blob/HEAD/app/assets/changes.html
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=runnerup%2eandroid%40gmail%2ecom&lc=US&item_name=RunnerUp&button_subtype=services&currency_code=EUR&tax_rate=25%2e000&bn=PP%2dBuyNowBF%3abtn_buynow_LG%2egif%3aNonHosted
 
 Name: RunnerUp
-Description: |-
+Description: |4-
+
+    This package is replaced by [[org.runnerup.free]].
+
+    You can migrate the activity data (but not settings) to any newer version of RunnerUp. This includes F-Droid, Play and private debug builds:
+    * Enable Storage permission for the app (with Android 6.0 or later) as this is not requested automatically at export. (One way to enable is to add a File account, the permission will then be requested.)
+    * Settings -> Maintenance -> Export. This will export the activity database to runnerup.db.export in the internal memory.
+    * In the new app (2.x versions only) enable permissions and use the corresponding Import to read the file. The application will crash once when selecting for instance History tab, just open again.
+
+    * Share relevant workouts in Settings ->Workouts -> Manage workouts, select and share by saving it, sending as an attachment in an email to yourself etc. Open the file in RunnerUp.
+
+    Other settings must be migrated manually.
+
+    The RunnerUp 1.x release had some more features listed, some were no longer working. The description is primarily for the 2.x version.
+
     Track your sport activities with RunnerUp using the GPS in your Android phone:
 
     * See detailed stats around your pace, distance and time.
-    * Get stats and progress through your headphones with built-in highly configurable audio cues.
+    * Get stats and progress with built-in highly configurable audio cues.
     * Run free runs with target pace or target heart rate zone
-    * Easily configure and run effective interval workouts modeled after Garmin 410
+    * Easily configure and run effective interval workouts modeled after Garmin
-    * Download and run workouts created at Garmin Connect
     * Share your favorite workouts with friends
-    * See yourself and other running LIVE
+    * Heart rate monitor: Bluetooth SMART (BLE)
-    * Read about others training
-    * Heart rate monitor: Bluetooth SMART (BLE) for devices that support it, PolarWearLink, Zephyr, ANT+
     * Configure and use heart rate zones
 
     Upload your activities to a variety of running sites with a single click:
 
-    * RunKeeper
-    * MapMyRun
-    * Garmin Connect
-    * Funbeat
-    * Nike+
-    * Endomondo
-    * jogg.se
-    * RunningAHEAD
-    * Digifit
     * Strava
-    * Facebook
+    * Endomondo
-    * Runtastic
+    * RunKeeper
-    * Google fit
+    * RunningAHEAD
+
+    Explanation to anti-features:
+
+    * NonFreeNet: Uploading to Strava and other services makes use of non free net services. (The uploading is open similar to uploading a .tcx file, but the services are not open.)
+    * UpstreamNonFree: The Play version (can be installed at the same time as the F-Droid version) has additional features using non free libraries, see below
+
+    Features removed compared to Play version:
+
+    * Map view (no MapBox API key in free)
+    * WearOS app (requires non-free Play services)
+    * HR ANT+ connectivity (requires closed source lib)
+    * Runalyze and Dropbox upload (Requires API keys. Runalyze test upload possible.)
+    * Download customized to device (F-Droid binary is universal for all supported binaries).
 
 RepoType: git
 Repo: https://github.com/jonasoreland/runnerup
@@ -268,13 +288,15 @@ Builds:
       - ANT-Android-SDKs/ANT_Android_SDK/Tools/Android_ANTEmulatorPackage/Android_PC_AndroidEmulatorBridge_2-0/ANTAndroidBridge.exe
 
 MaintainerNotes: |-
-    Removed all existing builds because they depend on and include the non-free ANT+ SDK.
+    This package is replaced with [[org.runnerup.free]].
+    All 1.x builds has been removed because they depend on and include the non-free ANT+ SDK.
     https://github.com/jonasoreland/runnerup/issues/662
-    Future versions might be re-included if this is made an optional.
 
 AutoUpdateMode: None
-UpdateCheckMode: HTTP
+UpdateCheckMode: None
-UpdateCheckData: https://raw.githubusercontent.com/jonasoreland/runnerup/HEAD/build.gradle|versionCode
+UpdateCheckIgnore: (alpha|beta|rc|RC|dev)
-    = (.*)|.|versionName = (.*)
+VercodeOperation: '%c + 14000000'
-CurrentVersion: "'2.0.1.3'"
+UpdateCheckName: Ignore
-CurrentVersionCode: 203
+UpdateCheckData: https://raw.githubusercontent.com/jonasoreland/runnerup/HEAD/build.gradle|versionCode\s*=\s*(\d+)|.|versionName\s*=\s*([^\s]+)
+CurrentVersion: '1.57'
+CurrentVersionCode: 14000057