qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-27 14:14:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	VimR/Info.plist
	VimR/UiRootReducer.swift
	resources/release-notes.md
This commit is contained in:
Tae Won Ha 2017-05-05 18:03:17 +02:00
commit 487da9fa47
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
12 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OutlineViewTest/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
</dict>
</plist>

4
VimR-Workspace-Demo/Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1697,7 +1697,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 184;
DYLIB_CURRENT_VERSION = 185;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1722,7 +1722,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 184;
DYLIB_CURRENT_VERSION = 185;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1957,7 +1957,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 184;
CURRENT_PROJECT_VERSION = 185;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -2007,7 +2007,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 184;
CURRENT_PROJECT_VERSION = 185;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;

4
VimR/Info.plist
View File

@ -32,7 +32,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

1
VimR/SerializableStates.swift
View File

@ -44,6 +44,7 @@ class Keys {
static let orderedTools = "ordered-tools"
static let activeTools = "active-tools"
static let useInteractiveZsh = "use-interactive-zsh"
static let isShowHidden = "is-show-hidden"
}

4
VimR/States.swift
View File

@ -242,6 +242,9 @@ extension MainWindow {
return nil
}
// Stay compatible with 168
self.useInteractiveZsh = PrefUtils.bool(from: dict, for: Keys.MainWindow.useInteractiveZsh, default: false)
self.isAllToolsVisible = isAllToolsVisible
self.isToolButtonsVisible = isToolButtonsVisible
@ -297,6 +300,7 @@ extension MainWindow {
Keys.PreviewTool.key: self.previewTool.dict(),
Keys.MainWindow.isShowHidden: self.fileBrowserShowHidden,
Keys.MainWindow.useInteractiveZsh: self.useInteractiveZsh,
]
}
}

2
VimR/UiRootReducer.swift
View File

@ -38,7 +38,7 @@ class UiRootReducer {
return StateActionPair(state: appState, action: pair.action)
}
fileprivate func mainWindowTemplate(from old: MainWindow.State, new: MainWindow.State) -> MainWindow.State {
var result = old

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.14.2</string>
<string>0.14.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>184</string>
<string>185</string>
</dict>
</plist>

18
appcast.xml
View File

@ -7,22 +7,22 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.14.2-184</title>
<title>v0.14.3-185</title>
<description><![CDATA[
<ul>
<li>GH-438: Bugfix: <code>:help</code> does not work.</li>
<li>GH-440: Bugfix: "User interactive mode for zsh" does not work.</li>
</ul>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.14.2-184
https://github.com/qvacua/vimr/releases/tag/v0.14.3-185
</releaseNotesLink>
<pubDate>2017-05-04T22:05:42.932030</pubDate>
<pubDate>2017-05-05T17:58:41.818335</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.14.2-184/VimR-v0.14.2-184.tar.bz2"
sparkle:version="184"
sparkle:shortVersionString="0.14.2"
sparkle:dsaSignature="MC4CFQDBWoYcmlW33sAUJUMhL9BETl21CwIVALa6F0cLuFqAJU5chVW03B6pYoh0"
length="12193126"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.14.3-185/VimR-v0.14.3-185.tar.bz2"
sparkle:version="185"
sparkle:shortVersionString="0.14.3"
sparkle:dsaSignature="MC4CFQCB/DtZ5exkIgeSKdN9nMZu86MzkgIVAKA3Pu7FcyS0Glv88CM1ruaCkF5m"
length="12194529"
type="application/octet-stream"/>
</item>
</channel>

6
resources/release-notes.md
View File

@ -3,7 +3,11 @@
* Dependencies updates:
- RxSwift: 3.4.1
# 0.14.2-183
# 0.14.3-185
* GH-440: Bugfix: "User interactive mode for zsh" does not work.
# 0.14.2-184
* GH-438: Bugfix: `:help` does not work.