1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 03:25:03 +03:00

Merge remote-tracking branch 'origin/develop' into new-merge

This commit is contained in:
Tae Won Ha 2019-07-23 07:32:33 +02:00
commit 0d17a390ce
13 changed files with 67 additions and 48 deletions

View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

View File

@ -38,9 +38,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

View File

@ -1150,7 +1150,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 324;
CURRENT_PROJECT_VERSION = 326;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -1212,7 +1212,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 324;
CURRENT_PROJECT_VERSION = 326;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1242,7 +1242,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 324;
DYLIB_CURRENT_VERSION = 326;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;
@ -1264,7 +1264,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 324;
DYLIB_CURRENT_VERSION = 326;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../Carthage/Build/Mac";
FRAMEWORK_VERSION = A;

View File

@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

View File

@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
</dict>
</plist>

View File

@ -390,6 +390,11 @@
4BB4CD0E224A7EA000474C79 /* EonilFSEventStreamEventFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB4CCF6224A7EA000474C79 /* EonilFSEventStreamEventFlags.swift */; };
4BC164281FD2DEE1001903BE /* NvimView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; };
4BC1642E1FD2DEEA001903BE /* NvimView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC1642B1FD2DEE1001903BE /* NvimView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4BC903EA22799DEB0016A1CD /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; };
4BC903ED22799E170016A1CD /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; };
4BC903EE22799E180016A1CD /* RxRelay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4BC903EF22799E2D0016A1CD /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; };
4BC903F022799E2D0016A1CD /* RxRelay.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC903E822799DEB0016A1CD /* RxRelay.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4BC97BC72273B27500B68997 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; };
4BC97BC82273B27600B68997 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF18C371FD2E2AB00DF95D1 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4BDA50B42160BE70004D10A9 /* Socket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B0A1AA72120C35100F1E02F /* Socket.framework */; };
@ -451,6 +456,7 @@
4B26375C223A487B00021586 /* PureLayout.framework in Embed Frameworks */,
4B26375D223A487B00021586 /* RxCocoa.framework in Embed Frameworks */,
4B263760223A487B00021586 /* RxSwift.framework in Embed Frameworks */,
4BC903EE22799E180016A1CD /* RxRelay.framework in Embed Frameworks */,
4B263761223A487B00021586 /* Swifter.framework in Embed Frameworks */,
4B263762223A487B00021586 /* Sparkle.framework in Embed Frameworks */,
4B263763223A487B00021586 /* NvimView.framework in Embed Frameworks */,
@ -472,6 +478,7 @@
4BEBC23C215FD1AA007113C4 /* Socket.framework in Embed Frameworks */,
4BF18C441FD2E2C900DF95D1 /* PureLayout.framework in Embed Frameworks */,
4BF18C451FD2E2C900DF95D1 /* RxCocoa.framework in Embed Frameworks */,
4BC903F022799E2D0016A1CD /* RxRelay.framework in Embed Frameworks */,
4BF18C461FD2E2C900DF95D1 /* RxSwift.framework in Embed Frameworks */,
4B9DF287209C8A8B00DF2AAD /* Swifter.framework in Embed Frameworks */,
4BC1642E1FD2DEEA001903BE /* NvimView.framework in Embed Frameworks */,
@ -674,6 +681,7 @@
4BB4CCF5224A7EA000474C79 /* EonilFSEventStreamCreateFlags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamCreateFlags.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEventStreamCreateFlags.swift; sourceTree = "<group>"; };
4BB4CCF6224A7EA000474C79 /* EonilFSEventStreamEventFlags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EonilFSEventStreamEventFlags.swift; path = ../../Carthage/Checkouts/FSEvents/Sources/EonilFSEventStreamEventFlags.swift; sourceTree = "<group>"; };
4BC1642B1FD2DEE1001903BE /* NvimView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NvimView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4BC903E822799DEB0016A1CD /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = ../Carthage/Build/Mac/RxRelay.framework; sourceTree = "<group>"; };
4BDF500B1D760A3500D8FBC3 /* FileUtilsTest */ = {isa = PBXFileReference; lastKnownFileType = folder; path = FileUtilsTest; sourceTree = "<group>"; };
4BDF50181D77540900D8FBC3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OpenQuicklyWindow.xib; sourceTree = "<group>"; };
4BE34B822225BAC7002F57D3 /* ShortcutRecorder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShortcutRecorder.framework; path = ../Carthage/Build/Mac/ShortcutRecorder.framework; sourceTree = "<group>"; };
@ -708,6 +716,7 @@
4B263704223A487B00021586 /* RxSwift.framework in Frameworks */,
4B263706223A487B00021586 /* Sparkle.framework in Frameworks */,
4B263708223A487B00021586 /* Swifter.framework in Frameworks */,
4BC903ED22799E170016A1CD /* RxRelay.framework in Frameworks */,
4B263709223A487B00021586 /* RxCocoa.framework in Frameworks */,
4B26370A223A487B00021586 /* ShortcutRecorder.framework in Frameworks */,
4B26370B223A487B00021586 /* NvimView.framework in Frameworks */,
@ -726,6 +735,7 @@
4BF18C3C1FD2E2AB00DF95D1 /* CocoaFontAwesome.framework in Frameworks */,
4BF18C3E1FD2E2AB00DF95D1 /* RxSwift.framework in Frameworks */,
4B9DF286209C8A8B00DF2AAD /* Swifter.framework in Frameworks */,
4BC903EF22799E2D0016A1CD /* RxRelay.framework in Frameworks */,
4BF18C401FD2E2AB00DF95D1 /* RxCocoa.framework in Frameworks */,
4BE34B832225BAC7002F57D3 /* ShortcutRecorder.framework in Frameworks */,
4BC164281FD2DEE1001903BE /* NvimView.framework in Frameworks */,
@ -740,6 +750,7 @@
4BF18C511FD2E4F200DF95D1 /* RxTest.framework in Frameworks */,
4BF18C4F1FD2E4F100DF95D1 /* RxSwift.framework in Frameworks */,
4BF18C4C1FD2E4CE00DF95D1 /* NvimView.framework in Frameworks */,
4BC903EA22799DEB0016A1CD /* RxRelay.framework in Frameworks */,
4BDA50B42160BE70004D10A9 /* Socket.framework in Frameworks */,
4BF18C4A1FD2E2DE00DF95D1 /* Nimble.framework in Frameworks */,
);
@ -933,6 +944,7 @@
4B5012001EBA791000F76C46 /* Frameworks */ = {
isa = PBXGroup;
children = (
4BC903E822799DEB0016A1CD /* RxRelay.framework */,
4BE34B822225BAC7002F57D3 /* ShortcutRecorder.framework */,
4B0A1AA72120C35100F1E02F /* Socket.framework */,
4BB1F5D02097705E00EC394A /* MessagePack.framework */,
@ -1825,7 +1837,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 324;
CURRENT_PROJECT_VERSION = 326;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1886,7 +1898,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 324;
CURRENT_PROJECT_VERSION = 326;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_NS_ASSERTIONS = NO;

View File

@ -44,10 +44,7 @@ class FileMonitor: UiComponent {
latency: FileMonitor.fileSystemEventsLatency,
flags: [],
handler: { [weak self] event in
let url = URL(fileURLWithPath: event.path)
let parent = FileUtils.commonParent(of: [url])
self?.emit(.change(in: parent))
self?.emit(.change(in: URL(fileURLWithPath: event.path)))
})
monitor.setDispatchQueue(monitorDispatchQueue)
try monitor.start()

View File

@ -1224,7 +1224,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -1241,7 +1241,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.27.3</string>
<string>0.27.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>324</string>
<string>326</string>
</dict>
</plist>

View File

@ -7,27 +7,26 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.27.3-324</title>
<title>v0.27.4-326</title>
<description><![CDATA[
<ul>
<li>GH-725: Better character spacing; thanks @tkonolige!</li>
<li>Bugfix: File Browser sometimes does not update.</li>
<li>Dependencies updates:<ul>
<li>RxSwift/RxSwift@5.0.1</li>
<li>IBM-Swift/BlueSocket@1.0.46</li>
<li>Neovim 0.3.7</li>
</ul>
</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.27.3-324
https://github.com/qvacua/vimr/releases/tag/v0.27.4-326
</releaseNotesLink>
<pubDate>2019-05-01T11:01:42.506634</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.27.3-324/VimR-v0.27.3-324.tar.bz2"
sparkle:version="324"
sparkle:shortVersionString="0.27.3"
sparkle:dsaSignature="MC4CFQDtN/n8J23HtxOJV7PT/fvctzqzDQIVAIrjps40XgMT2zKVT4fchX5ZZO4W"
length="14480395"
<pubDate>2019-05-31T19:30:16.632348</pubDate>
<minimumSystemVersion>10.13.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.27.4-326/VimR-v0.27.4-326.tar.bz2"
sparkle:version="326"
sparkle:shortVersionString="0.27.4"
sparkle:dsaSignature="MCwCFCTcKYha1gP3VATXKmlosqU5l+7vAhRuxOj7jlUbilBMepUx4CN4/Eh8oA=="
length="14509863"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -7,27 +7,26 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.27.3-324</title>
<title>v0.27.4-326</title>
<description><![CDATA[
<ul>
<li>GH-725: Better character spacing; thanks @tkonolige!</li>
<li>Bugfix: File Browser sometimes does not update.</li>
<li>Dependencies updates:<ul>
<li>RxSwift/RxSwift@5.0.1</li>
<li>IBM-Swift/BlueSocket@1.0.46</li>
<li>Neovim 0.3.7</li>
</ul>
</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.27.3-324
https://github.com/qvacua/vimr/releases/tag/v0.27.4-326
</releaseNotesLink>
<pubDate>2019-05-01T11:01:42.506634</pubDate>
<pubDate>2019-05-31T19:30:16.632348</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.27.3-324/VimR-v0.27.3-324.tar.bz2"
sparkle:version="324"
sparkle:shortVersionString="0.27.3"
sparkle:dsaSignature="MC4CFQDtN/n8J23HtxOJV7PT/fvctzqzDQIVAIrjps40XgMT2zKVT4fchX5ZZO4W"
length="14480395"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.27.4-326/VimR-v0.27.4-326.tar.bz2"
sparkle:version="326"
sparkle:shortVersionString="0.27.4"
sparkle:dsaSignature="MCwCFCTcKYha1gP3VATXKmlosqU5l+7vAhRuxOj7jlUbilBMepUx4CN4/Eh8oA=="
length="14509863"
type="application/octet-stream"/>
</item>
</channel>

View File

@ -1,4 +1,16 @@
# ???
# 0.27.5
* Dependencies updates:
- Neovim 0.3.8
# 0.27.4
* Bugfix: File Browser sometimes does not update.
* Dependencies updates:
- Neovim 0.3.7
# 0.27.3
* GH-725: Better character spacing; thanks @tkonolige!
* Dependencies updates: