Merge branch 'develop' into update-neovim

DEVELOP.md

@@ -23,10 +23,9 @@ e.g. `NvimServer` binary.
 This can be done with the following:
 
 ```bash
-build_libnvim=true clean=true download_gettext=true ./bin/build_nvimserver_for_local_dev.sh
+build_libnvim=true clean=true ./bin/build_nvimserver_for_local_dev.sh
 ```
 
-Set `download_gettext` to true when you are building NvimServer locally for the first time.
 See the `build_nvimserver_for_local_dev` script for default values of the env vars.
 You can also use a watch script as follows (it uses `entr`):
 
@@ -34,33 +33,22 @@ You can also use a watch script as follows (it uses `entr`):
 clean_initial_build=true ./bin/watch_nvimserver_and_build
 ```
 
-When `clean_initial_build` is `true`, the script will download `gettext`, clean, and build,
+When `clean_initial_build` is `true`, the script will clean and build,
 then continuously invoke the `build_nvimserver_for_local_dev` script.
 
 ## How to release
 
 ### NvimServer
 
-#### Dependencies
-
-* Tag with the name `nvimserver-deps-yyyy-mm-dd`. GitHub actions will build the `x86_64` version,
-  create a release and upload it.
-* Build the `arm64` version locally (on an Apple Silicon machine since I could not find out
-  how to cross-compile `libnvim`) and upload it.
-* Update `NvimServer/Resources/nvimserver-deps-for-download.txt` and push.
-
-#### Executable
-
 * Tag with the name `nvimserver-x.y.z-n`. GitHub actions will build the `x86_64` version,
   create a release and upload it.
 * Build the `arm64` version locally and upload it:
   ```bash
   download_gettext=true clean=true build_libnvim=true ./NvimServer/bin/build_nvimserver.sh
   ```
-* Update `NvimServer/Resources/nvimserver-for-download.txt`.
 * Build a universal binary by the following and upload the artefact:
   ```bash
-  ./NvimServer/bin/build_release.sh
+  tag=nvimserver-x.y.z-n ./NvimServer/bin/build_release.sh
   ```
 
 ### VimR

NvimView/Package.swift

@@ -14,7 +14,7 @@ let package = Package(
       url: "https://github.com/a2/MessagePack.swift",
       .upToNextMinor(from: "4.0.0")
     ),
-    .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.2.0")),
+    .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.5.0")),
     .package(url: "https://github.com/Quick/Nimble", .upToNextMinor(from: "9.2.1")),
     .package(name: "NvimServer", path: "../NvimServer"),
     .package(name: "RxPack", path: "../RxPack"),

RxPack/Package.swift

@@ -9,7 +9,7 @@ let package = Package(
     .library(name: "RxPack", targets: ["RxPack"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.2.0")),
+    .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.5.0")),
     .package(
       name: "MessagePack",
       url: "https://github.com/a2/MessagePack.swift",

RxPack/Support/RxPackSupport.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 6.2.0;
+				minimumVersion = 6.5.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

VimR.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -96,8 +96,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift",
         "state": {
           "branch": null,
-          "revision": "7c17a6ccca06b5c107cfa4284e634562ddaf5951",
-          "version": "6.2.0"
+          "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
+          "version": "6.5.0"
         }
       },
       {

VimR/VimR.xcodeproj/project.pbxproj

@@ -1393,7 +1393,7 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift";
 			requirement = {
 				kind = exactVersion;
-				version = 6.2.0;
+				version = 6.5.0;
 			};
 		};
 		4B9BC42824EB2E6D000209B5 /* XCRemoteSwiftPackageReference "ShortcutRecorder" */ = {

VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme

@@ -57,16 +57,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
-            BuildableName = "VimR.app"
-            BlueprintName = "VimR"
-            ReferencedContainer = "container:VimR.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

bin/build_nvimserver_for_local_dev.sh

@@ -2,7 +2,6 @@
 set -Eeuo pipefail
 
 declare -x target; target="$(uname -m)"; readonly target
-declare -r -x download_gettext=${download_gettext:-false}
 declare -r -x clean=${clean:-false}
 declare -r -x build_libnvim=${build_libnvim:-true}
 declare -r -x build_dir=${build_dir:-"./.build"}

bin/watch_nvimserver_and_build.sh

@@ -4,7 +4,6 @@ set -Eeuo pipefail
 readonly clean_initial_build=${clean_inital_build:-false}
 
 clean_build() {
-  local -r -x download_gettext=true
   local -r -x clean=true
   local -r -x build_libnvim=true
   ./bin/build_nvimserver_for_local_dev.sh

resources/release-notes.md

@@ -1,3 +1,8 @@
+# Next
+
+* Dependencies updates:
+  - ReactiveX/RxSwift@6.5.0
+
 # 0.36.1-20220212.162106
 
 * GH-895: Add support for right and middle mouse buttons. Thank you @atishay!