From 0879102e84709655282618dca62fcbb72e9c627b Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:42:18 +0100
Subject: [PATCH] Update project (#1494)

- Sort dependencies a bit more.
- Remove .git extension in DesignKit.
- Regenerate project using XcodeGen 2.36.1
---
 DesignKit/Package.swift                       |  6 +--
 ElementX.xcodeproj/project.pbxproj            |  7 ++--
 .../xcshareddata/xcschemes/ElementX.xcscheme  |  2 +-
 .../xcschemes/IntegrationTests.xcscheme       |  2 +-
 .../xcshareddata/xcschemes/NCE.xcscheme       |  2 +-
 .../xcshareddata/xcschemes/NSE.xcscheme       |  2 +-
 .../xcshareddata/xcschemes/UITests.xcscheme   |  2 +-
 .../xcshareddata/xcschemes/UnitTests.xcscheme |  2 +-
 project.yml                                   | 40 ++++++++++---------
 9 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/DesignKit/Package.swift b/DesignKit/Package.swift
index 3b67ac712..55e5d9c7c 100644
--- a/DesignKit/Package.swift
+++ b/DesignKit/Package.swift
@@ -12,9 +12,9 @@ let package = Package(
         .library(name: "DesignKit", targets: ["DesignKit"])
     ],
     dependencies: [
-        .package(url: "https://github.com/vector-im/compound-ios.git", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"),
-        .package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"),
-        .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.9.0")
+        .package(url: "https://github.com/vector-im/compound-ios", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"),
+        .package(url: "https://github.com/vector-im/element-design-tokens", exact: "0.0.3"),
+        .package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "0.9.0")
     ],
     targets: [
         .target(name: "DesignKit",
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 45f0f9d84..2ad61ba23 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -3902,7 +3902,8 @@
 		AC22997D58D612146053154D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = Element;
 				TargetAttributes = {
 					0E28CD62691FDBC63147D5E3 = {
@@ -3928,7 +3929,7 @@
 				};
 			};
 			buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */;
-			compatibilityVersion = "Xcode 11.0";
+			compatibilityVersion = "Xcode 14.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
index af399e45d..92ec03216 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme
index 86490b16c..b590cf949 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/NCE.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/NCE.xcscheme
index c6459d991..0821fd624 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/NCE.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/NCE.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
    version = "1.7">
    <BuildAction
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/NSE.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/NSE.xcscheme
index df0566dd6..299d2aa8a 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/NSE.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/NSE.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
    version = "1.7">
    <BuildAction
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
index 7920df905..585b3c493 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
index 877c32219..475ef5b46 100644
--- a/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/project.yml b/project.yml
index 6948759cb..bd224c94f 100644
--- a/project.yml
+++ b/project.yml
@@ -42,25 +42,28 @@ include:
   - path: NCE/SupportingFiles/target.yml
 
 packages:
+  # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
     exactVersion: 1.0.106-alpha
     # path: ../matrix-rust-sdk
   DesignKit:
     path: DesignKit
-  Mapbox:
-    url: https://github.com/maplibre/maplibre-gl-native-distribution
-    minorVersion: 5.13.0
   Compound:
     url: https://github.com/vector-im/compound-ios
     revision: 89e3ed5adef33be7eb65137b861833ffae64f961
     # path: ../compound-ios
-  Algorithms:
-    url: https://github.com/apple/swift-algorithms
-    minorVersion: 1.0.0
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events
     minorVersion: 0.6.0
+  Emojibase:
+    url: https://github.com/matrix-org/emojibase-bindings
+    minorVersion: 1.0.0
+  
+  # External dependencies
+  Algorithms:
+    url: https://github.com/apple/swift-algorithms
+    minorVersion: 1.0.0
   Collections:
     url: https://github.com/apple/swift-collections
     minorVersion: 1.0.0
@@ -70,6 +73,9 @@ packages:
   DTCoreText:
     url: https://github.com/Cocoanetics/DTCoreText
     exactVersion: 1.6.26
+  GZIP:
+    url: https://github.com/nicklockwood/GZIP
+    minorVersion: 1.3.0
   KeychainAccess:
     url: https://github.com/kishikawakatsumi/KeychainAccess
     minorVersion: 4.2.0
@@ -82,31 +88,27 @@ packages:
   LRUCache:
     url: https://github.com/nicklockwood/LRUCache
     minorVersion: 1.0.4
-  SwiftUIIntrospect:
-    url: https://github.com/siteline/SwiftUI-Introspect
-    minorVersion: 0.9.0
+  Mapbox:
+    url: https://github.com/maplibre/maplibre-gl-native-distribution
+    minorVersion: 5.13.0
   PostHog:
     url: https://github.com/PostHog/posthog-ios
     minorVersion: 2.0.3
-  SwiftState:
-    url: https://github.com/ReactKit/SwiftState
-    minorVersion: 6.0.0
-  GZIP:
-    url: https://github.com/nicklockwood/GZIP
-    minorVersion: 1.3.0
   Sentry:
     url: https://github.com/getsentry/sentry-cocoa
     minorVersion: 8.6.0
   SnapshotTesting:
     url: https://github.com/pointfreeco/swift-snapshot-testing
     minorVersion: 1.11.0
+  SwiftState:
+    url: https://github.com/ReactKit/SwiftState
+    minorVersion: 6.0.0
+  SwiftUIIntrospect:
+    url: https://github.com/siteline/SwiftUI-Introspect
+    minorVersion: 0.9.0
   URLRouting:
     url: https://github.com/pointfreeco/swift-url-routing
     minorVersion: 0.5.0
   Version:
     url: https://github.com/mxcl/Version
     minorVersion: 2.0.0
-  Emojibase:
-    url: https://github.com/matrix-org/emojibase-bindings
-    minorVersion: 1.0.0
-