fix #303495: ABC plugin not working on macOS 10.14 or later + collect…

…_artifacts by making it using https. Switch to using https in some other places too.
iveshenry18 · Apr 9, 2020 · 4788f97 · 4788f97
1 parent 13a302f
commit 4788f97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -320,7 +320,7 @@ endif (MINGW OR MSVC OR APPLE)
 if (DOWNLOAD_SOUNDFONT)
   set (SF_VERSION_REMOTE_FILE ${PROJECT_BINARY_DIR}/VERSION)
   set (SF_VERSION_LOCAL_FILE ${PROJECT_SOURCE_DIR}/share/sound/VERSION)
-  set (DOWNLOAD_URL_ROOT "http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General")
+  set (DOWNLOAD_URL_ROOT "https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General")
   set (SOUND_DIRECTORY ${PROJECT_SOURCE_DIR}/share/sound)
 
   file(DOWNLOAD ${DOWNLOAD_URL_ROOT}/VERSION ${SF_VERSION_REMOTE_FILE} STATUS SF_VERSION_DL_STATUS_LIST)

diff --git a/build/Packaging.cmake b/build/Packaging.cmake
@@ -43,8 +43,8 @@ IF(MINGW OR MSVC)
     SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/build/packaging\\\\installer_head_nsis.bmp")
     SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${MSCORE_EXECUTABLE_NAME}.exe,0")
     SET(CPACK_NSIS_DISPLAY_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION_FULL}")
-    SET(CPACK_NSIS_HELP_LINK "http://www.musescore.org/")
-    SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.musescore.org/")
+    SET(CPACK_NSIS_HELP_LINK "https://www.musescore.org/")
+    SET(CPACK_NSIS_URL_INFO_ABOUT "https://www.musescore.org/")
     SET(CPACK_NSIS_CONTACT "info@musescore.org")
     SET(CPACK_NSIS_MODIFY_PATH OFF)
     SET(CPACK_STRIP_FILES "${MSCORE_EXECUTABLE_NAME}.exe")

diff --git a/share/plugins/abc_import.qml b/share/plugins/abc_import.qml
@@ -123,7 +123,7 @@ MuseScore {
                         Qt.quit()
                     }
                 }
-            request.open("POST", "http://abc2xml.appspot.com/abcrenderer", true)
+            request.open("POST", "https://abc2xml.appspot.com/abcrenderer", true)
             request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
             request.send(content)
             }