Trying to progress on the CI builds

Reworked the way libSession-util builds to use a static library and be less hacky Updated to the latest version of WebRTC-lib (no longer includes bitcode) Removed the 'skip_web_rtc_re_rsync' patch as it's no longer an issue since the bitcode was removed so the framework is much smaller
2023-07-12 15:03:42 +10:00 · 2023-07-12 15:03:42 +10:00 · 43b2aaf8bb
parent 868b4cc24e
commit 43b2aaf8bb
15 changed files with 475 additions and 503 deletions
--- a/.drone-static-upload.sh
+++ b/.drone-static-upload.sh
@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+# Script used with Drone CI to upload build artifacts (because specifying all this in
+# .drone.jsonnet is too painful).
+
+
+
+set -o errexit
+
+if [ -z "$SSH_KEY" ]; then
+    echo -e "\n\n\n\e[31;1mUnable to upload artifact: SSH_KEY not set\e[0m"
+    # Just warn but don't fail, so that this doesn't trigger a build failure for untrusted builds
+    exit 0
+fi
+
+echo "$SSH_KEY" >ssh_key
+
+set -o xtrace  # Don't start tracing until *after* we write the ssh key
+
+chmod 600 ssh_key
+
+if [ -n "$DRONE_TAG" ]; then
+    # For a tag build use something like `session-ios-v1.2.3`
+    base="session-ios-$DRONE_TAG"
+else
+    # Otherwise build a length name from the datetime and commit hash, such as:
+    # session-ios-20200522T212342Z-04d7dcc54
+    base="session-ios-$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}"
+fi
+
+mkdir -v "$base"
+
+# Copy over the build products    
+cp -av build/Build/Products/App\ Store\ Release-iphonesimulator/Session.app "$base"
+
+# tar dat shiz up yo
+archive="$base.tar.xz"
+tar cJvf "$archive" "$base"
+
+upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
+
+# sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of
+# -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands.  The leading `-` allows the command to fail
+# without error.
+upload_dirs=(${upload_to//\// })
+put_debug=
+mkdirs=
+dir_tmp=""
+for p in "${upload_dirs[@]}"; do
+    dir_tmp="$dir_tmp$p/"
+    mkdirs="$mkdirs
+-mkdir $dir_tmp"
+done
+if [ -e "$base-debug-symbols.tar.xz" ] ; then
+    put_debug="put $base-debug-symbols.tar.xz $upload_to"
+fi
+sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@oxen.rocks <<SFTP
+$mkdirs
+put $archive $upload_to
+$put_debug
+SFTP
+
+set +o xtrace
+
+echo -e "\n\n\n\n\e[32;1mUploaded to https://${upload_to}/${archive}\e[0m\n\n\n"
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -1,4 +1,5 @@
-local submodule_commands = ['git fetch --tags', 'git submodule update --init --recursive --depth=1'];
+// Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well)
+local submodule_commands = ['git fetch --tags', 'git submodule update --init --recursive --depth=2'];

 local submodules = {
  name: 'submodules',
@ -9,66 +10,70 @@ local submodules = {
 // cmake options for static deps mirror
 local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');

-// Macos build
-local mac_builder(name,
-                  build_type='Release',
-                  werror=true,
-                  cmake_extra='',
-                  local_mirror=true,
-                  extra_cmds=[],
-                  jobs=6,
-                  codesign='-DCODESIGN=OFF',
-                  allow_fail=false) = {
-  kind: 'pipeline',
-  type: 'exec',
-  name: name,
-  platform: { os: 'darwin', arch: 'amd64' },
-  steps: [
-    { name: 'submodules', commands: submodule_commands },
-    {
-      name: 'build',
-      environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
-      commands: [
-        'echo "Building on ${DRONE_STAGE_MACHINE}"',
-        // If you don't do this then the C compiler doesn't have an include path containing
-        // basic system headers.  WTF apple:
-        'export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"',
-        'ulimit -n 1024',  // because macos sets ulimit to 256 for some reason yeah idk
-        './contrib/mac-configure.sh ' +
-        ci_dep_mirror(local_mirror) +
-        (if build_type == 'Debug' then ' -DWARN_DEPRECATED=OFF ' else '') +
-        codesign,
-        'cd build-mac',
-        // We can't use the 'package' target here because making a .dmg requires an active logged in
-        // macos gui to invoke Finder to invoke the partitioning tool to create a partitioned (!)
-        // disk image.  Most likely the GUI is required because if you lose sight of how pretty the
-        // surface of macOS is you might see how ugly the insides are.
-        'ninja -j' + jobs + ' assemble_gui',
-        'cd ..',
-      ] + extra_cmds,
-    },
-  ],
-};
+// xcpretty
+local xcpretty_commands = [
+  'if [[ $(command -v brew) != "" ]]; then; brew install xcpretty; fi;',
+  'if [[ $(command -v brew) == "" ]]; then; gem install xcpretty; fi;'
+];


 [
-  // TODO: Unit tests
-  // TODO: Build for UI testing
-  // TODO: Production build
+  // Unit tests
  {
    kind: 'pipeline',
    type: 'exec',
-    name: 'MacOS',
+    name: 'Unit Tests',
    platform: { os: 'darwin', arch: 'amd64' },
    steps: [
-      // TODO: Need a depth of 2? (libSession-util has it's own submodules)
      { name: 'submodules', commands: submodule_commands },
+      { name: 'xcpretty', commands: xcpretty_commands },
+      { name: 'pods', commands: 'pod install' },
      {
-        name: 'build',
+        name: 'Run Unit Tests',
        commands: [
-          'echo "This is a test message"',
+          'mkdir build',
+          'xcodebuild test -workspace Session.xcworkspace -scheme Session -destination "platform=iOS Simulator,name=iPhone 14 Pro" | xcpretty --report html'
        ],
      },
    ],
  },
+  // Simulator build
+  {
+    kind: 'pipeline',
+    type: 'exec',
+    name: 'Simulator Build',
+    platform: { os: 'darwin', arch: 'amd64' },
+    steps: [
+      { name: 'submodules', commands: submodule_commands },
+      { name: 'xcpretty', commands: xcpretty_commands },
+      { name: 'pods', commands: 'pod install' },
+      {
+        name: 'build',
+        commands: [
+          'mkdir build',
+          'xcodebuild -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphonesimulator -derivedDataPath ./build -destination 'generic/platform=iOS Simulator' | xcpretty',
+          './.drone-static-upload.sh'
+        ],
+      },
+    ],
+  },
+//  // AppStore build (generate an archive to be signed later)
+//  {
+//    kind: 'pipeline',
+//    type: 'exec',
+//    name: 'AppStore Build',
+//    platform: { os: 'darwin', arch: 'amd64' },
+//    steps: [
+//      { name: 'submodules', commands: submodule_commands },
+//      { name: 'xcpretty', commands: xcpretty_commands },
+//      { name: 'pods', commands: 'pod install' },
+//      {
+//        name: 'build',
+//        commands: [
+//          'mkdir build',
+//          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -archivePath ./build/Session.xcarchive -destination "platform=generic/iOS" | xcpretty'
+//        ],
+//      },
+//    ],
+//  },
 ]
--- a/10
+++ b/10
@ -101,7 +101,6 @@ end
 # Actions to perform post-install
 post_install do |installer|
  set_minimum_deployment_target(installer)
-  avoid_rsync_webrtc_if_unchanged(installer)
 end

 def set_minimum_deployment_target(installer)
@ -111,12 +110,3 @@ def set_minimum_deployment_target(installer)
    end
  end
 end
-
-# This function patches the Cocoapods 'Embed Frameworks' script to avoid running rsync
-# for the WebRTC-lib framework in simulator builds if it has already been copied over
-# because due to the size it can take over 10 seconds to embed, and gets embeded in
-# each target on every build regardless of whether there were changes, drastically
-# increasing the length of the build
-def avoid_rsync_webrtc_if_unchanged(installer)
-  system('find "./Pods/Target Support Files" -name "*-frameworks.sh" -exec patch -p0 -i ./Scripts/skip_web_rtc_re_rsync.patch {} \;')
-end
--- a/Podfile.lock
+++ b/Podfile.lock
@ -41,7 +41,7 @@ PODS:
  - SQLCipher/standard (4.5.3):
    - SQLCipher/common
  - SwiftProtobuf (1.5.0)
-  - WebRTC-lib (96.0.0)
+  - WebRTC-lib (114.0.0)
  - YapDatabase/SQLCipher (3.1.1):
    - YapDatabase/SQLCipher/Core (= 3.1.1)
    - YapDatabase/SQLCipher/Extensions (= 3.1.1)
@ -199,11 +199,11 @@ SPEC CHECKSUMS:
  Sodium: a7d42cb46e789d2630fa552d35870b416ed055ae
  SQLCipher: 57fa9f863fa4a3ed9dd3c90ace52315db8c0fdca
  SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
-  WebRTC-lib: 508fe02efa0c1a3a8867082a77d24c9be5d29aeb
+  WebRTC-lib: d83df8976fa608b980f1d85796b3de66d60a1953
  YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
  YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: dcca0c4ad69b14cbc2d6ba49f9d690b239828e6d
+PODFILE CHECKSUM: 68799237a4dc046f5ac25c573af03b559f5b10c4

 COCOAPODS: 1.12.1
--- a/Scripts/build_libSession_util.sh
+++ b/Scripts/build_libSession_util.sh
@ -27,37 +27,41 @@

 # Need to set the path or we won't find cmake
 PATH=${PATH}:/usr/local/bin:/opt/homebrew/bin:/sbin/md5
-SHOULD_AUTO_INIT_SUBMODULES=${1:-false}
+
+exec 3>&1 # Save original stdout
+
+# Ensure the build directory exists (in case we need it before XCode creates it)
+mkdir -p "${TARGET_BUILD_DIR}/libSessionUtil"
+
+# Remove any old build errors
+rm -rf "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log"
+
+# Restore stdout and stderr and redirect it to the 'libsession_util_output.log' file
+exec &> "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log"
+
+# Define a function to echo a message.
+function echo_message() {
+  exec 1>&3 # Restore stdout
+  echo "$1"
+  exec >> "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log" # Redirect all output to the log file
+}
+
+echo_message "info: Validating build requirements"
+
+set -x

 # Ensure the build directory exists (in case we need it before XCode creates it)
 mkdir -p "${TARGET_BUILD_DIR}"

-# Remove any old build errors
-rm -rf "${TARGET_BUILD_DIR}/libsession_util_error.log"
-
-# First ensure cmake is installed (store the error in a log and exit with a success status - xcode will output the error)
-echo "info: Validating build requirements"
-
 if ! which cmake > /dev/null; then
-  touch "${TARGET_BUILD_DIR}/libsession_util_error.log"
-  echo "error: cmake is required to build, please install (can install via homebrew with 'brew install cmake')."
-  echo "error: cmake is required to build, please install (can install via homebrew with 'brew install cmake')." > "${TARGET_BUILD_DIR}/libsession_util_error.log"
+  echo_message "error: cmake is required to build, please install (can install via homebrew with 'brew install cmake')."
  exit 0
 fi

 # Check if we have the `LibSession-Util` submodule checked out and if not (depending on the 'SHOULD_AUTO_INIT_SUBMODULES' argument) perform the checkout
 if [ ! -d "${SRCROOT}/LibSession-Util" ] || [ ! -d "${SRCROOT}/LibSession-Util/src" ] || [ ! "$(ls -A "${SRCROOT}/LibSession-Util")" ]; then
-  if [ "${SHOULD_AUTO_INIT_SUBMODULES}" != "false" ] & command -v git >/dev/null 2>&1; then
-    echo "info: LibSession-Util submodule doesn't exist, resetting and checking out recusively now"
-    git submodule foreach --recursive git reset --hard
-    git submodule update --init --recursive
-    echo "info: Checkout complete"
-  else
-    touch "${TARGET_BUILD_DIR}/libsession_util_error.log"
-    echo "error: Need to fetch LibSession-Util submodule (git submodule update --init --recursive)."
-    echo "error: Need to fetch LibSession-Util submodule (git submodule update --init --recursive)." > "${TARGET_BUILD_DIR}/libsession_util_error.log"
-    exit 0
-  fi
+  echo_message "error: Need to fetch LibSession-Util submodule (git submodule update --init --recursive)."
+  exit 0
 else
  are_submodules_valid() {
    local PARENT_PATH=$1
@ -82,7 +86,7 @@ else
      
      # If the child path doesn't exist then it's invalid
      if [ ! -d "${PARENT_PATH}/${CHILD_PATH}" ]; then
-        echo "info: Submodule '${RELATIVE_PATH}/${CHILD_PATH}' doesn't exist."
+        echo_message "info: Submodule '${RELATIVE_PATH}/${CHILD_PATH}' doesn't exist."
        return 1
      fi

@ -90,7 +94,7 @@ else
      local RESULT=$?

      if [ "${RESULT}" -eq 1 ]; then
-        echo "info: Submodule '${RELATIVE_PATH}/${CHILD_PATH}' is in an invalid state."
+        echo_message "info: Submodule '${RELATIVE_PATH}/${CHILD_PATH}' is in an invalid state."
        return 1
      fi
    done
@ -104,18 +108,8 @@ else
  HAS_INVALID_SUBMODULE=$?

  if [ "${HAS_INVALID_SUBMODULE}" -eq 1 ]; then
-    if [ "${SHOULD_AUTO_INIT_SUBMODULES}" != "false" ] && command -v git >/dev/null 2>&1; then
-      echo "info: Submodules are in an invalid state, resetting and checking out recusively now"
-      cd "${SRCROOT}/LibSession-Util"
-      git submodule foreach --recursive git reset --hard
-      git submodule update --init --recursive
-      echo "info: Checkout complete"
-    else
-      touch "${TARGET_BUILD_DIR}/libsession_util_error.log"
-      echo "error: Submodules are in an invalid state, please delete 'LibSession-Util' and run 'git submodule update --init --recursive'."
-      echo "error: Submodules are in an invalid state, please delete 'LibSession-Util' and run 'git submodule update --init --recursive'." > "${TARGET_BUILD_DIR}/libsession_util_error.log"
-      exit 0
-    fi
+    echo_message "error: Submodules are in an invalid state, please delete 'LibSession-Util' and run 'git submodule update --init --recursive'."
+    exit 0
  fi
 fi

@ -125,49 +119,143 @@ echo "info: Checking for changes to source"
 NEW_SOURCE_HASH=$(find "${SRCROOT}/LibSession-Util/src" -type f -exec md5 {} + | awk '{print $NF}' | sort | md5 | awk '{print $NF}')
 NEW_HEADER_HASH=$(find "${SRCROOT}/LibSession-Util/include" -type f -exec md5 {} + | awk '{print $NF}' | sort | md5 | awk '{print $NF}')

-if [ -f "${TARGET_BUILD_DIR}/libsession_util_source_hash.log" ]; then
-    read -r OLD_SOURCE_HASH < "${TARGET_BUILD_DIR}/libsession_util_source_hash.log"
+if [ -f "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_source_hash.log" ]; then
+    read -r OLD_SOURCE_HASH < "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_source_hash.log"
 fi

-if [ -f "${TARGET_BUILD_DIR}/libsession_util_header_hash.log" ]; then
-    read -r OLD_HEADER_HASH < "${TARGET_BUILD_DIR}/libsession_util_header_hash.log"
+if [ -f "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_header_hash.log" ]; then
+    read -r OLD_HEADER_HASH < "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_header_hash.log"
 fi

-if [ -f "${TARGET_BUILD_DIR}/libsession_util_archs.log" ]; then
-    read -r OLD_ARCHS < "${TARGET_BUILD_DIR}/libsession_util_archs.log"
+if [ -f "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_archs.log" ]; then
+    read -r OLD_ARCHS < "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_archs.log"
 fi

-# Start the libSession-util build if it doesn't already exists
-if [ "${NEW_SOURCE_HASH}" != "${OLD_SOURCE_HASH}" ] || [ "${NEW_HEADER_HASH}" != "${OLD_HEADER_HASH}" ] || [ "${ARCHS[*]}" != "${OLD_ARCHS}" ] || [ ! -d "${TARGET_BUILD_DIR}/libsession-util.xcframework" ]; then
-  echo "info: Build is not up-to-date - creating new build"
-  echo ""
-
-  # Remove any existing build files (just to be safe)
-  rm -rf "${TARGET_BUILD_DIR}/libsession-util.a"
-  rm -rf "${TARGET_BUILD_DIR}/libsession-util.xcframework"
-  rm -rf "${BUILD_DIR}/libsession-util.xcframework"
-
-  # Trigger the new build
-  cd "${SRCROOT}/LibSession-Util"
-  result=$(./utils/ios.sh "libsession-util" false)
-
-  if [ $? -ne 0 ]; then
-    touch "${TARGET_BUILD_DIR}/libsession_util_error.log"
-    echo "error: Failed to build libsession-util (See details in '${TARGET_BUILD_DIR}/pre-action-output.log')."
-    echo "error: Failed to build libsession-util (See details in '${TARGET_BUILD_DIR}/pre-action-output.log')." > "${TARGET_BUILD_DIR}/libsession_util_error.log"
-    exit 0
-  fi
-
-  # Save the updated source hash to disk to prevent rebuilds when there were no changes
-  echo "${NEW_SOURCE_HASH}" > "${TARGET_BUILD_DIR}/libsession_util_source_hash.log"
-  echo "${NEW_HEADER_HASH}" > "${TARGET_BUILD_DIR}/libsession_util_header_hash.log"
-  echo "${ARCHS[*]}" > "${TARGET_BUILD_DIR}/libsession_util_archs.log"
-  echo ""
-  echo "info: Build complete"
-else
-  echo "info: Build is up-to-date"
+# If all of the hashes match, the archs match and there is a library file then we can just stop here
+if [ "${NEW_SOURCE_HASH}" == "${OLD_SOURCE_HASH}" ] && [ "${NEW_HEADER_HASH}" == "${OLD_HEADER_HASH}" ] && [ "${ARCHS[*]}" == "${OLD_ARCHS}" ] && [ -f "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a" ]; then
+  echo_message "info: Build is up-to-date"
+  exit 0
 fi

-# Move the target-specific libSession-util build to the parent build directory (so XCode can have a reference to a single build)
-rm -rf "${BUILD_DIR}/libsession-util.xcframework"
-cp -r "${TARGET_BUILD_DIR}/libsession-util.xcframework" "${BUILD_DIR}/libsession-util.xcframework"
+# If any of the above differ then we need to rebuild
+echo_message "info: Build is not up-to-date - creating new build"
+
+# Import settings from XCode (defaulting values if not present)
+VALID_SIM_ARCHS=(arm64 x86_64)
+VALID_DEVICE_ARCHS=(arm64)
+VALID_SIM_ARCH_PLATFORMS=(SIMULATORARM64 SIMULATOR64)
+VALID_DEVICE_ARCH_PLATFORMS=(OS64)
+
+OUTPUT_DIR="${TARGET_BUILD_DIR}"
+IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}
+ENABLE_BITCODE=${ENABLE_BITCODE}
+
+# Generate the target architectures we want to build for
+TARGET_ARCHS=()
+TARGET_PLATFORMS=()
+TARGET_SIM_ARCHS=()
+TARGET_DEVICE_ARCHS=()
+
+if [ -z $PLATFORM_NAME ] || [ $PLATFORM_NAME = "iphonesimulator" ]; then
+    for i in "${!VALID_SIM_ARCHS[@]}"; do
+        ARCH="${VALID_SIM_ARCHS[$i]}"
+        ARCH_PLATFORM="${VALID_SIM_ARCH_PLATFORMS[$i]}"
+
+        if [[ " ${ARCHS[*]} " =~ " ${ARCH} " ]]; then
+            TARGET_ARCHS+=("sim-${ARCH}")
+            TARGET_PLATFORMS+=("${ARCH_PLATFORM}")
+            TARGET_SIM_ARCHS+=("sim-${ARCH}")
+        fi
+    done
+fi
+
+if [ -z $PLATFORM_NAME ] || [ $PLATFORM_NAME = "iphoneos" ]; then
+    for i in "${!VALID_DEVICE_ARCHS[@]}"; do
+        ARCH="${VALID_DEVICE_ARCHS[$i]}"
+        ARCH_PLATFORM="${VALID_DEVICE_ARCH_PLATFORMS[$i]}"
+
+        if [[ " ${ARCHS[*]} " =~ " ${ARCH} " ]]; then
+            TARGET_ARCHS+=("ios-${ARCH}")
+            TARGET_PLATFORMS+=("${ARCH_PLATFORM}")
+            TARGET_DEVICE_ARCHS+=("ios-${ARCH}")
+        fi
+    done
+fi
+
+# Build the individual architectures
+for i in "${!TARGET_ARCHS[@]}"; do
+    build="${TARGET_BUILD_DIR}/libSessionUtil/${TARGET_ARCHS[$i]}"
+    platform="${TARGET_PLATFORMS[$i]}"
+    echo_message "Building ${TARGET_ARCHS[$i]} for $platform in $build"
+
+    cd "${SRCROOT}/LibSession-Util"
+    ./utils/static-bundle.sh "$build" "" \
+        -DCMAKE_TOOLCHAIN_FILE="${SRCROOT}/LibSession-Util/external/ios-cmake/ios.toolchain.cmake" \
+        -DPLATFORM=$platform \
+        -DDEPLOYMENT_TARGET=$IPHONEOS_DEPLOYMENT_TARGET \
+        -DENABLE_BITCODE=$ENABLE_BITCODE
+    
+    if [ $? -ne 0 ]; then
+      LAST_OUTPUT=$(tail -n 4 "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_output.log" | head -n 1)
+      echo_message "error: $LAST_OUTPUT"
+      exit 1
+    fi
+done
+
+# Remove the old static library file
+rm -rf "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a"
+rm -rf "${TARGET_BUILD_DIR}/libSessionUtil/Headers"
+
+# If needed combine simulator builds into a multi-arch lib
+if [ "${#TARGET_SIM_ARCHS[@]}" -eq "1" ]; then
+    # Single device build
+    cp "${TARGET_BUILD_DIR}/libSessionUtil/${TARGET_SIM_ARCHS[0]}/libsession-util.a" "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a"
+elif [ "${#TARGET_SIM_ARCHS[@]}" -gt "1" ]; then
+    # Combine multiple device builds into a multi-arch lib
+    echo_message "info: Built multiple architectures, merging into single static library"
+    lipo -create "${TARGET_BUILD_DIR}/libSessionUtil"/sim-*/libsession-util.a -output "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a"
+fi
+
+# If needed combine device builds into a multi-arch lib
+if [ "${#TARGET_DEVICE_ARCHS[@]}" -eq "1" ]; then
+    cp "${TARGET_BUILD_DIR}/libSessionUtil/${TARGET_DEVICE_ARCHS[0]}/libsession-util.a" "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a"
+elif [ "${#TARGET_DEVICE_ARCHS[@]}" -gt "1" ]; then
+    # Combine multiple device builds into a multi-arch lib
+    echo_message "info: Built multiple architectures, merging into single static library"
+    lipo -create "${TARGET_BUILD_DIR}/libSessionUtil"/ios-*/libsession-util.a -output "${TARGET_BUILD_DIR}/libSessionUtil/libSessionUtil.a"
+fi
+
+# Save the updated hashes to disk to prevent rebuilds when there were no changes
+echo "${NEW_SOURCE_HASH}" > "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_source_hash.log"
+echo "${NEW_HEADER_HASH}" > "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_header_hash.log"
+echo "${ARCHS[*]}" > "${TARGET_BUILD_DIR}/libSessionUtil/libsession_util_archs.log"
+echo_message "info: Build complete"
+
+# Copy the headers across
+echo_message "info: Copy headers and prepare modulemap"
+mkdir -p "${TARGET_BUILD_DIR}/libSessionUtil/Headers"
+cp -r "${SRCROOT}/LibSession-Util/include/session" "${TARGET_BUILD_DIR}/libSessionUtil/Headers"
+
+# The 'module.modulemap' is needed for XCode to be able to find the headers
+modmap="${TARGET_BUILD_DIR}/libSessionUtil/Headers/module.modulemap"
+echo "module SessionUtil {" >"$modmap"
+echo "  module capi {" >>"$modmap"
+for x in $(cd include && find session -name '*.h'); do
+    echo "    header \"$x\"" >>"$modmap"
+done
+echo -e "    export *\n  }" >>"$modmap"
+if false; then
+    # If we include the cpp headers like this then Xcode will try to load them as C headers (which
+    # of course breaks) and doesn't provide any way to only load the ones you need (because this is
+    # Apple land, why would anything useful be available?).  So we include the headers in the
+    # archive but can't let xcode discover them because it will do it wrong.
+    echo -e "\n  module cppapi {" >>"$modmap"
+    for x in $(cd include && find session -name '*.hpp'); do
+        echo "    header \"$x\"" >>"$modmap"
+    done
+    echo -e "    export *\n  }" >>"$modmap"
+fi
+echo "}" >>"$modmap"
+
+# Output to XCode just so the output is good
+echo_message "info: libSessionUtil Ready"
--- a/Scripts/skip_web_rtc_re_rsync.patch
+++ b/Scripts/skip_web_rtc_re_rsync.patch
@ -1,12 +0,0 @@
-@@ -41,0 +41,11 @@
-+  # Skip the rsync step for the WebRTC-lib in simulator builds
-+  if [[ "$PLATFORM_NAME" == "iphonesimulator" ]] && [[ "$source" == *WebRTC.framework* ]]; then
-+    if [[ -f "${source}/../already_rsynced.nonce" ]]; then
-+      echo "Already rsynced WebRTC, skipping"
-+      return 0
-+    fi
-+  
-+    echo "About to rsync a simulator WebRTC, creating nonce to prevent future rsyncing"
-+    touch "${source}/../already_rsynced.nonce"
-+  fi
-+
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@ -744,6 +744,8 @@
 		FD97B2402A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD97B23F2A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift */; };
 		FD97B2422A3FEBF30027DD57 /* UnreadMarkerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD97B2412A3FEBF30027DD57 /* UnreadMarkerCell.swift */; };
 		FD9B30F3293EA0BF008DEE3E /* BatchResponseSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9B30F2293EA0BF008DEE3E /* BatchResponseSpec.swift */; };
+		FD9BDE002A5D22B7005F1EBC /* libSessionUtil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9BDDF82A5D2294005F1EBC /* libSessionUtil.a */; };
+		FD9BDE012A5D24EA005F1EBC /* SessionUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C331FF1B2558F9D300070591 /* SessionUIKit.framework */; };
 		FDA1E83629A5748F00C5C3BD /* ConfigUserGroupsSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA1E83529A5748F00C5C3BD /* ConfigUserGroupsSpec.swift */; };
 		FDA1E83929A5771A00C5C3BD /* LibSessionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA1E83829A5771A00C5C3BD /* LibSessionSpec.swift */; };
 		FDA1E83B29A5F2D500C5C3BD /* SessionUtil+Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA1E83A29A5F2D500C5C3BD /* SessionUtil+Shared.swift */; };
@ -902,7 +904,6 @@
 		FDF848F529413EEC007DCAE5 /* SessionCell+Styling.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF848F429413EEC007DCAE5 /* SessionCell+Styling.swift */; };
 		FDF848F729414477007DCAE5 /* CurrentUserPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF848F629414477007DCAE5 /* CurrentUserPoller.swift */; };
 		FDFC4D9A29F0C51500992FB6 /* String+Trimming.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C2A5D22553860900C340D1 /* String+Trimming.swift */; };
-		FDFC4E1929F1F9A600992FB6 /* libsession-util.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDFC4E1829F1F9A600992FB6 /* libsession-util.xcframework */; };
 		FDFD645927F26C6800808CA1 /* Array+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C2A5D12553860800C340D1 /* Array+Utilities.swift */; };
 		FDFD645D27F273F300808CA1 /* MockGeneralCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFD645C27F273F300808CA1 /* MockGeneralCache.swift */; };
 		FDFDE124282D04F20098B17F /* MediaDismissAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFDE123282D04F20098B17F /* MediaDismissAnimationController.swift */; };
@ -1054,20 +1055,6 @@
 			remoteGlobalIDString = C3C2A6EF25539DE700C340D1;
 			remoteInfo = SessionMessagingKit;
 		};
-		FDCDB8EB28179EAF00352A0C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D221A080169C9E5E00537ABF /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D221A088169C9E5E00537ABF;
-			remoteInfo = Session;
-		};
-		FDCDB8ED28179EB200352A0C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D221A080169C9E5E00537ABF /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D221A088169C9E5E00537ABF;
-			remoteInfo = Session;
-		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXCopyFilesBuildPhase section */
@ -1876,6 +1863,7 @@
 		FD97B23F2A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARC4RandomNumberGenerator.swift; sourceTree = "<group>"; };
 		FD97B2412A3FEBF30027DD57 /* UnreadMarkerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnreadMarkerCell.swift; sourceTree = "<group>"; };
 		FD9B30F2293EA0BF008DEE3E /* BatchResponseSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatchResponseSpec.swift; sourceTree = "<group>"; };
+		FD9BDDF82A5D2294005F1EBC /* libSessionUtil.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSessionUtil.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDA1E83529A5748F00C5C3BD /* ConfigUserGroupsSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigUserGroupsSpec.swift; sourceTree = "<group>"; };
 		FDA1E83829A5771A00C5C3BD /* LibSessionSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibSessionSpec.swift; sourceTree = "<group>"; };
 		FDA1E83A29A5F2D500C5C3BD /* SessionUtil+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionUtil+Shared.swift"; sourceTree = "<group>"; };
@ -2036,7 +2024,6 @@
 		FDF848F229413DB0007DCAE5 /* ImagePickerHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImagePickerHandler.swift; sourceTree = "<group>"; };
 		FDF848F429413EEC007DCAE5 /* SessionCell+Styling.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionCell+Styling.swift"; sourceTree = "<group>"; };
 		FDF848F629414477007DCAE5 /* CurrentUserPoller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrentUserPoller.swift; sourceTree = "<group>"; };
-		FDFC4E1829F1F9A600992FB6 /* libsession-util.xcframework */ = {isa = PBXFileReference; explicitFileType = wrapper.xcframework; includeInIndex = 0; path = "libsession-util.xcframework"; sourceTree = BUILD_DIR; };
 		FDFD645A27F26D4600808CA1 /* Data+Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Utilities.swift"; sourceTree = "<group>"; };
 		FDFD645C27F273F300808CA1 /* MockGeneralCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockGeneralCache.swift; sourceTree = "<group>"; };
 		FDFDE123282D04F20098B17F /* MediaDismissAnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaDismissAnimationController.swift; sourceTree = "<group>"; };
@ -2114,7 +2101,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FDFC4E1929F1F9A600992FB6 /* libsession-util.xcframework in Frameworks */,
+				FD9BDE002A5D22B7005F1EBC /* libSessionUtil.a in Frameworks */,
+				FD9BDE012A5D24EA005F1EBC /* SessionUIKit.framework in Frameworks */,
 				FDC4386C27B4E90300C60D73 /* SessionUtilitiesKit.framework in Frameworks */,
 				C3C2A70B25539E1E00C340D1 /* SessionSnodeKit.framework in Frameworks */,
 				BE25D9230CA2C3A40A9216EF /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionMessagingKit.framework in Frameworks */,
@ -3492,6 +3480,7 @@
 				FDC4388E27B9FFC700C60D73 /* SessionMessagingKitTests.xctest */,
 				FD83B9AF27CF200A005E1583 /* SessionUtilitiesKitTests.xctest */,
 				FD71160928D00BAE00B47552 /* SessionTests.xctest */,
+				FD9BDDF82A5D2294005F1EBC /* libSessionUtil.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@ -3499,7 +3488,6 @@
 		D221A08C169C9E5E00537ABF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				FDFC4E1829F1F9A600992FB6 /* libsession-util.xcframework */,
 				B8DE1FAF26C228780079C9CE /* SignalRingRTC.framework */,
 				C35E8AA22485C72300ACB629 /* SwiftCSV.framework */,
 				B847570023D568EB00759540 /* SignalServiceKit.framework */,
@ -4484,7 +4472,6 @@
 			buildConfigurationList = 453518761FC635DD00210559 /* Build configuration list for PBXNativeTarget "SessionShareExtension" */;
 			buildPhases = (
 				55CE11E14880742A24ADC127 /* [CP] Check Pods Manifest.lock */,
-				FD7692EC2A524320000E4B70 /* Validate pre-build actions */,
 				453518641FC635DD00210559 /* Sources */,
 				453518651FC635DD00210559 /* Frameworks */,
 				453518661FC635DD00210559 /* Resources */,
@ -4508,7 +4495,6 @@
 			buildConfigurationList = 7BC01A45241F40AB00BC7C55 /* Build configuration list for PBXNativeTarget "SessionNotificationServiceExtension" */;
 			buildPhases = (
 				18CDA58AE057F8C9AE71F46E /* [CP] Check Pods Manifest.lock */,
-				FD7692ED2A52433E000E4B70 /* Validate pre-build actions */,
 				7BC01A37241F40AB00BC7C55 /* Sources */,
 				7BC01A38241F40AB00BC7C55 /* Frameworks */,
 				7BC01A39241F40AB00BC7C55 /* Resources */,
@ -4531,7 +4517,6 @@
 			buildConfigurationList = C331FF262558F9D400070591 /* Build configuration list for PBXNativeTarget "SessionUIKit" */;
 			buildPhases = (
 				D5AFDC09857840D2D2631E2D /* [CP] Check Pods Manifest.lock */,
-				FD7692EF2A52436A000E4B70 /* Validate pre-build actions */,
 				C331FF162558F9D300070591 /* Headers */,
 				C331FF172558F9D300070591 /* Sources */,
 				C331FF182558F9D300070591 /* Frameworks */,
@ -4552,7 +4537,6 @@
 			buildConfigurationList = C33FD9B6255A548A00E217F9 /* Build configuration list for PBXNativeTarget "SignalUtilitiesKit" */;
 			buildPhases = (
 				5CE8055024B876590AED6DEA /* [CP] Check Pods Manifest.lock */,
-				FD7692EE2A524357000E4B70 /* Validate pre-build actions */,
 				C33FD9A6255A548A00E217F9 /* Headers */,
 				C33FD9A7255A548A00E217F9 /* Sources */,
 				C33FD9A8255A548A00E217F9 /* Frameworks */,
@ -4572,7 +4556,6 @@
 			buildConfigurationList = C3C2A5AA255385C100C340D1 /* Build configuration list for PBXNativeTarget "SessionSnodeKit" */;
 			buildPhases = (
 				77F55C879DAF28750120D343 /* [CP] Check Pods Manifest.lock */,
-				FD7692F02A524393000E4B70 /* Validate pre-build actions */,
 				C3C2A59A255385C100C340D1 /* Headers */,
 				C3C2A59B255385C100C340D1 /* Sources */,
 				C3C2A59C255385C100C340D1 /* Frameworks */,
@ -4592,7 +4575,6 @@
 			buildConfigurationList = C3C2A684255388CC00C340D1 /* Build configuration list for PBXNativeTarget "SessionUtilitiesKit" */;
 			buildPhases = (
 				446B0E16474DF9F15509BC64 /* [CP] Check Pods Manifest.lock */,
-				FD7692F12A5243AE000E4B70 /* Validate pre-build actions */,
 				C3C2A674255388CC00C340D1 /* Headers */,
 				C3C2A675255388CC00C340D1 /* Sources */,
 				C3C2A676255388CC00C340D1 /* Frameworks */,
@ -4612,7 +4594,6 @@
 			buildConfigurationList = C3C2A6F925539DE700C340D1 /* Build configuration list for PBXNativeTarget "SessionMessagingKit" */;
 			buildPhases = (
 				2014435DF351DF6C60122751 /* [CP] Check Pods Manifest.lock */,
-				FDFC4E1729F14F7A00992FB6 /* Validate pre-build actions */,
 				C3C2A6EB25539DE700C340D1 /* Headers */,
 				C3C2A6EC25539DE700C340D1 /* Sources */,
 				C3C2A6ED25539DE700C340D1 /* Frameworks */,
@ -4632,7 +4613,6 @@
 			buildConfigurationList = D221A0BC169C9E5F00537ABF /* Build configuration list for PBXNativeTarget "Session" */;
 			buildPhases = (
 				351E727E03A8F141EA25FBF4 /* [CP] Check Pods Manifest.lock */,
-				FD7692EA2A524303000E4B70 /* Validate pre-build actions */,
 				FDE7214D287E50820093DF33 /* Lint Localizable.strings */,
 				D221A085169C9E5E00537ABF /* Sources */,
 				D221A086169C9E5E00537ABF /* Frameworks */,
@ -4663,7 +4643,6 @@
 			buildConfigurationList = FD71160F28D00BAE00B47552 /* Build configuration list for PBXNativeTarget "SessionTests" */;
 			buildPhases = (
 				19CD7B4EDC153293FB61CBA1 /* [CP] Check Pods Manifest.lock */,
-				FD7692F22A5243C3000E4B70 /* Validate pre-build actions */,
 				FD71160528D00BAE00B47552 /* Sources */,
 				FD71160628D00BAE00B47552 /* Frameworks */,
 				FD71160728D00BAE00B47552 /* Resources */,
@ -4684,7 +4663,6 @@
 			buildConfigurationList = FD83B9B627CF200A005E1583 /* Build configuration list for PBXNativeTarget "SessionUtilitiesKitTests" */;
 			buildPhases = (
 				EDDFB3BFBD5E1378BD03AAAB /* [CP] Check Pods Manifest.lock */,
-				FD7692F42A5243EC000E4B70 /* Validate pre-build actions */,
 				FD83B9AB27CF200A005E1583 /* Sources */,
 				FD83B9AC27CF200A005E1583 /* Frameworks */,
 				FD83B9AD27CF200A005E1583 /* Resources */,
@ -4694,19 +4672,32 @@
 			);
 			dependencies = (
 				FD83B9B527CF200A005E1583 /* PBXTargetDependency */,
-				FDCDB8EE28179EB200352A0C /* PBXTargetDependency */,
 			);
 			name = SessionUtilitiesKitTests;
 			productName = SessionUtilitiesKitTests;
 			productReference = FD83B9AF27CF200A005E1583 /* SessionUtilitiesKitTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		FD9BDDF72A5D2294005F1EBC /* SessionUtil */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FD9BDDFC2A5D2294005F1EBC /* Build configuration list for PBXNativeTarget "SessionUtil" */;
+			buildPhases = (
+				FD9BDDFF2A5D229B005F1EBC /* Build libSessionUtil if Needed */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SessionUtil;
+			productName = libSession4;
+			productReference = FD9BDDF82A5D2294005F1EBC /* libSessionUtil.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 		FDC4388D27B9FFC700C60D73 /* SessionMessagingKitTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = FDC4389527B9FFC700C60D73 /* Build configuration list for PBXNativeTarget "SessionMessagingKitTests" */;
 			buildPhases = (
 				0E6C1748F41E48ED59563D96 /* [CP] Check Pods Manifest.lock */,
-				FD7692F32A5243DA000E4B70 /* Validate pre-build actions */,
 				FDC4388A27B9FFC700C60D73 /* Sources */,
 				FDC4388B27B9FFC700C60D73 /* Frameworks */,
 				FDC4388C27B9FFC700C60D73 /* Resources */,
@ -4716,7 +4707,6 @@
 			);
 			dependencies = (
 				FDC4389427B9FFC700C60D73 /* PBXTargetDependency */,
-				FDCDB8EC28179EAF00352A0C /* PBXTargetDependency */,
 			);
 			name = SessionMessagingKitTests;
 			productName = SessionMessagingKitTests;
@ -4827,6 +4817,9 @@
 					FD83B9AE27CF200A005E1583 = {
 						CreatedOnToolsVersion = 13.2.1;
 					};
+					FD9BDDF72A5D2294005F1EBC = {
+						CreatedOnToolsVersion = 14.3;
+					};
 					FDC4388D27B9FFC700C60D73 = {
 						CreatedOnToolsVersion = 13.2.1;
 					};
@ -4877,6 +4870,7 @@
 				FD71160828D00BAE00B47552 /* SessionTests */,
 				FDC4388D27B9FFC700C60D73 /* SessionMessagingKitTests */,
 				FD83B9AE27CF200A005E1583 /* SessionUtilitiesKitTests */,
+				FD9BDDF72A5D2294005F1EBC /* SessionUtil */,
 			);
 		};
 /* End PBXProject section */
@ -5334,7 +5328,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FD7692EA2A524303000E4B70 /* Validate pre-build actions */ = {
+		FD9BDDFF2A5D229B005F1EBC /* Build libSessionUtil if Needed */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@ -5344,198 +5338,19 @@
 			);
 			inputPaths = (
 			);
-			name = "Validate pre-build actions";
+			name = "Build libSessionUtil if Needed";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692EC2A524320000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692ED2A52433E000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692EE2A524357000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692EF2A52436A000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692F02A524393000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692F12A5243AE000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692F22A5243C3000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692F32A5243DA000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		FD7692F42A5243EC000E4B70 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
+			shellScript = "\"${SRCROOT}/Scripts/build_libSession_util.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FDD82C422A2085B900425F05 /* Add Commit Hash To Build Info Plist */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@ -5575,26 +5390,6 @@
 			shellScript = "\"${SRCROOT}/Scripts/LintLocalizableStrings.swift\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FDFC4E1729F14F7A00992FB6 /* Validate pre-build actions */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Validate pre-build actions";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ -f \"${TARGET_BUILD_DIR}/libsession_util_error.log\" ]; then\n    read -r line < \"${TARGET_BUILD_DIR}/libsession_util_error.log\"\n    echo \"${line}\"\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@ -6524,16 +6319,6 @@
 			target = C3C2A6EF25539DE700C340D1 /* SessionMessagingKit */;
 			targetProxy = FDC4389327B9FFC700C60D73 /* PBXContainerItemProxy */;
 		};
-		FDCDB8EC28179EAF00352A0C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D221A088169C9E5E00537ABF /* Session */;
-			targetProxy = FDCDB8EB28179EAF00352A0C /* PBXContainerItemProxy */;
-		};
-		FDCDB8EE28179EB200352A0C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D221A088169C9E5E00537ABF /* Session */;
-			targetProxy = FDCDB8ED28179EB200352A0C /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
@ -7450,6 +7235,24 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Curve25519Kit/Curve25519Kit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/DifferenceKit/DifferenceKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/GRDB.swift/GRDB.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/PureLayout/PureLayout.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SAMKeychain/SAMKeychain.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SignalCoreKit/SignalCoreKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Sodium/Sodium.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf/SwiftProtobuf.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase/YapDatabase.framework/Headers\"",
+					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/Sodium/Headers\"",
+					"$(PODS_ROOT)/SQLCipher",
+					"${SRCROOT}/LibSession-Util/include/**",
+				);
 				INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -7458,6 +7261,13 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
+					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/Sodium\"",
+					/usr/lib/swift,
+					"\"$(TARGET_BUILD_DIR)/libSessionUtil\"",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionMessagingKit";
@ -7465,6 +7275,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_XCFRAMEWORKS_BUILD_DIR}/Clibsodium\" \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@ -7528,6 +7339,24 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Curve25519Kit/Curve25519Kit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/DifferenceKit/DifferenceKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/GRDB.swift/GRDB.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/PureLayout/PureLayout.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SAMKeychain/SAMKeychain.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SignalCoreKit/SignalCoreKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Sodium/Sodium.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf/SwiftProtobuf.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase/YapDatabase.framework/Headers\"",
+					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/Sodium/Headers\"",
+					"$(PODS_ROOT)/SQLCipher",
+					"${SRCROOT}/LibSession-Util/include/**",
+				);
 				INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -7536,6 +7365,13 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
+					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/Sodium\"",
+					/usr/lib/swift,
+					"\"$(TARGET_BUILD_DIR)/libSessionUtil\"",
+				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionMessagingKit";
@ -7544,6 +7380,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_XCFRAMEWORKS_BUILD_DIR}/Clibsodium\" \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@ -8058,6 +7895,105 @@
 			};
 			name = "App Store Release";
 		};
+		FD9BDDFD2A5D2294005F1EBC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		FD9BDDFE2A5D2294005F1EBC /* App Store Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = "App Store Release";
+		};
 		FDC4389627B9FFC700C60D73 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8727C47348B6EFA767EE583A /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionMessagingKit-SessionMessagingKitTests.debug.xcconfig */;
@ -8267,6 +8203,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = "App Store Release";
 		};
+		FD9BDDFC2A5D2294005F1EBC /* Build configuration list for PBXNativeTarget "SessionUtil" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FD9BDDFD2A5D2294005F1EBC /* Debug */,
+				FD9BDDFE2A5D2294005F1EBC /* App Store Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "App Store Release";
+		};
 		FDC4389527B9FFC700C60D73 /* Build configuration list for PBXNativeTarget "SessionMessagingKitTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
--- a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
@ -5,24 +5,6 @@
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "D221A088169C9E5E00537ABF"
-                     BuildableName = "Session.app"
-                     BlueprintName = "Session"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/Session.xcodeproj/xcshareddata/xcschemes/SessionMessagingKit.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SessionMessagingKit.xcscheme
@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "1400"
-   version = "1.7">
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "C3C2A6EF25539DE700C340D1"
-                     BuildableName = "SessionMessagingKit.framework"
-                     BlueprintName = "SessionMessagingKit"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/Session.xcodeproj/xcshareddata/xcschemes/SessionNotificationServiceExtension.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SessionNotificationServiceExtension.xcscheme
@ -6,24 +6,6 @@
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "7BC01A3A241F40AB00BC7C55"
-                     BuildableName = "SessionNotificationServiceExtension.appex"
-                     BlueprintName = "SessionNotificationServiceExtension"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/Session.xcodeproj/xcshareddata/xcschemes/SessionShareExtension.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SessionShareExtension.xcscheme
@ -6,24 +6,6 @@
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "453518671FC635DD00210559"
-                     BuildableName = "SessionShareExtension.appex"
-                     BlueprintName = "SessionShareExtension"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/Session.xcodeproj/xcshareddata/xcschemes/SessionUtilitiesKit.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SessionUtilitiesKit.xcscheme
@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "1400"
-   version = "1.7">
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "C3C2A678255388CC00C340D1"
-                     BuildableName = "SessionUtilitiesKit.framework"
-                     BlueprintName = "SessionUtilitiesKit"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/Session.xcodeproj/xcshareddata/xcschemes/SignalUtilitiesKit.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SignalUtilitiesKit.xcscheme
@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
   LastUpgradeVersion = "1400"
-   version = "1.7">
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
-      <PreActions>
-         <ExecutionAction
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-            <ActionContent
-               title = "Build libSession"
-               scriptText = "&quot;${SRCROOT}/Scripts/build_libSession_util.sh&quot;&#10;">
-               <EnvironmentBuildable>
-                  <BuildableReference
-                     BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "C33FD9AA255A548A00E217F9"
-                     BuildableName = "SignalUtilitiesKit.framework"
-                     BlueprintName = "SignalUtilitiesKit"
-                     ReferencedContainer = "container:Session.xcodeproj">
-                  </BuildableReference>
-               </EnvironmentBuildable>
-            </ActionContent>
-         </ExecutionAction>
-      </PreActions>
      <BuildActionEntries>
         <BuildActionEntry
            buildForTesting = "YES"
--- a/SessionMessagingKit/Jobs/Types/ConfigurationSyncJob.swift
+++ b/SessionMessagingKit/Jobs/Types/ConfigurationSyncJob.swift
@ -3,7 +3,6 @@
 import Foundation
 import Combine
 import GRDB
-import SessionUtil
 import SessionSnodeKit
 import SessionUtilitiesKit

--- a/Groups/OpenGroupManagerSpec.swift
+++ b/Groups/OpenGroupManagerSpec.swift
@ -3581,7 +3581,7 @@ class OpenGroupManagerSpec: QuickSpec {
                                    forKey: SNUserDefaults.Date.lastOpenGroupImageUpdate.rawValue
                                )
                            },
-                            timeout: .milliseconds(50)
+                            timeout: .milliseconds(100)
                        )
                    expect(
                        mockStorage.read { db -> Data? in