From e23d28c5700cb8e50b7246ecc6687aec955d1625 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Wed, 7 Feb 2024 14:48:49 +1100
Subject: [PATCH] Removed the xcbeautify dependency (installed on CI directly)

---
 .drone.jsonnet | 6 +++---
 Podfile        | 3 ---
 Podfile.lock   | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 50722f682..e7bb8a51b 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -90,7 +90,7 @@ local update_cocoapods_cache(depends_on) = {
 local run_tests(testName, testBuildStepName) = {
   name: 'Run ' + testName,
   commands: [
-    'NSUnbufferedIO=YES set -o pipefail && xcodebuild test-without-building -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -destination "platform=iOS Simulator,name=iPhone 14" -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -only-testing ' + testName,
+    'NSUnbufferedIO=YES set -o pipefail && xcodebuild test-without-building -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -destination "platform=iOS Simulator,name=iPhone 14" -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -only-testing ' + testName + ' -collect-test-diagnostics never 2>&1 | xcbeautify --is-ci',
   ],
   depends_on: [
     testBuildStepName
@@ -125,7 +125,7 @@ local run_tests(testName, testBuildStepName) = {
         name: 'Build For Testing',
         commands: [
           'mkdir build',
-          'xcodebuild build-for-testing -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -destination "platform=iOS Simulator,name=iPhone 14" | ./Pods/xcbeautify/xcbeautify --is-ci',
+          'xcodebuild build-for-testing -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -destination "platform=iOS Simulator,name=iPhone 14" | xcbeautify --is-ci',
         ],
         depends_on: [
           'Install CocoaPods'
@@ -182,7 +182,7 @@ local run_tests(testName, testBuildStepName) = {
         name: 'Build',
         commands: [
           'mkdir build',
-          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | ./Pods/xcbeautify/xcbeautify --is-ci'
+          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | xcbeautify --is-ci'
         ],
         depends_on: [
           'Install CocoaPods'
diff --git a/Podfile b/Podfile
index 201db8853..69fbc174f 100644
--- a/Podfile
+++ b/Podfile
@@ -5,9 +5,6 @@ inhibit_all_warnings!
 
 install! 'cocoapods', :warn_for_unused_master_specs_repo => false
 
-# CI Dependencies
-pod 'xcbeautify'
-
 # Dependencies to be included in the app and all extensions/frameworks
 abstract_target 'GlobalDependencies' do
   # FIXME: If https://github.com/jedisct1/swift-sodium/pull/249 gets resolved then revert this back to the standard pod
diff --git a/Podfile.lock b/Podfile.lock
index f04dbd43b..2cd1ec047 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -45,7 +45,6 @@ PODS:
     - SQLCipher/common
   - SwiftProtobuf (1.5.0)
   - WebRTC-lib (114.0.0)
-  - xcbeautify (0.17.0)
   - YapDatabase/SQLCipher (3.1.1):
     - YapDatabase/SQLCipher/Core (= 3.1.1)
     - YapDatabase/SQLCipher/Extensions (= 3.1.1)
@@ -128,7 +127,6 @@ DEPENDENCIES:
   - SQLCipher (~> 4.5.3)
   - SwiftProtobuf (~> 1.5.0)
   - WebRTC-lib
-  - xcbeautify
   - YapDatabase/SQLCipher (from `https://github.com/oxen-io/session-ios-yap-database.git`, branch `signal-release`)
   - YYImage/libwebp (from `https://github.com/signalapp/YYImage`)
 
@@ -149,7 +147,6 @@ SPEC REPOS:
     - libwebp
     - Nimble
     - Quick
-    - xcbeautify
 
 EXTERNAL SOURCES:
   Curve25519Kit:
@@ -202,10 +199,9 @@ SPEC CHECKSUMS:
   SQLCipher: 57fa9f863fa4a3ed9dd3c90ace52315db8c0fdca
   SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
   WebRTC-lib: d83df8976fa608b980f1d85796b3de66d60a1953
-  xcbeautify: 6e2f57af5c3a86d490376d5758030a8dcc201c1b
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
 
-PODFILE CHECKSUM: dd814a5a92577bb2a94dac6a1cc482f193721cdf
+PODFILE CHECKSUM: f56c28baefe3077effcb3a2ea5941b52c4cc6e86
 
 COCOAPODS: 1.14.3