From 228e2ef3ddeb95e9bc81063693b0d1c6e067e56d Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Sat, 20 Jun 2020 14:02:42 +0200 Subject: [PATCH 1/4] Update deps --- Cartfile | 10 +++++----- Cartfile.resolved | 10 +++++----- resources/release-notes.md | 11 ++++++++++- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Cartfile b/Cartfile index fea8e3c1..8ff2264f 100644 --- a/Cartfile +++ b/Cartfile @@ -1,18 +1,18 @@ # included as Framework github "IBM-Swift/BlueSocket" == 1.0.52 -github "PureLayout/PureLayout" == 3.1.5 +github "PureLayout/PureLayout" == 3.1.6 github "ReactiveX/RxSwift" == 5.1.1 -github "a2/MessagePack.swift" == 3.0.1 +github "a2/MessagePack.swift" == 4.0.0 github "qvacua/CocoaFontAwesome" "master" github "qvacua/CocoaMarkdown" "master" -github "Kentzo/ShortcutRecorder" == 3.1 +github "Kentzo/ShortcutRecorder" == 3.2 github "sparkle-project/Sparkle" == 1.23.0 github "httpswift/swifter" == 1.4.7 # included directly github "elegantchaos/DictionaryCoding" == 1.0.9 -github "eonil/FSEvents" == 0.1.6 +github "eonil/FSEvents" == 0.1.7 github "sindresorhus/github-markdown-css" == 4.0.0 # for testing only -github "Quick/Nimble" == 8.0.5 +github "Quick/Nimble" == 8.1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index b7f2174d..9e4617fe 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,11 +1,11 @@ github "IBM-Swift/BlueSocket" "1.0.52" -github "Kentzo/ShortcutRecorder" "3.1" -github "PureLayout/PureLayout" "v3.1.5" -github "Quick/Nimble" "v8.0.5" +github "Kentzo/ShortcutRecorder" "3.2" +github "PureLayout/PureLayout" "v3.1.6" +github "Quick/Nimble" "v8.1.1" github "ReactiveX/RxSwift" "5.1.1" -github "a2/MessagePack.swift" "3.0.1" +github "a2/MessagePack.swift" "4.0.0" github "elegantchaos/DictionaryCoding" "1.0.9" -github "eonil/FSEvents" "0.1.6" +github "eonil/FSEvents" "0.1.7" github "httpswift/swifter" "1.4.7" github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3" github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f" diff --git a/resources/release-notes.md b/resources/release-notes.md index 3a7a968d..3c04d0d9 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -1,10 +1,19 @@ # Next +* Dependencies updates: + - PureLayout/PureLayout@3.1.6 + - a2/MessagePack.swift@4.0.0 + - Kentzo/ShortcutRecorder@3.2 + - eonil/FSEvents@0.1.7 + - Quick/Nimble@8.1.1 + +# 0.33.0-??? + * GH-799: Bugfix: VimR sometimes uses High-CPU usage for apparent reason. * GH-775: Use the colors of the selected color scheme for the markdown preview. * GH-792: Use the macOS Font Panel to select the font: Thank you @apaleslimghost! - If you select a variable width font, the rendering will be broken. -* GH-786: Improve space key handling which enables to be mapped: Thank you @cypheon! +* GH-786: Improve space key handling which enables `` to be mapped: Thank you @cypheon! * Improve drawing performance. * Dependencies updates: - ggreer/the_silver_searcher@a509a81 From 0015a10c1a0f2cb9031c4683392d8c9c73f31be4 Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 22 Jun 2020 18:09:26 +0200 Subject: [PATCH 2/4] Exit when not updating appcast on develop --- bin/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/build.sh b/bin/build.sh index d0f99862..8e73c448 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -125,6 +125,9 @@ fi if [[ "${update_appcast}" == true ]]; then ./bin/set_appcast.py "build/Build/Products/Release/${vimr_file_name}" "${bundle_version}" "${marketing_version}" "${tag}" ${is_snapshot} ./bin/commit_and_push_appcast.sh "${branch}" "${compound_version}" ${is_snapshot} ${update_snapshot_appcast_for_release} +else + echo "Not updating appcast on develop => exiting now..." + exit 0 fi if [[ "${is_snapshot}" == false ]] ; then From a5312bcab16edfe8970cf8fb77442d6d0364be3d Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 22 Jun 2020 18:23:57 +0200 Subject: [PATCH 3/4] Bump version: v0.33.0-351 --- NvimView/DrawerDev/Info.plist | 4 ++-- NvimView/DrawerPerf/Info.plist | 4 ++-- NvimView/MinimalNvimViewDemo/Info.plist | 4 ++-- NvimView/NvimView.xcodeproj/project.pbxproj | 8 ++++---- NvimView/NvimView/Info.plist | 4 ++-- NvimView/NvimViewTests/Info.plist | 4 ++-- VimR/VimR.xcodeproj/project.pbxproj | 4 ++-- VimR/VimR/Info.plist | 4 ++-- VimR/VimRTests/Info.plist | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NvimView/DrawerDev/Info.plist b/NvimView/DrawerDev/Info.plist index c3f2cae4..c0e1dd4f 100644 --- a/NvimView/DrawerDev/Info.plist +++ b/NvimView/DrawerDev/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleVersion - 350 + 351 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/NvimView/DrawerPerf/Info.plist b/NvimView/DrawerPerf/Info.plist index 7bed4841..8295c788 100644 --- a/NvimView/DrawerPerf/Info.plist +++ b/NvimView/DrawerPerf/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleVersion - 350 + 351 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/NvimView/MinimalNvimViewDemo/Info.plist b/NvimView/MinimalNvimViewDemo/Info.plist index 8ef5e1b2..7d69dc2d 100644 --- a/NvimView/MinimalNvimViewDemo/Info.plist +++ b/NvimView/MinimalNvimViewDemo/Info.plist @@ -38,9 +38,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleVersion - 350 + 351 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj index c0fa757f..096243cb 100644 --- a/NvimView/NvimView.xcodeproj/project.pbxproj +++ b/NvimView/NvimView.xcodeproj/project.pbxproj @@ -1182,7 +1182,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 350; + CURRENT_PROJECT_VERSION = 351; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1245,7 +1245,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 350; + CURRENT_PROJECT_VERSION = 351; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1275,7 +1275,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 350; + DYLIB_CURRENT_VERSION = 351; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; @@ -1297,7 +1297,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 350; + DYLIB_CURRENT_VERSION = 351; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac"; FRAMEWORK_VERSION = A; diff --git a/NvimView/NvimView/Info.plist b/NvimView/NvimView/Info.plist index 7d46804c..44c1c11b 100644 --- a/NvimView/NvimView/Info.plist +++ b/NvimView/NvimView/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleVersion - 350 + 351 NSHumanReadableCopyright Copyright © 2017 Tae Won Ha. All rights reserved. NSPrincipalClass diff --git a/NvimView/NvimViewTests/Info.plist b/NvimView/NvimViewTests/Info.plist index aa1020c5..789cea7f 100644 --- a/NvimView/NvimViewTests/Info.plist +++ b/NvimView/NvimViewTests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleVersion - 350 + 351 diff --git a/VimR/VimR.xcodeproj/project.pbxproj b/VimR/VimR.xcodeproj/project.pbxproj index 535af330..2801c20d 100644 --- a/VimR/VimR.xcodeproj/project.pbxproj +++ b/VimR/VimR.xcodeproj/project.pbxproj @@ -1435,7 +1435,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 350; + CURRENT_PROJECT_VERSION = 351; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1495,7 +1495,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 350; + CURRENT_PROJECT_VERSION = 351; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/VimR/VimR/Info.plist b/VimR/VimR/Info.plist index 0f2570cd..81ffb1c4 100644 --- a/VimR/VimR/Info.plist +++ b/VimR/VimR/Info.plist @@ -1224,7 +1224,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleSignature ???? CFBundleURLTypes @@ -1241,7 +1241,7 @@ CFBundleVersion - 350 + 351 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/VimR/VimRTests/Info.plist b/VimR/VimRTests/Info.plist index 2480656f..d91b4bd2 100644 --- a/VimR/VimRTests/Info.plist +++ b/VimR/VimRTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - SNAPSHOT-350 + 0.33.0 CFBundleSignature ???? CFBundleVersion - 350 + 351 From 6a99596245df8360a405afd3130267697449f8ae Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 22 Jun 2020 18:24:28 +0200 Subject: [PATCH 4/4] Bump appcast(s) to v0.33.0-351 --- appcast.xml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/appcast.xml b/appcast.xml index 90c9369c..e6ced053 100644 --- a/appcast.xml +++ b/appcast.xml @@ -7,36 +7,35 @@ Most recent changes with links to updates for VimR. en - v0.32.0-344 + v0.33.0-351 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.
    • -
  • Set gui_running to true (GH-476).
    • +
      +
    • GH-799: Bugfix: VimR sometimes uses High-CPU usage for apparent reason.
      • +
    • GH-775: Use the colors of the selected color scheme for the markdown preview.
      • +
    • GH-792: Use the macOS Font Panel to select the font: Thank you @apaleslimghost!
        +
      • Warning: If you select a variable width font, the rendering will be broken.
        • +
      +
      • +
    • GH-786: Improve space key handling which enables to be mapped: Thank you @cypheon!
    • Improve drawing performance.
      • -
    • Bugfix: The cursor is not drawn when a new window is opened.
      • -
    • Bugfix: Preview in the Appearance preferences is not dark mode compatible.
      • -
    • Bugfix: Shortcut buttons are not dark mode compatible.
    • Dependencies updates:
        -
      • Kentzo/ShortcutRecorder@3.1
        • -
      • httpswift/swifter@1.4.7
        • -
      • eonil/FSEvents@0.1.6
        • -
      • Quick/Nimble@8.0.5
        • -
      • sparkle-project/Sparkle@1.22.0
        • +
      • ggreer/the_silver_searcher@a509a81
        • +
      • sparkle-project/Sparkle@1.23.0
        • +
      • ReactiveX/RxSwift@5.1.1
    ]]> - https://github.com/qvacua/vimr/releases/tag/v0.32.0-344 + https://github.com/qvacua/vimr/releases/tag/v0.33.0-351 - 2020-02-13T07:21:41.236766 + 2020-06-22T18:24:28.531466 10.12.0 -