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

Merge branch 'master' into develop

Browse Source 
Conflicts:
	MacNeovim/Info.plist
	SwiftNeoVim/Info.plist
	SwiftNeoVimTests/Info.plist
	VimR-Workspace-Demo/Info.plist
	VimR.xcodeproj/project.pbxproj
	VimR/Info.plist
	VimRTests/Info.plist
	resources/release-notes.md
This commit is contained in:
Tae Won Ha 2017-06-28 19:46:15 +02:00
commit e0034396ef
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
13 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MacNeovim/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

4
SwiftNeoVim/Info.plist
View File

@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
<key>NSPrincipalClass</key>

2
SwiftNeoVim/NeoVimView+Mouse.swift
View File

@ -155,7 +155,7 @@ extension NeoVimView {
modifierFlags: NSEventModifierFlags,
cellPosition: Position) -> (String, String) {
let vimMouseLocation = self.wrapNamedKeys("\(cellPosition.row),\(cellPosition.column)")
let vimMouseLocation = self.wrapNamedKeys("\(cellPosition.column),\(cellPosition.row)")
let (typeX, typeY) = self.vimScrollEventNamesFor(deltaX: deltaX, deltaY: deltaY)
let resultX: String

4
SwiftNeoVimTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</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>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

8
VimR.xcodeproj/project.pbxproj
View File

@ -1793,7 +1793,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 209;
DYLIB_CURRENT_VERSION = 210;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -1818,7 +1818,7 @@
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 209;
DYLIB_CURRENT_VERSION = 210;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -2055,7 +2055,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 209;
CURRENT_PROJECT_VERSION = 210;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -2105,7 +2105,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 209;
CURRENT_PROJECT_VERSION = 210;
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>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>

4
VimRTests/Info.plist
View File

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>SNAPSHOT-209</string>
<string>0.16.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>209</string>
<string>210</string>
</dict>
</plist>

20
appcast.xml
View File

@ -7,22 +7,20 @@
<description>Most recent changes with links to updates for VimR.</description>
<language>en</language>
<item>
<title>v0.16.1-208</title>
<title>v0.16.2-210</title>
<description><![CDATA[
<ul>
<li>GH-472: Bugfix: mouse scrolling an out-of-focus split window scrolls the focused split window.</li>
</ul>
<p>GH-472: Bugfix: Mouse wheel scrolling in split window sometimes scrolls in the wrong split.</p>
]]></description>
<releaseNotesLink>
https://github.com/qvacua/vimr/releases/tag/v0.16.1-208
https://github.com/qvacua/vimr/releases/tag/v0.16.2-210
</releaseNotesLink>
<pubDate>2017-06-24T14:54:52.841947</pubDate>
<pubDate>2017-06-28T17:32:57.613213</pubDate>
<minimumSystemVersion>10.10.0</minimumSystemVersion>
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.16.1-208/VimR-v0.16.1-208.tar.bz2"
sparkle:version="208"
sparkle:shortVersionString="0.16.1"
sparkle:dsaSignature="MC0CFFZUQFAwYrxt7QFs85mCTKxD2U/YAhUAqO25Q4xlOZPVqaooY5mKJlaI2F8="
length="10630903"
<enclosure url="https://github.com/qvacua/vimr/releases/download/v0.16.2-210/VimR-v0.16.2-210.tar.bz2"
sparkle:version="210"
sparkle:shortVersionString="0.16.2"
sparkle:dsaSignature="MCwCFBoq/JsW4co7/MxAg1jmd8gLhJhjAhQJvYBjgAel04nN0DTZFptRkr4eyg=="
length="10631071"
type="application/octet-stream"/>
</item>
</channel>

2
bin/build.sh
View File

@ -90,7 +90,7 @@ fi
if [ "${UPDATE_APPCAST}" = true ] ; then
./bin/set_appcast.py "build/Release/${VIMR_FILE_NAME}" "${BUNDLE_VERSION}" "${MARKETING_VERSION}" "${TAG}" ${IS_SNAPSHOT}
./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT}
./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT} ${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}
fi
echo "### Built VimR"

3
bin/commit_and_push_appcast.sh
View File

@ -5,6 +5,7 @@ set -e
BRANCH=$1
COMPOUND_VERSION=$2
IS_SNAPSHOT=$3
UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE=$4
if [ "${IS_SNAPSHOT}" = true ] ; then
cp ./build/Release/appcast_snapshot.xml .
@ -17,7 +18,7 @@ echo "### Commiting and pushing appcast"
git commit -S -am "Bump appcast to ${COMPOUND_VERSION}"
git push origin HEAD:"${BRANCH}"
if [ "${IS_SNAPSHOT}" = false ] ; then
if [ "${IS_SNAPSHOT}" = false ] && [ "${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}" = true ] ; then
git reset --hard @
git checkout -b for_appcast origin/develop
git merge --ff-only for_build

1
ci/create_build_job.groovy
View File

@ -27,6 +27,7 @@ Builds a new snapshot of VimR and pushes the tag:<br>
textParam('RELEASE_NOTES', null, 'Release notes')
booleanParam('IS_SNAPSHOT', true)
booleanParam('UPDATE_APPCAST', true)
booleanParam('UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE', true)
}
scm {

4
resources/release-notes.md
View File

@ -3,6 +3,10 @@
* GH-436: Use colors from the selected `colorscheme` for tools, e.g. the file browser.
* ...
# 0.16.2-210
* GH-472: Bugfix: Mouse wheel scrolling in split window sometimes scrolls in the wrong split.
# 0.16.1-208
* GH-472: Bugfix: mouse scrolling an out-of-focus split window scrolls the focused split window.