Merge branch 'master' into ligatures

.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  build:
+    machine:
+      image: circleci/classic:201808-01
+    working_directory: ~/project
+    steps:
+      - checkout
+      - run:
+          name: Setup nvim ppa
+          command: sudo add-apt-repository --yes ppa:neovim-ppa/unstable
+      - run:
+          name: APT update
+          command: sudo apt-get update
+      - run:
+          name: Install dependencies
+          command: sudo apt-get install -y neovim python-pip python-dev cmake qt5-default
+      - run:
+          name: build
+          command: |
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_GCOV=ON ..
+            cmake --build . -- VERBOSE=1
+      - run:
+          name: test
+          command: |
+            cd build
+            ctest -VV
+

.travis.yml

@@ -8,7 +8,7 @@ compiler:
 before_install:
   - brew update
   # Install Neovim for the unit tests
-  - brew install neovim/neovim/neovim
+  - brew install neovim
   - brew ls | grep -wq cmake || brew install cmake
   - brew ls | grep -wq qt5 || brew install qt5
   - brew ls | grep -wq msgpack || brew install msgpack

CMakeLists.txt

@@ -3,7 +3,7 @@ if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
 endif (POLICY CMP0048)
 
-project(neovim-qt VERSION 0.2.12.0)
+project(neovim-qt VERSION 0.2.13.0)
 
 INCLUDE(CPack)
 

README.md

@@ -1,7 +1,7 @@
 
 Neovim client library and GUI, in Qt5.
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/1ca75720-56a2-4573-883b-f90fd6241327/414035/badge.svg)](https://semaphoreci.com/equalsraf/neovim-qt)
+[![Build Status](https://circleci.com/gh/equalsraf/neovim-qt.svg?style=svg)](https://circleci.com/gh/equalsraf/neovim-qt)
 [![Build status](https://ci.appveyor.com/api/projects/status/c252f54mfjcuud8x/branch/master?svg=true)](https://ci.appveyor.com/project/equalsraf/neovim-qt/branch/master)
 [![Build Status](https://travis-ci.org/equalsraf/neovim-qt.svg?branch=master)](https://travis-ci.org/equalsraf/neovim-qt)
 [![Coverage Status](https://coveralls.io/repos/equalsraf/neovim-qt/badge.svg?branch=tb-refactor)](https://coveralls.io/r/equalsraf/neovim-qt)

cmake/MacOSXBundleInfo.plist.in

@@ -15,17 +15,17 @@
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleIdentifier</key>
-	<string>${APPLE_GUI_IDENTIFIER}</string>
+	<string>${CMAKE_PROJECT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>${APPLE_GUI_LONG_VERSION_STRING}</string>
+	<string>${CMAKE_PROJECT_VERSION}</string>
 	<key>CFBundleName</key>
 	<string>Neovim</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>${APPLE_GUI_SHORT_VERSION_STRING}</string>
+	<string>${CMAKE_PROJECT_VERSION}</string>
 	<key>CFBundleVersion</key>
 	<string>${APPLE_GUI_BUNDLE_VERSION}</string>
 	<key>CSResourcesFileMapped</key>

src/CMakeLists.txt

@@ -2,7 +2,21 @@
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-set(NEOVIM_QT_SOURCES util.cpp neovimconnector.cpp neovimconnectorhelper.cpp function.cpp msgpackrequest.cpp msgpackiodevice.cpp auto/neovimapi0.cpp auto/neovimapi1.cpp auto/neovimapi2.cpp auto/neovimapi3.cpp auto/neovimapi4.cpp auto/neovimapi6.cpp)
+set(NEOVIM_QT_SOURCES
+  auto/neovimapi0.cpp
+  auto/neovimapi1.cpp
+  auto/neovimapi2.cpp
+  auto/neovimapi3.cpp
+  auto/neovimapi4.cpp
+  auto/neovimapi5.cpp
+  auto/neovimapi6.cpp
+  function.cpp
+  msgpackiodevice.cpp
+  msgpackrequest.cpp
+  neovimconnector.cpp
+  neovimconnectorhelper.cpp
+  util.cpp)
+
 if(WIN32)
   list(APPEND NEOVIM_QT_SOURCES stdinreader.cpp)
 endif()