Merge branch 'fdroid_listing_improvements' into 'master'

F-Droid metadata improvements

See merge request pixeldroid/PixelDroid!463

.gitlab-ci.yml

@@ -83,7 +83,7 @@ fdroid build:
       - .android
   script:
     # Put the correct versionName and versionCode in the .fdroid.yml
-    - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml
+    - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}' | tr -d \")$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml
     - rm .fdroid.yml.template
     - test -d build || mkdir build
     - test -d fdroidserver || mkdir fdroidserver