Remove uibridge, allow basically unmodified nvim binary

.gitignore

@@ -179,3 +179,7 @@ Temporary Items
 
 .deps
 tags.*
+/RxPack/.build
+/Workspace/.swiftpm
+.swiftpm
+/NvimServer/.build

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "NvimServer"]
-	path = NvimServer
-	url = git@github.com:qvacua/neovim.git
+[submodule "Neovim"]
+	path = Neovim
+	url = git@github.com:georgeharker/vimr-neovim.git

Commons/Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
   name: "Commons",
-  platforms: [.macOS(.v10_15)],
+  platforms: [.macOS(.v13)],
   products: [
     .library(name: "Commons", targets: ["Commons", "CommonsObjC"]),
   ],

Commons/Support/CommonsSupport.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -202,7 +202,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -257,7 +257,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;

Ignore/Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
   name: "Ignore",
-  platforms: [.macOS(.v10_15)],
+  platforms: [.macOS(.v13)],
   products: [
     .library(name: "Ignore", targets: ["Ignore"]),
   ],

NvimServer/NvimServer/.gitignore

@@ -0,0 +1,3 @@
+.deps
+third-party
+

NvimServer/NvimServer/Resources/NvimServer.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.cs.disable-executable-page-protection</key>
+	<true/>
+  <key>com.apple.security.cs.disable-library-validation</key>
+  <true/>
+</dict>
+</plist>

NvimServer/NvimServer/Resources/buildInfo.json

@@ -0,0 +1,7 @@
+{
+  "deploymentTarget": "10.15",
+  "gettext": {
+    "arm64BottleTag": "arm64_ventura",
+    "x86_64BottleTag": "ventura"
+  }
+}

NvimServer/NvimServer/Sources/NvimServerTypes.h

@@ -0,0 +1 @@
+../../NvimServerTypes/Sources/include/NvimServerTypes.h

NvimServer/NvimServer/Sources/main.c

@@ -0,0 +1 @@
+../../../Neovim/src/nvim/main.c

NvimServer/NvimServer/bin/.gitignore

@@ -0,0 +1 @@
+.idea

NvimServer/NvimServer/bin/README.md

@@ -0,0 +1,86 @@
+## How to develop
+
+First, clean everything
+
+```
+$ ./bin/clean_all.sh
+```
+
+Then, build `libnvim` once with dependencies
+
+```
+$ target=x86_64 build_deps=true ./bin/build_libnvim.sh
+```
+
+After editing the code of neovim or NvimServer, you build NvimServer in Xcode or by executing
+the following:
+
+```
+$ target="${ARCH}" build_deps=false build_dir="${PROJECT_ROOT}/NvimServer/build" \
+  ./bin/build_nvimserver.sh
+```
+
+where `${ARCH}` is either `arm64` or `x86_64`.
+We use `${PROJECT_ROOT}/NvimServer/build` as the NvimServer target assumes that location.
+
+## How to release
+
+```
+$ ./bin/build_release.sh 
+```
+
+The resulting package will be in `${PROJECT_ROOT}/NvimServer/build/NvimServer.tar.bz2`.
+
+## Individual steps
+
+In the following the `target` variable can be either `x86_64` or `arm64`.
+
+### How to build `libintl`
+
+```
+$ ./bin/build_deps.sh
+```
+
+which will result in
+
+```
+${PROJECT_ROOT}
+    NvimServer
+        third-party
+            lib
+                liba
+                libb
+                ...
+            include
+                a.h
+                b.h
+                ...
+            x86_64
+                lib
+                    liba
+                    libb
+                include
+                    a.h
+                    b.h
+```
+
+Files, e.g. `lib` and `include`, in `${PROJECT_ROOT}/NvimServer/third-party` are used to build
+`libnvim` and NvimServer.
+
+### How to build `libnvim`
+
+```
+$ build_deps=true ./bin/build_libnvim.sh
+```
+
+When `build_deps` is `true`, then the `build_deps.sh` is executed. The resuling library will be
+located in `/build/lib/libnvim.a`.
+
+### how to build NvimServer
+
+```
+$ build_dir="${some_dir}" build_libnvim=true build_deps=true ./bin/build_nvimserver.sh
+```
+
+The `build_libnvim.sh` script is executed automatically with the given parameters. The resulting
+binary will be located in `${some_dir}`.

NvimServer/NvimServer/bin/build_libnvim.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+readonly clean=${clean:?"true or false"}
+
+build_libnvim() {
+  local -r deployment_target=$1
+
+  # Brew's gettext does not get sym-linked to PATH
+  export PATH="/opt/homebrew/opt/gettext/bin:/usr/local/opt/gettext/bin:${PATH}"
+
+  macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
+  #macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64"
+
+  pushd ../Neovim
+
+  # W/o setting MACOSX_DEPLOYMENT_TARGET, the dependencies have min. macOS set to the macOS you're on.
+  make \
+    CMAKE_BUILD_TYPE=Release \
+    SDKROOT="$(xcrun --show-sdk-path)" \
+    MACOSX_DEPLOYMENT_TARGET="${deployment_target}" \
+    CMAKE_EXTRA_FLAGS="" \
+    CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
+    DEPS_CMAKE_FLAGS="${macos_flags}" \
+    libnvim nvim 
+
+  popd
+}
+
+main() {
+  # This script is located in /NvimServer/bin and we have to go to /
+  echo "$(dirname "${BASH_SOURCE[0]}")/../../"
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+
+  echo "### Building libnvim"
+  local deployment_target
+  deployment_target=$(jq -r .deploymentTarget ./NvimServer/Resources/buildInfo.json)
+  readonly deployment_target
+
+  if [[ "${clean}" == true ]]; then
+    pushd ../Neovim
+    make distclean
+    popd
+
+    ./NvimServer/bin/prepare_libintl.sh
+
+  fi
+
+  build_libnvim "${deployment_target}"
+
+  popd >/dev/null
+  echo "### Built libnvim"
+}
+
+main
+

NvimServer/NvimServer/bin/build_nvimserver.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+declare -r -x clean=${clean:?"if true, will clean libnvim and nvimserver"}
+readonly build_libnvim=${build_libnvim:?"true or false"}
+readonly build_dir=${build_dir:-"./.build"}
+
+main() {
+  echo "### Building NvimServer"
+  # This script is located in /NvimServer/bin and we have to go to /
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../.." >/dev/null
+    if [[ "${clean}" == true ]]; then
+      rm -rf "${build_dir}"
+    fi
+
+    if [[ "${build_libnvim}" == true ]]; then
+      ./NvimServer/bin/build_libnvim.sh
+    fi
+
+    swift build --arch arm64 --arch x86_64 -c release --product NvimServer
+    #swift build --arch arm64 -c release --product NvimServer
+
+  popd >/dev/null
+  echo "### Built NvimServer"
+}
+
+main

NvimServer/NvimServer/bin/build_runtime.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+readonly nvim_install_path=${nvim_install_path:?"where to install temp nvim"}
+
+build_runtime() {
+  pushd ../Neovim
+
+  local -r deployment_target=$1
+
+  echo "#### runtime in ${nvim_install_path}"
+
+  echo "### Building nvim to get the complete runtime"
+  make \
+    SDKROOT="$(xcrun --show-sdk-path)" \
+    MACOSX_DEPLOYMENT_TARGET="${deployment_target}" \
+    CMAKE_EXTRA_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=${nvim_install_path}" \
+    DEPS_CMAKE_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target}" \
+    CMAKE_BUILD_TYPE="Release" \
+    install
+
+  echo "#### runtime is installed at ${nvim_install_path}/share/nvim/runtime"
+
+  popd
+}
+
+main() {
+  # This script is located in /NvimServer/bin and we have to go to /
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../.." >/dev/null
+
+  echo "### Building runtime"
+  local deployment_target
+  deployment_target=$(jq -r .deploymentTarget ./NvimServer/Resources/buildInfo.json)
+  readonly deployment_target
+
+  build_runtime "${deployment_target}"
+
+  popd >/dev/null
+  echo "### Built runtime"
+}
+
+main

NvimServer/NvimServer/bin/clean_all.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+readonly clean_deps=${clean_deps:-true}
+
+pushd "$(dirname "${BASH_SOURCE[0]}")/../.." >/dev/null
+  pushd ../Neovim
+
+  rm -rf ./build
+  rm -rf ./.deps
+  make distclean
+
+  popd
+
+  if [[ "${clean_deps}" == true ]]; then
+    rm -rf ./NvimServer/build
+  fi
+popd >/dev/null