Merge branch 'feature/osmdroid' into 'master'

Update osmdroid to 6.0.1

See merge request fdroid/fdroiddata!3106

metadata/org.osmdroid.txt

@@ -1,7 +1,6 @@
-AntiFeatures:UpstreamNonFree
 Categories:Navigation
-License:LGPL-3.0
-Web Site:
+License:Apache-2.0
+Web Site:http://osmdroid.github.io/osmdroid/
 Source Code:https://github.com/osmdroid/osmdroid
 Issue Tracker:https://github.com/osmdroid/osmdroid/issues
 
@@ -28,7 +27,19 @@ Build:4.1,15
     gradle=yes
     prebuild=sed -i -e 's/4.2-SNAPSHOT/4.2/g' -e 's/android.support:compatibility-v4/com.android.support:support-v4/g' build.gradle
 
+Build:6.0.1,31
+    commit=osmdroid-parent-6.0.1
+    subdir=OpenStreetMapViewer
+    gradle=yes
+    rm=GoogleWrapperSample,osmdroid-third-party
+    prebuild=echo "afterEvaluate { tasks.packageRelease.setEnabled(true); tasks.assembleRelease.setEnabled(true); }" >> build.gradle && \
+        echo "android.buildTypes.release.signingConfig null" >> build.gradle
+
+Maintainer Notes:
+We have to patch build.gradle because the gradle-fury plugin disables assembleRelease when there is no signing key available.
+.
+
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:4.1
-Current Version Code:15
+Current Version:6.0.1
+Current Version Code:31