From 49d2b4d50aac556a53006b1f1843e10c544732c3 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 15:13:31 -0500 Subject: [PATCH 1/9] fix: Compilation errors in ParseLiveQuery related to `StarStream` --- .../Internal/ClientPrivate.swift | 11 +- .../project.pbxproj | 391 ++---------------- .../contents.xcworkspacedata | 2 +- .../ParseStarter/AppDelegate.swift | 3 +- .../ParseStarter/ViewController.swift | 1 - 5 files changed, 49 insertions(+), 359 deletions(-) diff --git a/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift b/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift index 83fab187a..a7195889b 100644 --- a/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift @@ -114,7 +114,7 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { // --------------- extension Client: WebSocketDelegate { - public func didReceive(event: WebSocketEvent, client: WebSocket) { + public func didReceive(event: WebSocketEvent, client: Starscream.WebSocketClient) { switch event { case .connected(_): @@ -140,7 +140,7 @@ extension Client: WebSocketDelegate { case .error(let error): NSLog("ParseLiveQuery: Error processing message: \(String(describing: error))") case .viabilityChanged(let isViable): - if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket viability channged to \(isViable ? "" : "not-")viable") } + if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket viability changed to \(isViable ? "" : "not-")viable") } if !isViable { isConnecting = false } @@ -161,6 +161,13 @@ extension Client: WebSocketDelegate { if !userDisconnected { reconnect() } + case .peerClosed: + isConnecting = false + if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket connection closed...") } + // TODO: Better retry logic, unless `disconnect()` was explicitly called + if !userDisconnected { + reconnect() + } case .pong(_): if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: Received pong but we don't handle it...") } case .ping(_): diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index 1ab3286fc..8373a27ea 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,172 +3,21 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ + 39CE82D42ACF48BF00142920 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE82D32ACF48BF00142920 /* ParseObjC */; }; + 39CE82D82ACF48C700142920 /* ParseLiveQuery in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE82D72ACF48C700142920 /* ParseLiveQuery */; }; 7C605F96292BC29500E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F95292BC29500E4B6D2 /* SystemConfiguration.framework */; }; 7C605F98292BC29800E4B6D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F97292BC29800E4B6D2 /* libsqlite3.tbd */; }; - 7C605F9F292BC38600E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F66292BC26300E4B6D2 /* Parse.framework */; }; - 7C605FA2292BC39600E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F84292BC26600E4B6D2 /* Bolts.framework */; }; 81C066EF1BFAC1D4001E0658 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C066EE1BFAC1D4001E0658 /* AppDelegate.swift */; }; 81C066F11BFAC1D4001E0658 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C066F01BFAC1D4001E0658 /* ViewController.swift */; }; 81C066FE1BFAC330001E0658 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81C066F21BFAC1D4001E0658 /* Main.storyboard */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C605F5B292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605F5D292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605F5F292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605F61292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605F63292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605F65292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605F67292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605F69292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605F6B292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605F6D292BC26300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605F7D292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605F7F292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605F81292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605F83292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605F85292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605F87292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605F89292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605F8B292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605F8D292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605F8F292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605F91292BC26600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; + 39CE82D22ACF48AE00142920 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 7C605F95292BC29500E4B6D2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS16.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 7C605F97292BC29800E4B6D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS16.1.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; 81C066EC1BFAC1D4001E0658 /* ParseStarter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseStarter.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -183,9 +32,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C605FA2292BC39600E4B6D2 /* Bolts.framework in Frameworks */, + 39CE82D42ACF48BF00142920 /* ParseObjC in Frameworks */, + 39CE82D82ACF48C700142920 /* ParseLiveQuery in Frameworks */, 7C605F98292BC29800E4B6D2 /* libsqlite3.tbd in Frameworks */, - 7C605F9F292BC38600E4B6D2 /* Parse.framework in Frameworks */, 7C605F96292BC29500E4B6D2 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -193,44 +42,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605F4D292BC26300E4B6D2 /* Products */ = { + 39CE82D12ACF48AE00142920 /* Packages */ = { isa = PBXGroup; children = ( - 7C605F5C292BC26300E4B6D2 /* Parse.framework */, - 7C605F5E292BC26300E4B6D2 /* Parse.framework */, - 7C605F60292BC26300E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605F62292BC26300E4B6D2 /* Parse.framework */, - 7C605F64292BC26300E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605F66292BC26300E4B6D2 /* Parse.framework */, - 7C605F68292BC26300E4B6D2 /* Parse.framework */, - 7C605F6A292BC26300E4B6D2 /* Parse.framework */, - 7C605F6C292BC26300E4B6D2 /* Parse.framework */, - 7C605F6E292BC26300E4B6D2 /* ParseUnitTests-iOS-host.app */, + 39CE82D22ACF48AE00142920 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605F70292BC26600E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605F7E292BC26600E4B6D2 /* Bolts.framework */, - 7C605F80292BC26600E4B6D2 /* Bolts.framework */, - 7C605F82292BC26600E4B6D2 /* Bolts.framework */, - 7C605F84292BC26600E4B6D2 /* Bolts.framework */, - 7C605F86292BC26600E4B6D2 /* Bolts.framework */, - 7C605F88292BC26600E4B6D2 /* Bolts.framework */, - 7C605F8A292BC26600E4B6D2 /* Bolts.framework */, - 7C605F8C292BC26600E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605F8E292BC26600E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605F90292BC26600E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605F92292BC26600E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( + 39CE82D12ACF48AE00142920 /* Packages */, 81C066ED1BFAC1D4001E0658 /* ParseStarter */, 81BA816A1A49DB5600E65899 /* Frameworks */, 81BA81461A49DA1800E65899 /* Products */, @@ -250,8 +73,6 @@ children = ( 7C605F97292BC29800E4B6D2 /* libsqlite3.tbd */, 7C605F95292BC29500E4B6D2 /* SystemConfiguration.framework */, - 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */, - 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -283,6 +104,10 @@ dependencies = ( ); name = ParseStarter; + packageProductDependencies = ( + 39CE82D32ACF48BF00142920 /* ParseObjC */, + 39CE82D72ACF48C700142920 /* ParseLiveQuery */, + ); productName = ParseStarter; productReference = 81C066EC1BFAC1D4001E0658 /* ParseStarter.app */; productType = "com.apple.product-type.application"; @@ -314,16 +139,6 @@ mainGroup = 81BA813C1A49DA1800E65899; productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605F70292BC26600E4B6D2 /* Products */; - ProjectRef = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605F4D292BC26300E4B6D2 /* Products */; - ProjectRef = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81C066EB1BFAC1D4001E0658 /* ParseStarter */, @@ -331,156 +146,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605F5C292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F5B292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F5E292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F5D292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F60292BC26300E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605F5F292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F62292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F61292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F64292BC26300E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605F63292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F66292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F65292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F68292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F67292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F6A292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F69292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F6C292BC26300E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F6B292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F6E292BC26300E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605F6D292BC26300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F7E292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F7D292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F80292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F7F292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F82292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F81292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F84292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F83292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F86292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F85292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F88292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F87292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F8A292BC26600E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F89292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F8C292BC26600E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605F8B292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F8E292BC26600E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605F8D292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F90292BC26600E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605F8F292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F92292BC26600E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605F91292BC26600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 81C066EA1BFAC1D4001E0658 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -611,7 +276,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -627,13 +293,16 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = ParseStarter/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -648,13 +317,16 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = ParseStarter/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -680,6 +352,17 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39CE82D32ACF48BF00142920 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39CE82D72ACF48C700142920 /* ParseLiveQuery */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseLiveQuery; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 81BA813D1A49DA1800E65899 /* Project object */; } diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata index b162c5ad7..919434a62 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift index 2d69bf4e2..b9b333349 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift @@ -9,7 +9,8 @@ import UIKit -import Parse +import ParseCore +import ParseLiveQuery @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift index 69d3e7c40..7d32a9013 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift @@ -8,7 +8,6 @@ */ import UIKit -import Parse class ViewController: UIViewController { From 8c2d3757dcff04b11f34eb464d49d37e29d2455a Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 16:08:46 -0500 Subject: [PATCH 2/9] Starscream 4.0.6 --- Cartfile | 2 - Cartfile.resolved | 1 - Package.resolved | 4 +- .../Internal/ClientPrivate.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 43 +++++++++++++++++++ 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Cartfile b/Cartfile index 19539dfd3..0902cf9d7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,5 +1,3 @@ github "BoltsFramework/Bolts-ObjC" ~> 1.9.1 github "BoltsFramework/Bolts-Swift" >= 1.5.0 github "facebook/facebook-ios-sdk" == 15.1.0 -github "daltoniam/Starscream" >= 4.0.4 - diff --git a/Cartfile.resolved b/Cartfile.resolved index b0b344042..3f8b4caa0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,3 @@ github "BoltsFramework/Bolts-ObjC" "1.9.1" github "BoltsFramework/Bolts-Swift" "1.5.0" -github "daltoniam/Starscream" "4.0.4" github "facebook/facebook-ios-sdk" "v15.1.0" diff --git a/Package.resolved b/Package.resolved index 8a581d81d..c9738b414 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/daltoniam/Starscream.git", "state": { "branch": null, - "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21", - "version": "4.0.4" + "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version": "4.0.6" } } ] diff --git a/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift b/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift index a7195889b..45eb2c54c 100644 --- a/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift @@ -114,7 +114,7 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { // --------------- extension Client: WebSocketDelegate { - public func didReceive(event: WebSocketEvent, client: Starscream.WebSocketClient) { + public func didReceive(event: WebSocketEvent, client: WebSocketClient) { switch event { case .connected(_): diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,43 @@ +{ + "object": { + "pins": [ + { + "package": "Bolts", + "repositoryURL": "https://github.com/parse-community/Bolts-ObjC.git", + "state": { + "branch": null, + "revision": "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", + "version": "1.10.0" + } + }, + { + "package": "BoltsSwift", + "repositoryURL": "https://github.com/BoltsFramework/Bolts-Swift.git", + "state": { + "branch": null, + "revision": "d8c07eee2045a13f34330c0a4664053b5176e3f0", + "version": "1.5.0" + } + }, + { + "package": "Facebook", + "repositoryURL": "https://github.com/facebook/facebook-ios-sdk.git", + "state": { + "branch": null, + "revision": "7fd8a930a5b2c940a22efafe0e214ed0df671312", + "version": "15.1.0" + } + }, + { + "package": "Starscream", + "repositoryURL": "https://github.com/daltoniam/Starscream.git", + "state": { + "branch": null, + "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version": "4.0.6" + } + } + ] + }, + "version": 1 +} From cf96b539a60a42b66b3c46fecd0a2947e56f843b Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 17:06:41 -0500 Subject: [PATCH 3/9] remove all carthage starscream references --- .github/workflows/ci.yml | 2 +- Parse/Parse.xcodeproj/project.pbxproj | 45 +--------------- .../project.pbxproj | 2 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 51 ------------------- 4 files changed, 3 insertions(+), 97 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfd69d28a..e383ff111 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - test:parseui:all - test:parse_live_query:all - build:starters - fail-fast: false + fail-fast: true runs-on: macos-12 steps: - uses: actions/checkout@v3 diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 0b665bcca..06d31e48f 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -2962,20 +2962,6 @@ remoteGlobalIDString = 81C3821B19CCA89E0066284A; remoteInfo = "Parse-iOS"; }; - 9575FF1E299136C60057B4CE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 33CCF0921F5DDC030099B092; - remoteInfo = Starscream; - }; - 9575FF20299136C60057B4CE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC; - remoteInfo = "Starscream Tests"; - }; 95AEEB192991373F00165C0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; @@ -3638,7 +3624,6 @@ 91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = ""; }; 91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = ""; }; 91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = ""; }; - 9575FF10299136C60057B4CE /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; 97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 97AA93B816780B7600445C2D /* Parse-OSX.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Parse-OSX.Info.plist"; sourceTree = ""; }; @@ -3937,7 +3922,6 @@ 7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */, 7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */, BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */, - 9575FF10299136C60057B4CE /* Starscream.xcodeproj */, 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, ); @@ -5215,15 +5199,6 @@ path = CurrentUserController; sourceTree = ""; }; - 9575FF11299136C60057B4CE /* Products */ = { - isa = PBXGroup; - children = ( - 9575FF1F299136C60057B4CE /* Starscream.framework */, - 9575FF21299136C60057B4CE /* Starscream Tests.xctest */, - ); - name = Products; - sourceTree = ""; - }; 95AEEB102991373F00165C0D /* Products */ = { isa = PBXGroup; children = ( @@ -7174,10 +7149,6 @@ ProductGroup = BC105FBB24C5D0C900295EF7 /* Products */; ProjectRef = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; }, - { - ProductGroup = 9575FF11299136C60057B4CE /* Products */; - ProjectRef = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -7273,20 +7244,6 @@ remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 9575FF1F299136C60057B4CE /* Starscream.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 9575FF1E299136C60057B4CE /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 9575FF21299136C60057B4CE /* Starscream Tests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream Tests.xctest"; - remoteRef = 9575FF20299136C60057B4CE /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 95AEEB1A2991373F00165C0D /* BoltsSwift.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj index 2817a801f..35f7e5e68 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index e4c06f74a..e14ec5f49 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 708836762561F503005B32F0 /* ParseLiveQuery_watchOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 708836982561F55B005B32F0 /* ParseLiveQuery_tvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9595D6E429AFAB0700D9B731 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E916A52995270900EFDB34 /* Starscream.framework */; }; - 9595D6E529AFAB0700D9B731 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E916A52995270900EFDB34 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9595D6E629AFAB3300D9B731 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E9168D299526F200EFDB34 /* BoltsSwift.framework */; }; 9595D6E729AFAB3400D9B731 /* BoltsSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E9168D299526F200EFDB34 /* BoltsSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E91676299526B200EFDB34 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9011E25AF3A00F408BC /* Foundation.framework */; }; @@ -31,8 +29,6 @@ 95E9167D299526B900EFDB34 /* SystemConfiguration.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E916A82995272A00EFDB34 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E91689299526F200EFDB34 /* BoltsSwift.framework */; }; 95E916A92995272A00EFDB34 /* BoltsSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E91689299526F200EFDB34 /* BoltsSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 95E916AB2995273D00EFDB34 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E916A52995270900EFDB34 /* Starscream.framework */; }; - 95E916AC2995273D00EFDB34 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E916A52995270900EFDB34 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; @@ -199,20 +195,6 @@ remoteGlobalIDString = 065894E71C9A933B000FDDA6; remoteInfo = "BoltsSwift-watchOS"; }; - 95E916A42995270900EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9169F2995270900EFDB34 /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 33CCF0921F5DDC030099B092; - remoteInfo = Starscream; - }; - 95E916A62995270900EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9169F2995270900EFDB34 /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC; - remoteInfo = "Starscream Tests"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -246,7 +228,6 @@ 9595D6E729AFAB3400D9B731 /* BoltsSwift.framework in Embed Frameworks */, 95E9167B299526B500EFDB34 /* Security.framework in Embed Frameworks */, 95E9167D299526B900EFDB34 /* SystemConfiguration.framework in Embed Frameworks */, - 9595D6E529AFAB0700D9B731 /* Starscream.framework in Embed Frameworks */, 95E91679299526B300EFDB34 /* AudioToolbox.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -259,7 +240,6 @@ dstSubfolderSpec = 10; files = ( 95E916A92995272A00EFDB34 /* BoltsSwift.framework in Embed Frameworks */, - 95E916AC2995273D00EFDB34 /* Starscream.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -285,7 +265,6 @@ 708836972561F55B005B32F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 95E916532995216A00EFDB34 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; - 95E9169F2995270900EFDB34 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 95E916B2299527BD00EFDB34 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; }; 95E916B4299527CC00EFDB34 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -322,7 +301,6 @@ files = ( 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */, 9595D6E629AFAB3300D9B731 /* BoltsSwift.framework in Frameworks */, - 9595D6E429AFAB0700D9B731 /* Starscream.framework in Frameworks */, 95E91676299526B200EFDB34 /* Foundation.framework in Frameworks */, 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */, 95E9167A299526B500EFDB34 /* Security.framework in Frameworks */, @@ -335,7 +313,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 95E916AB2995273D00EFDB34 /* Starscream.framework in Frameworks */, 95E916A82995272A00EFDB34 /* BoltsSwift.framework in Frameworks */, 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */, @@ -352,7 +329,6 @@ 95E916B2299527BD00EFDB34 /* Network.framework */, 95E916532995216A00EFDB34 /* Parse.xcodeproj */, 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */, - 95E9169F2995270900EFDB34 /* Starscream.xcodeproj */, 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, @@ -445,15 +421,6 @@ name = Products; sourceTree = ""; }; - 95E916A02995270900EFDB34 /* Products */ = { - isa = PBXGroup; - children = ( - 95E916A52995270900EFDB34 /* Starscream.framework */, - 95E916A72995270900EFDB34 /* Starscream Tests.xctest */, - ); - name = Products; - sourceTree = ""; - }; F5256FC41BD71F9A0052FB8A = { isa = PBXGroup; children = ( @@ -673,10 +640,6 @@ ProductGroup = 95E916542995216A00EFDB34 /* Products */; ProjectRef = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; }, - { - ProductGroup = 95E916A02995270900EFDB34 /* Products */; - ProjectRef = 95E9169F2995270900EFDB34 /* Starscream.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -822,20 +785,6 @@ remoteRef = 95E91694299526F200EFDB34 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 95E916A52995270900EFDB34 /* Starscream.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 95E916A42995270900EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916A72995270900EFDB34 /* Starscream Tests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream Tests.xctest"; - remoteRef = 95E916A62995270900EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ From c033f3656814cfc9ec2e4f98438f4b88b0322478 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 17:36:43 -0500 Subject: [PATCH 4/9] get parse from spm --- ParseLiveQuery/.gitignore | 1 + .../ParseLiveQuery.xcodeproj/project.pbxproj | 402 ++++-------------- .../contents.xcworkspacedata | 2 +- 3 files changed, 76 insertions(+), 329 deletions(-) create mode 100644 ParseLiveQuery/.gitignore diff --git a/ParseLiveQuery/.gitignore b/ParseLiveQuery/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseLiveQuery/.gitignore @@ -0,0 +1 @@ +Package.resolved diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index e14ec5f49..4c0efe2df 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -13,12 +13,12 @@ 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; 39506FFB2A304E6B007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; 39506FFC2A3056B6007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; + 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE834C2ACF707500142920 /* ParseObjC */; }; + 39CE834F2ACF707B00142920 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE834E2ACF707B00142920 /* ParseObjC */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 708836762561F503005B32F0 /* ParseLiveQuery_watchOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 708836982561F55B005B32F0 /* ParseLiveQuery_tvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9595D6E629AFAB3300D9B731 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E9168D299526F200EFDB34 /* BoltsSwift.framework */; }; - 9595D6E729AFAB3400D9B731 /* BoltsSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E9168D299526F200EFDB34 /* BoltsSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E91676299526B200EFDB34 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9011E25AF3A00F408BC /* Foundation.framework */; }; 95E91677299526B200EFDB34 /* Foundation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9011E25AF3A00F408BC /* Foundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E91678299526B300EFDB34 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; @@ -27,8 +27,6 @@ 95E9167B299526B500EFDB34 /* Security.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9031E25AF4300F408BC /* Security.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E9167C299526B900EFDB34 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; 95E9167D299526B900EFDB34 /* SystemConfiguration.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 95E916A82995272A00EFDB34 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95E91689299526F200EFDB34 /* BoltsSwift.framework */; }; - 95E916A92995272A00EFDB34 /* BoltsSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 95E91689299526F200EFDB34 /* BoltsSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; @@ -62,139 +60,6 @@ remoteGlobalIDString = F509D5171CA9E4AE007B15B0; remoteInfo = LiveQueryDemo; }; - 9595D6E229AFAAB400D9B731 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 97010FAB1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 95E916602995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 95E916622995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 95E916642995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 95E916662995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 95E916682995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 95E9166A2995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 95E9166C2995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 95E9166E2995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 95E916702995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 95E916722995216A00EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 95E916742995217600EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C3821B19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 95E91688299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 87FEF3661A9085FA00C60678; - remoteInfo = "BoltsSwift-iOS"; - }; - 95E9168A299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 87FEF3711A9085FA00C60678; - remoteInfo = "BoltsSwiftTests-iOS"; - }; - 95E9168C299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CC14EC1A9BE0A100B28F86; - remoteInfo = "BoltsSwift-macOS"; - }; - 95E9168E299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CC14F61A9BE0A100B28F86; - remoteInfo = "BoltsSwiftTests-macOS"; - }; - 95E91690299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 065894FF1C9A93B7000FDDA6; - remoteInfo = "BoltsSwift-tvOS"; - }; - 95E91692299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0658951B1C9A947B000FDDA6; - remoteInfo = "BoltsSwiftTests-tvOS"; - }; - 95E91694299526F200EFDB34 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 065894E71C9A933B000FDDA6; - remoteInfo = "BoltsSwift-watchOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -225,7 +90,6 @@ dstSubfolderSpec = 10; files = ( 95E91677299526B200EFDB34 /* Foundation.framework in Embed Frameworks */, - 9595D6E729AFAB3400D9B731 /* BoltsSwift.framework in Embed Frameworks */, 95E9167B299526B500EFDB34 /* Security.framework in Embed Frameworks */, 95E9167D299526B900EFDB34 /* SystemConfiguration.framework in Embed Frameworks */, 95E91679299526B300EFDB34 /* AudioToolbox.framework in Embed Frameworks */, @@ -239,7 +103,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 95E916A92995272A00EFDB34 /* BoltsSwift.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -257,14 +120,13 @@ 39506FFA2A304E6B007F9550 /* Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = ""; }; 39B8579A29D75AE00023ADB0 /* LiveQueryDemo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = LiveQueryDemo.xcodeproj; sourceTree = ""; }; 39B8579E29D75AE00023ADB0 /* LiveQueryDemo-ObjC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "LiveQueryDemo-ObjC.xcodeproj"; sourceTree = ""; }; + 39CE833A2ACF700300142920 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 708836722561F502005B32F0 /* ParseLiveQuery_watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseLiveQuery_watchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseLiveQuery_watchOS.h; sourceTree = ""; }; 708836752561F503005B32F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 708836942561F55B005B32F0 /* ParseLiveQuery_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseLiveQuery_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseLiveQuery_tvOS.h; sourceTree = ""; }; 708836972561F55B005B32F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 95E916532995216A00EFDB34 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; - 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; 95E916B2299527BD00EFDB34 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; }; 95E916B4299527CC00EFDB34 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -300,8 +162,8 @@ buildActionMask = 2147483647; files = ( 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */, - 9595D6E629AFAB3300D9B731 /* BoltsSwift.framework in Frameworks */, 95E91676299526B200EFDB34 /* Foundation.framework in Frameworks */, + 39CE834F2ACF707B00142920 /* ParseObjC in Frameworks */, 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */, 95E9167A299526B500EFDB34 /* Security.framework in Frameworks */, 95E9167C299526B900EFDB34 /* SystemConfiguration.framework in Frameworks */, @@ -313,7 +175,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 95E916A82995272A00EFDB34 /* BoltsSwift.framework in Frameworks */, + 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */, 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */, ); @@ -327,8 +189,6 @@ children = ( 95E916B4299527CC00EFDB34 /* NetworkExtension.framework */, 95E916B2299527BD00EFDB34 /* Network.framework */, - 95E916532995216A00EFDB34 /* Parse.xcodeproj */, - 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */, 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, @@ -372,6 +232,14 @@ name = Products; sourceTree = ""; }; + 39CE83392ACF700300142920 /* Packages */ = { + isa = PBXGroup; + children = ( + 39CE833A2ACF700300142920 /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 708836732561F503005B32F0 /* ParseLiveQuery-watchOS */ = { isa = PBXGroup; children = ( @@ -390,40 +258,10 @@ path = "ParseLiveQuery-tvOS"; sourceTree = ""; }; - 95E916542995216A00EFDB34 /* Products */ = { - isa = PBXGroup; - children = ( - 95E916612995216A00EFDB34 /* Parse.framework */, - 95E916632995216A00EFDB34 /* Parse.framework */, - 95E916652995216A00EFDB34 /* ParseUnitTests-iOS.xctest */, - 95E916672995216A00EFDB34 /* Parse.framework */, - 95E916692995216A00EFDB34 /* ParseUnitTests-macOS.xctest */, - 95E9166B2995216A00EFDB34 /* Parse.framework */, - 95E9166D2995216A00EFDB34 /* Parse.framework */, - 95E9166F2995216A00EFDB34 /* Parse.framework */, - 95E916712995216A00EFDB34 /* Parse.framework */, - 95E916732995216A00EFDB34 /* ParseUnitTests-iOS-host.app */, - ); - name = Products; - sourceTree = ""; - }; - 95E9167F299526F200EFDB34 /* Products */ = { - isa = PBXGroup; - children = ( - 95E91689299526F200EFDB34 /* BoltsSwift.framework */, - 95E9168B299526F200EFDB34 /* BoltsSwiftTests.xctest */, - 95E9168D299526F200EFDB34 /* BoltsSwift.framework */, - 95E9168F299526F200EFDB34 /* BoltsSwiftTests.xctest */, - 95E91691299526F200EFDB34 /* BoltsSwift.framework */, - 95E91693299526F200EFDB34 /* BoltsSwiftTests.xctest */, - 95E91695299526F200EFDB34 /* BoltsSwift.framework */, - ); - name = Products; - sourceTree = ""; - }; F5256FC41BD71F9A0052FB8A = { isa = PBXGroup; children = ( + 39CE83392ACF700300142920 /* Packages */, 39B8579429D75AE00023ADB0 /* Examples */, F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, 708836732561F503005B32F0 /* ParseLiveQuery-watchOS */, @@ -559,9 +397,11 @@ buildRules = ( ); dependencies = ( - 9595D6E329AFAAB400D9B731 /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; + packageProductDependencies = ( + 39CE834E2ACF707B00142920 /* ParseObjC */, + ); productName = ParseLiveQuery; productReference = F5903CEA1BD999C500C3EFFE /* ParseLiveQuery.framework */; productType = "com.apple.product-type.framework"; @@ -579,9 +419,11 @@ buildRules = ( ); dependencies = ( - 95E916752995217600EFDB34 /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; + packageProductDependencies = ( + 39CE834C2ACF707500142920 /* ParseObjC */, + ); productName = ParseLiveQuery; productReference = F5A9BFCA1BE0248D00E78326 /* ParseLiveQuery.framework */; productType = "com.apple.product-type.framework"; @@ -624,10 +466,6 @@ productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 95E9167F299526F200EFDB34 /* Products */; - ProjectRef = 95E9167E299526F200EFDB34 /* BoltsSwift.xcodeproj */; - }, { ProductGroup = 39B8579F29D75AE00023ADB0 /* Products */; ProjectRef = 39B8579E29D75AE00023ADB0 /* LiveQueryDemo-ObjC.xcodeproj */; @@ -636,10 +474,6 @@ ProductGroup = 39B8579B29D75AE00023ADB0 /* Products */; ProjectRef = 39B8579A29D75AE00023ADB0 /* LiveQueryDemo.xcodeproj */; }, - { - ProductGroup = 95E916542995216A00EFDB34 /* Products */; - ProjectRef = 95E916532995216A00EFDB34 /* Parse.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -666,125 +500,6 @@ remoteRef = 39B857B629D75AE00023ADB0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 95E916612995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E916602995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916632995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E916622995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916652995216A00EFDB34 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 95E916642995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916672995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E916662995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916692995216A00EFDB34 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 95E916682995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9166B2995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E9166A2995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9166D2995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E9166C2995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9166F2995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E9166E2995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916712995216A00EFDB34 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 95E916702995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E916732995216A00EFDB34 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 95E916722995216A00EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E91689299526F200EFDB34 /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95E91688299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9168B299526F200EFDB34 /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95E9168A299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9168D299526F200EFDB34 /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95E9168C299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E9168F299526F200EFDB34 /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95E9168E299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E91691299526F200EFDB34 /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95E91690299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E91693299526F200EFDB34 /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95E91692299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95E91695299526F200EFDB34 /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95E91694299526F200EFDB34 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -869,19 +584,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 9595D6E329AFAAB400D9B731 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-macOS"; - targetProxy = 9595D6E229AFAAB400D9B731 /* PBXContainerItemProxy */; - }; - 95E916752995217600EFDB34 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS"; - targetProxy = 95E916742995217600EFDB34 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 708836772561F503005B32F0 /* Debug */ = { isa = XCBuildConfiguration; @@ -918,7 +620,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 2.8.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -966,7 +672,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 2.8.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1017,7 +727,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 2.8.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1064,7 +778,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 2.8.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1150,8 +868,9 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.15; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.2; }; name = Release; @@ -1171,7 +890,11 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 2.8.1; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; @@ -1198,7 +921,11 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 2.8.1; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; @@ -1224,7 +951,11 @@ INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.8.1; OTHER_LDFLAGS = "-lsqlite3"; @@ -1254,7 +985,11 @@ INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.8.1; OTHER_LDFLAGS = "-lsqlite3"; @@ -1317,6 +1052,17 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39CE834C2ACF707500142920 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39CE834E2ACF707B00142920 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = F5256FC51BD71F9A0052FB8A /* Project object */; } diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 71ce19170..919434a62 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> From 8d21d167c7174dab06697ca635bab3de9019ead0 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 18:05:23 -0500 Subject: [PATCH 5/9] remove bolts-swift --- Cartfile | 1 - Cartfile.resolved | 1 - Package.swift | 2 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 55 +++++++++++++++++++ .../xcshareddata/swiftpm/Package.resolved | 43 --------------- 5 files changed, 56 insertions(+), 46 deletions(-) delete mode 100644 ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Cartfile b/Cartfile index 0902cf9d7..7fa27b6c7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,2 @@ github "BoltsFramework/Bolts-ObjC" ~> 1.9.1 -github "BoltsFramework/Bolts-Swift" >= 1.5.0 github "facebook/facebook-ios-sdk" == 15.1.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 3f8b4caa0..cea6faaa8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,2 @@ github "BoltsFramework/Bolts-ObjC" "1.9.1" -github "BoltsFramework/Bolts-Swift" "1.5.0" github "facebook/facebook-ios-sdk" "v15.1.0" diff --git a/Package.swift b/Package.swift index 668117b1e..d80817991 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"), .package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"), - .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"), + .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"), .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0") ], targets: [ diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index 4c0efe2df..0bcc4bd20 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 0632EDD51CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8FF1E25AF3100F408BC /* libicucore.tbd */; }; 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; + 393363622ACF772800E582D4 /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 393363612ACF772800E582D4 /* BoltsSwift */; }; + 393363642ACF773900E582D4 /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 393363632ACF773900E582D4 /* BoltsSwift */; }; + 393363672ACF780F00E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 393363662ACF780F00E582D4 /* Starscream */; }; + 393363692ACF784000E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 393363682ACF784000E582D4 /* Starscream */; }; 39506FFB2A304E6B007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; 39506FFC2A3056B6007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE834C2ACF707500142920 /* ParseObjC */; }; @@ -164,10 +168,12 @@ 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */, 95E91676299526B200EFDB34 /* Foundation.framework in Frameworks */, 39CE834F2ACF707B00142920 /* ParseObjC in Frameworks */, + 393363642ACF773900E582D4 /* BoltsSwift in Frameworks */, 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */, 95E9167A299526B500EFDB34 /* Security.framework in Frameworks */, 95E9167C299526B900EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E91678299526B300EFDB34 /* AudioToolbox.framework in Frameworks */, + 393363692ACF784000E582D4 /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,6 +184,8 @@ 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */, 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */, + 393363672ACF780F00E582D4 /* Starscream in Frameworks */, + 393363622ACF772800E582D4 /* BoltsSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -401,6 +409,8 @@ name = "ParseLiveQuery-OSX"; packageProductDependencies = ( 39CE834E2ACF707B00142920 /* ParseObjC */, + 393363632ACF773900E582D4 /* BoltsSwift */, + 393363682ACF784000E582D4 /* Starscream */, ); productName = ParseLiveQuery; productReference = F5903CEA1BD999C500C3EFFE /* ParseLiveQuery.framework */; @@ -423,6 +433,8 @@ name = "ParseLiveQuery-iOS"; packageProductDependencies = ( 39CE834C2ACF707500142920 /* ParseObjC */, + 393363612ACF772800E582D4 /* BoltsSwift */, + 393363662ACF780F00E582D4 /* Starscream */, ); productName = ParseLiveQuery; productReference = F5A9BFCA1BE0248D00E78326 /* ParseLiveQuery.framework */; @@ -463,6 +475,10 @@ Base, ); mainGroup = F5256FC41BD71F9A0052FB8A; + packageReferences = ( + 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */, + 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */, + ); productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; projectReferences = ( @@ -1053,7 +1069,46 @@ }; /* End XCConfigurationList section */ +/* Begin XCRemoteSwiftPackageReference section */ + 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/BoltsFramework/Bolts-Swift"; + requirement = { + kind = exactVersion; + version = 1.5.0; + }; + }; + 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/dplewis/Starscream"; + requirement = { + branch = master; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ + 393363612ACF772800E582D4 /* BoltsSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */; + productName = BoltsSwift; + }; + 393363632ACF773900E582D4 /* BoltsSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */; + productName = BoltsSwift; + }; + 393363662ACF780F00E582D4 /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; + 393363682ACF784000E582D4 /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; 39CE834C2ACF707500142920 /* ParseObjC */ = { isa = XCSwiftPackageProductDependency; productName = ParseObjC; diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 9466f0275..000000000 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,43 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "Bolts", - "repositoryURL": "https://github.com/parse-community/Bolts-ObjC.git", - "state": { - "branch": null, - "revision": "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", - "version": "1.10.0" - } - }, - { - "package": "BoltsSwift", - "repositoryURL": "https://github.com/BoltsFramework/Bolts-Swift.git", - "state": { - "branch": null, - "revision": "d8c07eee2045a13f34330c0a4664053b5176e3f0", - "version": "1.5.0" - } - }, - { - "package": "Facebook", - "repositoryURL": "https://github.com/facebook/facebook-ios-sdk.git", - "state": { - "branch": null, - "revision": "7fd8a930a5b2c940a22efafe0e214ed0df671312", - "version": "15.1.0" - } - }, - { - "package": "Starscream", - "repositoryURL": "https://github.com/daltoniam/Starscream.git", - "state": { - "branch": null, - "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", - "version": "4.0.6" - } - } - ] - }, - "version": 1 -} From de89e05b28b318cc8a6969d0ae70893f65b2b7a0 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 18:20:13 -0500 Subject: [PATCH 6/9] Use ios deployment target 12 --- ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index 0bcc4bd20..73e65786d 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -962,11 +962,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - EXCLUDED_ARCHS = arm64; FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -996,11 +995,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - EXCLUDED_ARCHS = arm64; FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Resources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 4390d66f4d6b34afa6244288c0b8fc8120e4d51e Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 18:39:08 -0500 Subject: [PATCH 7/9] use dplewis fork --- Package.resolved | 4 ++-- Package.swift | 2 +- ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.resolved b/Package.resolved index c9738b414..8b5098dda 100644 --- a/Package.resolved +++ b/Package.resolved @@ -30,10 +30,10 @@ }, { "package": "Starscream", - "repositoryURL": "https://github.com/daltoniam/Starscream.git", + "repositoryURL": "https://github.com/dplewis/Starscream.git", "state": { "branch": null, - "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "revision": "d3a0b107328e3bc1601dccbfbcd556bd53aed767", "version": "4.0.6" } } diff --git a/Package.swift b/Package.swift index d80817991..6bd320e28 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"), .package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"), - .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"), + .package(url: "https://github.com/dplewis/Starscream.git", from: "4.0.6"), .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0") ], targets: [ diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index 73e65786d..936bf2a98 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -1080,8 +1080,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/dplewis/Starscream"; requirement = { - branch = master; - kind = branch; + kind = exactVersion; + version = 4.0.6; }; }; /* End XCRemoteSwiftPackageReference section */ From f0d8af9d868173e3dd53a776c9bff9a0abbd7f69 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 18:50:35 -0500 Subject: [PATCH 8/9] remove bolts swift --- .../xcshareddata/swiftpm/Package.resolved | 4 +- Parse/Parse.xcodeproj/project.pbxproj | 120 +----------------- 2 files changed, 3 insertions(+), 121 deletions(-) diff --git a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9466f0275..f0fb3a401 100644 --- a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -30,10 +30,10 @@ }, { "package": "Starscream", - "repositoryURL": "https://github.com/daltoniam/Starscream.git", + "repositoryURL": "https://github.com/dplewis/Starscream.git", "state": { "branch": null, - "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "revision": "d3a0b107328e3bc1601dccbfbcd556bd53aed767", "version": "4.0.6" } } diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 06d31e48f..515d0caa8 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -2962,55 +2962,6 @@ remoteGlobalIDString = 81C3821B19CCA89E0066284A; remoteInfo = "Parse-iOS"; }; - 95AEEB192991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 87FEF3661A9085FA00C60678; - remoteInfo = "BoltsSwift-iOS"; - }; - 95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 87FEF3711A9085FA00C60678; - remoteInfo = "BoltsSwiftTests-iOS"; - }; - 95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CC14EC1A9BE0A100B28F86; - remoteInfo = "BoltsSwift-macOS"; - }; - 95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CC14F61A9BE0A100B28F86; - remoteInfo = "BoltsSwiftTests-macOS"; - }; - 95AEEB212991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 065894FF1C9A93B7000FDDA6; - remoteInfo = "BoltsSwift-tvOS"; - }; - 95AEEB232991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0658951B1C9A947B000FDDA6; - remoteInfo = "BoltsSwiftTests-tvOS"; - }; - 95AEEB252991373F00165C0D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 065894E71C9A933B000FDDA6; - remoteInfo = "BoltsSwift-watchOS"; - }; BC105FC424C5D0C900295EF7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; @@ -3624,7 +3575,6 @@ 91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = ""; }; 91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = ""; }; 91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = ""; }; - 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; 97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 97AA93B816780B7600445C2D /* Parse-OSX.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Parse-OSX.Info.plist"; sourceTree = ""; }; 97E18AE41623835600B17A67 /* PFLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFLocationManager.h; sourceTree = ""; }; @@ -3922,7 +3872,6 @@ 7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */, 7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */, BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */, - 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, ); name = Frameworks; @@ -5199,20 +5148,6 @@ path = CurrentUserController; sourceTree = ""; }; - 95AEEB102991373F00165C0D /* Products */ = { - isa = PBXGroup; - children = ( - 95AEEB1A2991373F00165C0D /* BoltsSwift.framework */, - 95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */, - 95AEEB1E2991373F00165C0D /* BoltsSwift.framework */, - 95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */, - 95AEEB222991373F00165C0D /* BoltsSwift.framework */, - 95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */, - 95AEEB262991373F00165C0D /* BoltsSwift.framework */, - ); - name = Products; - sourceTree = ""; - }; BC105FBB24C5D0C900295EF7 /* Products */ = { isa = PBXGroup; children = ( @@ -7141,10 +7076,6 @@ ProductGroup = 4A13517620281768000F5FD5 /* Products */; ProjectRef = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; }, - { - ProductGroup = 95AEEB102991373F00165C0D /* Products */; - ProjectRef = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */; - }, { ProductGroup = BC105FBB24C5D0C900295EF7 /* Products */; ProjectRef = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; @@ -7244,55 +7175,6 @@ remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 95AEEB1A2991373F00165C0D /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95AEEB192991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB1E2991373F00165C0D /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB222991373F00165C0D /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95AEEB212991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BoltsSwiftTests.xctest; - remoteRef = 95AEEB232991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 95AEEB262991373F00165C0D /* BoltsSwift.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = BoltsSwift.framework; - remoteRef = 95AEEB252991373F00165C0D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; BC105FC524C5D0C900295EF7 /* OCMock.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; From 530857c58e39e775f24529ea452e4bfb053d407f Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 19:17:42 -0500 Subject: [PATCH 9/9] revert fork --- Package.resolved | 4 +-- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 +-- .../ParseLiveQuery.xcodeproj/project.pbxproj | 26 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8b5098dda..c9738b414 100644 --- a/Package.resolved +++ b/Package.resolved @@ -30,10 +30,10 @@ }, { "package": "Starscream", - "repositoryURL": "https://github.com/dplewis/Starscream.git", + "repositoryURL": "https://github.com/daltoniam/Starscream.git", "state": { "branch": null, - "revision": "d3a0b107328e3bc1601dccbfbcd556bd53aed767", + "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", "version": "4.0.6" } } diff --git a/Package.swift b/Package.swift index 6bd320e28..d80817991 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"), .package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"), - .package(url: "https://github.com/dplewis/Starscream.git", from: "4.0.6"), + .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"), .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0") ], targets: [ diff --git a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved index f0fb3a401..9466f0275 100644 --- a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -30,10 +30,10 @@ }, { "package": "Starscream", - "repositoryURL": "https://github.com/dplewis/Starscream.git", + "repositoryURL": "https://github.com/daltoniam/Starscream.git", "state": { "branch": null, - "revision": "d3a0b107328e3bc1601dccbfbcd556bd53aed767", + "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33", "version": "4.0.6" } } diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index 936bf2a98..c4d956711 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -13,8 +13,8 @@ 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; 393363622ACF772800E582D4 /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 393363612ACF772800E582D4 /* BoltsSwift */; }; 393363642ACF773900E582D4 /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 393363632ACF773900E582D4 /* BoltsSwift */; }; - 393363672ACF780F00E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 393363662ACF780F00E582D4 /* Starscream */; }; - 393363692ACF784000E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 393363682ACF784000E582D4 /* Starscream */; }; + 393363902ACF889100E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 3933638F2ACF889100E582D4 /* Starscream */; }; + 393363922ACF889F00E582D4 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 393363912ACF889F00E582D4 /* Starscream */; }; 39506FFB2A304E6B007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; 39506FFC2A3056B6007F9550 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39506FFA2A304E6B007F9550 /* Common.swift */; }; 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CE834C2ACF707500142920 /* ParseObjC */; }; @@ -173,7 +173,7 @@ 95E9167A299526B500EFDB34 /* Security.framework in Frameworks */, 95E9167C299526B900EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E91678299526B300EFDB34 /* AudioToolbox.framework in Frameworks */, - 393363692ACF784000E582D4 /* Starscream in Frameworks */, + 393363922ACF889F00E582D4 /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -184,7 +184,7 @@ 39CE834D2ACF707500142920 /* ParseObjC in Frameworks */, 95E916B6299527DC00EFDB34 /* SystemConfiguration.framework in Frameworks */, 95E916B12995279800EFDB34 /* AudioToolbox.framework in Frameworks */, - 393363672ACF780F00E582D4 /* Starscream in Frameworks */, + 393363902ACF889100E582D4 /* Starscream in Frameworks */, 393363622ACF772800E582D4 /* BoltsSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -410,7 +410,7 @@ packageProductDependencies = ( 39CE834E2ACF707B00142920 /* ParseObjC */, 393363632ACF773900E582D4 /* BoltsSwift */, - 393363682ACF784000E582D4 /* Starscream */, + 393363912ACF889F00E582D4 /* Starscream */, ); productName = ParseLiveQuery; productReference = F5903CEA1BD999C500C3EFFE /* ParseLiveQuery.framework */; @@ -434,7 +434,7 @@ packageProductDependencies = ( 39CE834C2ACF707500142920 /* ParseObjC */, 393363612ACF772800E582D4 /* BoltsSwift */, - 393363662ACF780F00E582D4 /* Starscream */, + 3933638F2ACF889100E582D4 /* Starscream */, ); productName = ParseLiveQuery; productReference = F5A9BFCA1BE0248D00E78326 /* ParseLiveQuery.framework */; @@ -477,7 +477,7 @@ mainGroup = F5256FC41BD71F9A0052FB8A; packageReferences = ( 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */, - 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */, + 3933638E2ACF889100E582D4 /* XCRemoteSwiftPackageReference "Starscream" */, ); productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; @@ -1076,9 +1076,9 @@ version = 1.5.0; }; }; - 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */ = { + 3933638E2ACF889100E582D4 /* XCRemoteSwiftPackageReference "Starscream" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/dplewis/Starscream"; + repositoryURL = "https://github.com/daltoniam/Starscream.git"; requirement = { kind = exactVersion; version = 4.0.6; @@ -1097,14 +1097,14 @@ package = 393363602ACF772800E582D4 /* XCRemoteSwiftPackageReference "Bolts-Swift" */; productName = BoltsSwift; }; - 393363662ACF780F00E582D4 /* Starscream */ = { + 3933638F2ACF889100E582D4 /* Starscream */ = { isa = XCSwiftPackageProductDependency; - package = 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; + package = 3933638E2ACF889100E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; productName = Starscream; }; - 393363682ACF784000E582D4 /* Starscream */ = { + 393363912ACF889F00E582D4 /* Starscream */ = { isa = XCSwiftPackageProductDependency; - package = 393363652ACF780F00E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; + package = 3933638E2ACF889100E582D4 /* XCRemoteSwiftPackageReference "Starscream" */; productName = Starscream; }; 39CE834C2ACF707500142920 /* ParseObjC */ = {