Record-only merge branch 'update-neovim'

Conflicts:
	Neovim

DEVELOP.md

@@ -14,13 +14,6 @@ clean=true for_dev=true ./bin/build_nvimserver.sh
 
 This is used when generating source since we need some generated header files.
 
-### Generating sources when upgrading Neovim
-
-```bash
-clean=true ./RxPack/bin/generate_sources.sh # generate API methods
-clean=false for_dev=true ./bin/build_nvimserver.sh # generate auto commands and cursor modes
-```
-
 ### How to enable the Debug menu in Release build
 
 ```bash
@@ -31,7 +24,11 @@ defaults write com.qvacua.VimR enable-debug-menu 1
 
 ### Neovim
 
-* Update Neovim and generate sources.
+* Update Neovim and generate sources:
+    ```bash
+    clean=true ./RxPack/bin/generate_sources.sh # generate API methods
+    clean=true use_committed_nvim=true ./bin/generate_sources.sh # Generate autocmds and cursorshapes
+    ```
 * Commit and push.
 * Tag and push with the following
     ```bash

RxPack/bin/generate_sources.sh

@@ -4,7 +4,7 @@ set -Eeuo pipefail
 readonly clean=${clean:?"true or false"}
 
 build_nvimserver_bin() {
-  ./bin/neovim/bin/build_neovim.sh
+  ./bin/neovim/bin/build_neovim_for_dev.sh
 }
 
 main() {

VimR/VimR.xcodeproj/project.pbxproj

@@ -1126,7 +1126,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20240528.123921;
+				CURRENT_PROJECT_VERSION = 20240528.171603;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -1192,7 +1192,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20240528.123921;
+				CURRENT_PROJECT_VERSION = 20240528.171603;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_MODULE_VERIFIER = YES;
@@ -1225,7 +1225,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20240528.123921;
+				CURRENT_PROJECT_VERSION = 20240528.171603;
 				DEFINES_MODULE = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				IBC_MODULE = VimR;
@@ -1250,7 +1250,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20240528.123921;
+				CURRENT_PROJECT_VERSION = 20240528.171603;
 				DEFINES_MODULE = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				IBC_MODULE = VimR;

VimR/VimR/Info.plist

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

VimR/VimRTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SNAPSHOT-20240528.123921</string>
+	<string>0.47.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20240528.123921</string>
+	<string>20240528.171603</string>
 </dict>
 </plist>

appcast.xml

@@ -6,22 +6,25 @@
     <description>Most recent changes with links to updates for VimR.</description>
     <language>en</language>
     <item>
-      <title>v0.46.2-20240517.102525</title>
+      <title>v0.47.1-20240528.171603</title>
       <link>https://twitter.com/vimrefined</link>
-      <sparkle:version>20240517.102525</sparkle:version>
-      <sparkle:shortVersionString>v0.46.2</sparkle:shortVersionString>
+      <sparkle:version>20240528.171603</sparkle:version>
+      <sparkle:shortVersionString>v0.47.1</sparkle:shortVersionString>
       <description><![CDATA[
     <ul>
-<li>GH-1059: Improved coloring of custom tabs; thanks @s-daveb for the PR!</li>
+<li>Neovim 0.10.0 😀<ul>
+<li>0.47.0 did not contain the generated API methods for Neovim 0.10.0...</li>
+</ul>
+</li>
 </ul>
   ]]></description>
       <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/v0.46.2-20240517.102525
+        https://github.com/qvacua/vimr/releases/tag/v0.47.1-20240528.171603
       </releaseNotesLink>
-      <pubDate>2024-05-17T10:49:24.608480</pubDate>
+      <pubDate>2024-05-28T17:19:47.931984</pubDate>
       <minimumSystemVersion>12.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.46.2-20240517.102525/VimR-v0.46.2.tar.bz2"
-                 sparkle:edSignature="bFlWhf7BYWo8kXYM3HEnqGKWssm0VM0y3D7N6XS6Erkk1iE57Y4DOcRqL4UWcL7gyiEnOoNWj/4NO77H7WUuDQ==" length="17062912"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.1-20240528.171603/VimR-v0.47.1.tar.bz2"
+                 sparkle:edSignature="iTLOhPvCHlMTpFMVo77oCiUT8EYKdbUyMeV15xWVUjnc/tB62utjmM7mQvBcUhERbKZWKp7fGPR6frNdvXNNBQ==" length="19379938"
                  type="application/octet-stream"/>
     </item>
   </channel>

appcast_snapshot.xml

@@ -6,22 +6,25 @@
     <description>Most recent changes with links to updates for VimR.</description>
     <language>en</language>
     <item>
-      <title>v0.46.2-20240517.102525</title>
+      <title>v0.47.1-20240528.171603</title>
       <link>https://twitter.com/vimrefined</link>
-      <sparkle:version>20240517.102525</sparkle:version>
-      <sparkle:shortVersionString>v0.46.2</sparkle:shortVersionString>
+      <sparkle:version>20240528.171603</sparkle:version>
+      <sparkle:shortVersionString>v0.47.1</sparkle:shortVersionString>
       <description><![CDATA[
     <ul>
-<li>GH-1059: Improved coloring of custom tabs; thanks @s-daveb for the PR!</li>
+<li>Neovim 0.10.0 😀<ul>
+<li>0.47.0 did not contain the generated API methods for Neovim 0.10.0...</li>
+</ul>
+</li>
 </ul>
   ]]></description>
       <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/v0.46.2-20240517.102525
+        https://github.com/qvacua/vimr/releases/tag/v0.47.1-20240528.171603
       </releaseNotesLink>
-      <pubDate>2024-05-17T10:49:24.608480</pubDate>
+      <pubDate>2024-05-28T17:19:47.931984</pubDate>
       <minimumSystemVersion>12.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.46.2-20240517.102525/VimR-v0.46.2.tar.bz2"
-                 sparkle:edSignature="bFlWhf7BYWo8kXYM3HEnqGKWssm0VM0y3D7N6XS6Erkk1iE57Y4DOcRqL4UWcL7gyiEnOoNWj/4NO77H7WUuDQ==" length="17062912"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.47.1-20240528.171603/VimR-v0.47.1.tar.bz2"
+                 sparkle:edSignature="iTLOhPvCHlMTpFMVo77oCiUT8EYKdbUyMeV15xWVUjnc/tB62utjmM7mQvBcUhERbKZWKp7fGPR6frNdvXNNBQ==" length="19379938"
                  type="application/octet-stream"/>
     </item>
   </channel>

bin/build_release.sh

@@ -22,10 +22,8 @@ declare -r -x GH_REPO="qvacua/vimr"
 
 prepare_bin() {
   pushd ./bin >/dev/null
-    if ! pyenv which python | grep -q "com.qvacua.VimR.bin"; then
-      echo "com.qvacua.VimR.bin virtualenv not set up!"
-      exit 1;
-    fi
+    python3 -m venv .venv
+    source .venv/bin/activate
 
     pip install -r requirements.txt
   popd >/dev/null

bin/sign_vimr.sh

@@ -33,6 +33,12 @@ main () {
       --entitlements="${entitlements_path}" \
       "${vimr_app_path}/Contents/Resources/NvimView_NvimView.bundle/Contents/Resources/NvimServer"
 
+    for f in "${vimr_app_path}/Contents/Resources/NvimView_NvimView.bundle/Contents/Resources/runtime/parser"/*; do
+      codesign --verbose --force -s "${identity}" --timestamp --options=runtime \
+        --entitlements="${entitlements_path}" \
+        "${f}"
+    done
+
     codesign --verbose --force -s "${identity}" --deep --timestamp --options=runtime \
       "${vimr_app_path}"