Merge remote-tracking branch 'origin/develop' into update-neovim

Cartfile

@@ -6,7 +6,7 @@ github "a2/MessagePack.swift" == 3.0.1
 github "qvacua/CocoaFontAwesome" "master"
 github "qvacua/CocoaMarkdown" "master"
 github "Kentzo/ShortcutRecorder" == 3.1
-github "sparkle-project/Sparkle" == 1.22.0
+github "sparkle-project/Sparkle" == 1.23.0
 github "httpswift/swifter" == 1.4.7
 
 # included directly

Cartfile.resolved

@@ -10,4 +10,4 @@ github "httpswift/swifter" "1.4.7"
 github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3"
 github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f"
 github "sindresorhus/github-markdown-css" "v3.0.1"
-github "sparkle-project/Sparkle" "1.22.0"
+github "sparkle-project/Sparkle" "v1.23.0"

bin/build.sh

@@ -14,9 +14,10 @@ readonly is_snapshot=${is_snapshot:?"true or false"}
 readonly update_appcast=${update_appcast:?"true or false"}
 readonly update_snapshot_appcast_for_release=${update_snapshot_appcast_for_release:?"true or false"}
 
-export marketing_version=${marketing_version}
+export marketing_version=${marketing_version:-"SNAPSHOT"}
-readonly release_notes=${release_notes}
+readonly release_notes=${release_notes:-""}
 
+readonly use_cache_carthage=${use_cache_carthage:?"true of false"}
 
 if [[ "${is_snapshot}" = false ]] && [[ "${marketing_version}" == "" ]] ; then
     echo "### ERROR If not snapshot, then the marketing version must be set!"
@@ -33,6 +34,11 @@ if [[ "${is_snapshot}" == false ]] && [[ "${update_appcast}" == false ]] ; then
     exit 1
 fi
 
+if [[ "${publish}" == false ]] && [[ "${use_cache_carthage}" == true ]] ; then
+    echo "### ERROR Publishing, but using cache for Carthage!"
+    exit 1
+fi
+
 if [[ "${is_snapshot}" == false ]] && [[ "${branch}" != "master" ]] ; then
     echo "### ERROR Not building master for release!"
     exit 1
@@ -62,7 +68,7 @@ else
     echo "Not publishing and no release => not incrementing the version..."
 fi
 
-code_sign=true use_carthage_cache=false ./bin/build_vimr.sh
+code_sign=true use_carthage_cache=${use_cache_carthage} ./bin/build_vimr.sh
 
 pushd VimR > /dev/null
     export readonly bundle_version=$(agvtool what-version | sed '2q;d' | sed -E 's/ +(.+)/\1/')

bin/build_deps.sh

@@ -11,7 +11,13 @@ readonly pcre_version="8.43"
 readonly xz_version="5.2.4"
 readonly ag_version="2.2.0"
 
+readonly build_ag=${build_ag:-false}
+readonly build_pcre=${build_pcre:-false}
+readonly build_xz=${build_xz:-false}
+readonly build_gettext=${build_gettext:-false}
+
 build_ag () {
+echo "### Building ag..."
 pushd .deps > /dev/null
     curl -L -o ag.tar.gz https://github.com/ggreer/the_silver_searcher/archive/${ag_version}.tar.gz
     tar xf ag.tar.gz
@@ -36,9 +42,11 @@ pushd .deps > /dev/null
         popd > /dev/null
     popd > /dev/null
 popd > /dev/null
+echo "### Built ag."
 }
 
 build_xz () {
+echo "### Building xz (and ag)..."
 pushd .deps > /dev/null
     curl -L -o xz.tar.gz https://tukaani.org/xz/xz-${xz_version}.tar.gz
     tar xf xz.tar.gz
@@ -57,9 +65,11 @@ pushd .deps > /dev/null
         rm -rf $(pwd)/../../third-party/libxz/share
     popd > /dev/null
 popd > /dev/null
+echo "### Built xz (and ag)..."
 }
 
 build_pcre () {
+echo "### Building pcre (and ag)..."
 pushd .deps > /dev/null
     curl -L -o pcre.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre-${pcre_version}.tar.bz2
     tar xf pcre.tar.bz2
@@ -84,18 +94,33 @@ pushd .deps > /dev/null
         rm -rf $(pwd)/../../third-party/libpcre/share
     popd > /dev/null
 popd > /dev/null
+echo "### Built pcre (and ag)..."
 }
 
 build_vimr_deps () {
-rm -rf third-party
-mkdir third-party
-
 rm -rf .deps
 mkdir .deps
 
+if [[ ${build_pcre} == true ]] ; then
+    rm -rf third-party/libpcre
     build_pcre
-build_xz
+
+    rm -rf third-party/libag
     build_ag
+fi
+
+if [[ ${build_xz} == true ]] ; then
+    rm -rf third-party/libxz
+    build_xz
+
+    rm -rf third-party/libag
+    build_ag
+fi
+
+if [[ ${build_ag} == true ]] ; then
+    rm -rf third-party/libag
+    build_ag
+fi
 }
 
 build_gettext () {
@@ -146,5 +171,12 @@ popd > /dev/null
 echo "### Built deps"
 }
 
+main () {
+if [[ ${build_gettext} == true ]] ; then
     build_gettext
+fi
+
 build_vimr_deps
+}
+
+main

bin/build_vimr.sh

@@ -64,7 +64,7 @@ if [[ ${code_sign} == true ]] ; then
     pushd ${build_path}/Build/Products/Release > /dev/null
         codesign --force -s "${identity}" --timestamp --options=runtime --entitlements="${entitlements_path}" \
             VimR.app/Contents/Frameworks/NvimView.framework/Versions/A/NvimServer
-        codesign --force -s "${identity}" --timestamp --options=runtime VimR.app/Contents/Frameworks/NvimView.framework/Versions/A
+        codesign --force -s "${identity}" --deep --timestamp --options=runtime VimR.app/Contents/Frameworks/NvimView.framework/Versions/A
         codesign --force -s "${identity}" --deep --timestamp --options=runtime VimR.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app
         codesign --force -s "${identity}" --deep --timestamp --options=runtime VimR.app/Contents/Frameworks/Sparkle.framework/Versions/A
     popd > /dev/null

ci/create_build_job.groovy

@@ -23,11 +23,12 @@ Builds a new snapshot of VimR and pushes the tag:<br>
   parameters {
     booleanParam('publish', true, 'Publish this release to Github?')
     stringParam('branch', 'develop', 'Branch to build; defaults to develop')
-    stringParam('marketing_version', null, 'If "is_snapshot" is unchecked, you have to enter this.')
+    stringParam('marketing_version', null, 'Eg "0.34.0". If "is_snapshot" is unchecked, you have to enter this.')
     textParam('release_notes', null, 'Release notes')
     booleanParam('is_snapshot', true)
     booleanParam('update_appcast', true)
     booleanParam('update_snapshot_appcast_for_release', true)
+    booleanParam('use_cache_carthage', false)
   }
 
   scm {

resources/release-notes.md

@@ -1,5 +1,11 @@
 # Next
 
+* Dependencies updates:
+    - ggreer/the_silver_searcher@a509a81
+    - sparkle-project/Sparkle@1.23.0
+
+# 0.32.0-344
+
 We updated the library ShortcutRecorder to the latest version. By doing so, we store the shortcuts in a different format than before. This means that after you launched this version, old versions will not be compatible with the stored shortcuts. To delete the stored shortcuts, you can use `defaults delete com.qvacua.VimR.menuitems` in Terminal.
 
 * Show only font family names of monospace fonts.

third-party/libag/lib/libag.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24c1ae7219e2309f7603913e01da2819d91d56ca62ea5263d647044172bc145c
+oid sha256:db4dbcb163bff64895213ff8e84d67fd39e8d86a4fce703e0f5aa9fda6b5a323
 size 118440