Add date and version to app upload

gradle/upload/upload-application.sh

@@ -42,7 +42,9 @@ fi
 cd "$PWD"
 
 # List files to upload
-release=$(get_property $properties_file "applicationRelease")
+version=$(urlencode "$(get_property $properties_file 'applicationVersionFull')")
+date=$(urlencode "$(get_property $properties_file 'applicationDate')")
+release=$(get_property $properties_file 'applicationRelease')
 snapshot=$([ "$release" == "true" ] && echo "false" || echo "true") # Invert 'release'
 
 echo ""
@@ -65,22 +67,22 @@ file_reports=$(ls $REPODIR/build/upload/reports.zip)
 file_docs=$(ls $REPODIR/build/upload/docs.zip)
 
 echo "Uploading DEB: $(basename $file_deb) ..."
-upload_app "$file_deb" "deb" "$snapshot" # Most likely to fail first
+upload_app "$file_deb" "deb" "$version" "$date" "$snapshot" # Most likely to fail first
 
 echo "Uploading EXE: $(basename $file_exe) ..."
-upload_app "$file_exe" "exe" "$snapshot"
+upload_app "$file_exe" "exe" "$version" "$date" "$snapshot"
 
 echo "Uploading TAR.GZ: $(basename $file_targz) ..."
-upload_app "$file_targz" "tar.gz" "$snapshot"
+upload_app "$file_targz" "tar.gz" "$version" "$date" "$snapshot"
 
 echo "Uploading ZIP: $(basename $file_zip) ..."
-upload_app "$file_zip" "zip" "$snapshot"
+upload_app "$file_zip" "zip" "$version" "$date" "$snapshot"
 
 echo "Uploading REPORTS: $(basename $file_reports) ..."
-upload_app "$file_reports" "reports" "$snapshot"
+upload_app "$file_reports" "reports" "$version" "$date" "$snapshot"
 
 echo "Uploading DOCS: $(basename $file_docs) ..."
-upload_app "$file_docs" "docs" "$snapshot"
+upload_app "$file_docs" "docs" "$version" "$date" "$snapshot"
 
 echo ""
 echo "DONE."

gradle/upload/upload-functions

@@ -13,6 +13,7 @@ urlencode() {
         local c="${1:i:1}"
         case $c in
             [a-zA-Z0-9._-]) printf "$c" ;;
+            " ") printf "+" ;;
             *) printf '%%%02X' "'$c"
         esac
     done
@@ -96,18 +97,20 @@ upload_plugin() {
 }
 
 upload_app() {
-	# upload_app <filename> <type> <snapshot>
+	# upload_app <filename> <type> <appVersion> <date> <snapshot>
 
 	file="$1"
 	type="$2"
-	snapshot="$3"
+	appVersion="$3"
+	date="$4"
+	snapshot="$5"
 
-	if [ -z "$file" -o -z "$type" -o -z "$snapshot" ]; then
+	if [ -z "$file" -o -z "$type" -o -z "$appVersion" -o -z "$date" -o -z "$snapshot" ]; then
 		echo "ERROR: Invalid arguments for upload_app. None of the arguments can be zero."
 		exit 2
 	fi
 
-	upload_file "$file" "app" "type=$type&snapshot=$snapshot"
+	upload_file "$file" "app" "type=$type&appVersion=$appVersion&date=$date&snapshot=$snapshot"
 }
 
 get_property() {