qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-27 15:53:31 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tae Won Ha 2020-02-01 18:28:21 +01:00
commit 7a02190f36
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
14 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cartfile
View File

@ -6,13 +6,13 @@ github "a2/MessagePack.swift" == 3.0.1
github "qvacua/CocoaFontAwesome" "master"
github "qvacua/CocoaMarkdown" "master"
github "Kentzo/ShortcutRecorder" == 3.1
github "qvacua/Sparkle" == 1.21.3-qvacua
github "qvacua/swifter" "nonpublic"
github "sparkle-project/Sparkle" == 1.22.0
github "qvacua/swifter" == 1.4.7-qvacua
# included directly
github "elegantchaos/DictionaryCoding" == 1.0.7
github "eonil/FSEvents" == 0.1.5
github "eonil/FSEvents" == 0.1.6
github "sindresorhus/github-markdown-css" == 3.0.1
# for testing only
github "Quick/Nimble" == 8.0.4
github "Quick/Nimble" == 8.0.5

8
Cartfile.resolved
View File

@ -1,13 +1,13 @@
github "IBM-Swift/BlueSocket" "1.0.52"
github "Kentzo/ShortcutRecorder" "3.1"
github "PureLayout/PureLayout" "v3.1.5"
github "Quick/Nimble" "v8.0.4"
github "Quick/Nimble" "v8.0.5"
github "ReactiveX/RxSwift" "5.0.1"
github "a2/MessagePack.swift" "3.0.1"
github "elegantchaos/DictionaryCoding" "1.0.7"
github "eonil/FSEvents" "0.1.5"
github "eonil/FSEvents" "0.1.6"
github "qvacua/CocoaFontAwesome" "fc2a08babd676525ced68061b19ad8ff3dd1d0b3"
github "qvacua/CocoaMarkdown" "c58166490a71ad4d8466f7e7b9faf7cb0917c42f"
github "qvacua/Sparkle" "1.21.3-qvacua"
github "qvacua/swifter" "1905655ceedec5b5768f2089ceccf31621f6230a"
github "qvacua/swifter" "1.4.7-qvacua"
github "sindresorhus/github-markdown-css" "v3.0.1"
github "sparkle-project/Sparkle" "1.22.0"

4
NvimView/DrawerDev/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
NvimView/DrawerPerf/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
NvimView/MinimalNvimViewDemo/Info.plist
View File

@ -38,9 +38,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
NvimView/NvimView.xcodeproj/project.pbxproj
View File

@ -1146,7 +1146,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 337;
CURRENT_PROJECT_VERSION = 338;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1208,7 +1208,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 337;
CURRENT_PROJECT_VERSION = 338;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1238,7 +1238,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 337;
DYLIB_CURRENT_VERSION = 338;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;
@ -1260,7 +1260,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 337;
DYLIB_CURRENT_VERSION = 338;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;

4
NvimView/NvimView/Info.plist
View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

4
NvimView/NvimViewTests/Info.plist
View File

@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
</dict>
</plist>

4
VimR/VimR.xcodeproj/project.pbxproj
View File

@ -1920,7 +1920,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 337;
CURRENT_PROJECT_VERSION = 338;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1981,7 +1981,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 337;
CURRENT_PROJECT_VERSION = 338;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_NS_ASSERTIONS = NO;

4
VimR/VimR/Info.plist
View File

@ -1224,7 +1224,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -1241,7 +1241,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

4
VimR/VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.31.0</string>
<string>SNAPSHOT-338</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>337</string>
<string>338</string>
</dict>
</plist>

28
appcast_snapshot.xml
View File

@ -7,22 +7,30 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.31.0-337</title>
<title>SNAPSHOT-338</title>
<description><![CDATA[
<ul>
<li>Improve handling of file system changes for the file browser</li>
<p><em>Important:</em> We updated the library ShortcutRecorder to the latest version.
We store the shortcuts in a different format than before.
This means that after you launched this version, old versions of VimR will not be compatible with the stored shortcuts.
To delete the stored shortcuts, such that you can use old versions of VimR again, you can use <code>defaults delete com.qvacua.VimR.menuitems</code> in Terminal.</p>
<ul>
<li>Bugfix: Shortcut buttons are not dark mode compatible.</li>
<li>Dependencies updates:<ul>
<li>Kentzo/ShortcutRecorder 3.1</li>
</ul>
</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.31.0-337
https://github.com/qvacua/vimr/releases/tag/snapshot/338
</releaseNotesLink>
<pubDate>2020-01-29T18:46:32.955903</pubDate>
<pubDate>2020-02-01T18:13:51.281801</pubDate>
<minimumSystemVersion>10.12.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.31.0-337/VimR-v0.31.0-337.tar.bz2"
sparkle:version="337"
sparkle:shortVersionString="0.31.0"
sparkle:dsaSignature="MCwCFGUJZ7akEbHT3JcZCICNswi8iJZdAhRofIjp5z72Del7RHv2hvJyZ9b7CQ=="
length="14698478"
<enclosure url="https://github.com/qvacua/vimr/releases/download/snapshot/338/VimR-SNAPSHOT-338.tar.bz2"
sparkle:version="338"
sparkle:shortVersionString="SNAPSHOT-338"
sparkle:dsaSignature="MC0CFCRXqIhRJL/sZDIrFW0A88ImtuoHAhUAhmDCtVubgQEIesZNAzADZfcIAL0="
length="14821257"
type="application/octet-stream"/>
</item>
</channel>

15
bin/build_vimr.sh
View File

@ -10,6 +10,14 @@ readonly code_sign=${code_sign:?"true or false"}
readonly use_carthage_cache=${use_carthage_cache:?"true or false"}
readonly build_path="./build"
# Carthage often crashes => do it at the beginning.
echo "### Updating carthage"
if [[ ${use_carthage_cache} == true ]]; then
carthage update --cache-builds --platform macos
else
carthage update --platform macos
fi
# Build NeoVim
# 0. Delete previously built things
# 1. Build normally to get the full runtime folder and copy it to the neovim's project root
@ -39,13 +47,6 @@ pushd NvimView/neovim
cp -r /tmp/nvim-runtime/share/nvim/runtime .
popd > /dev/null
echo "### Updating carthage"
if [[ ${use_carthage_cache} == true ]]; then
carthage update --cache-builds --platform macos
else
carthage update --platform macos
fi
echo "### Xcodebuilding"
rm -rf ${build_path}

5
resources/release-notes.md
View File

@ -1,5 +1,10 @@
# Next
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.
* Bugfix: Shortcut buttons are not dark mode compatible.
* Dependencies updates:
- Kentzo/ShortcutRecorder 3.1