From 9ca28d85688e7a5b25ce4fe44058be5e20047ae0 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 02:41:33 -0500 Subject: [PATCH 1/8] fix: Compilation errors on watchOS --- .../Controller/PFInstallationController.m | 4 + .../PFCurrentInstallationController.m | 4 + Parse/Parse/Internal/PFReachability.m | 3 + .../Internal/Push/Utilites/PFPushUtilities.m | 7 +- .../project.pbxproj | 39 ++++++---- .../xcshareddata/swiftpm/Package.resolved | 78 +++++++++---------- .../ParseStarterProject/AppDelegate.swift | 2 +- .../ParseStarterProject/ViewController.swift | 2 +- Rakefile | 3 +- 9 files changed, 81 insertions(+), 61 deletions(-) diff --git a/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m b/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m index c28907fdf..593525730 100644 --- a/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m +++ b/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m @@ -9,6 +9,8 @@ #import "PFInstallationController.h" +#if !TARGET_OS_WATCH + #import "BFTask+Private.h" #import "PFAssert.h" #import "PFCurrentInstallationController.h" @@ -105,3 +107,5 @@ - (PFCurrentInstallationController *)currentInstallationController { } @end + +#endif diff --git a/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m b/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m index 785664ce3..20729a22c 100644 --- a/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m +++ b/Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m @@ -9,6 +9,8 @@ #import "PFCurrentInstallationController.h" +#if !TARGET_OS_WATCH + #import "BFTask+Private.h" #import "PFAsyncTaskQueue.h" #import "PFInstallationIdentifierStore.h" @@ -280,3 +282,5 @@ - (void)setCurrentInstallationMatchesDisk:(BOOL)currentInstallationMatchesDisk { } @end + +#endif diff --git a/Parse/Parse/Internal/PFReachability.m b/Parse/Parse/Internal/PFReachability.m index f2faebbb8..147f662b0 100644 --- a/Parse/Parse/Internal/PFReachability.m +++ b/Parse/Parse/Internal/PFReachability.m @@ -9,6 +9,7 @@ #import "PFReachability.h" +#if !TARGET_OS_WATCH #import #import "PFAssert.h" @@ -209,3 +210,5 @@ - (void)_startMonitoringReachabilityWithURL:(NSURL *)url { } @end + +#endif diff --git a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m index e73fb2d1c..ff15f17c5 100644 --- a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m +++ b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m @@ -17,7 +17,10 @@ #import "PFAlertView.h" #endif +#if !TARGET_OS_WATCH #import "PFInstallationPrivate.h" +#endif + #import "PFKeychainStore.h" #import "PFLogging.h" #import "PFMacros.h" @@ -49,14 +52,14 @@ + (NSString *)getDeviceTokenFromKeychain { return store[@"ParsePush"]; } +#if TARGET_OS_IOS + + (void)clearDeviceToken { // Used in test case setup. [[PFInstallation currentInstallation] _clearDeviceToken]; [[[PFKeychainStore alloc] initWithService:@"ParsePush"] removeObjectForKey:@"ParsePush"]; } -#if TARGET_OS_IOS - + (void)showAlertViewWithTitle:(nullable NSString *)title message:(nullable NSString *)message NS_EXTENSION_UNAVAILABLE_IOS("") { NSString *cancelButtonTitle = PFCoreLocalizedString(@"OK", @"Default alert view cancel button title."); [PFAlertView showAlertWithTitle:title diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index ae818a40c..00757a437 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,13 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ 391740322AC65AD500588AF7 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391740312AC65A2000588AF7 /* libsqlite3.tbd */; }; 391740352AC65D0000588AF7 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391740332AC65C6700588AF7 /* libsqlite3.tbd */; }; 391740372AC65DCB00588AF7 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 391740362AC65DCB00588AF7 /* ParseObjC */; }; + 395303192ACE862F002B4C60 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 395303182ACE862F002B4C60 /* ParseObjC */; }; 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */; }; 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFF292BD3DB00E4B6D2 /* SystemConfiguration.framework */; }; 81411DD11BC3658C0004BE84 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81411DCF1BC3658C0004BE84 /* Interface.storyboard */; }; @@ -67,7 +68,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 391740302AC6591E00588AF7 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 391740312AC65A2000588AF7 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 391740332AC65C6700588AF7 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS9.4.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; @@ -104,6 +104,7 @@ files = ( 391740322AC65AD500588AF7 /* libsqlite3.tbd in Frameworks */, 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */, + 395303192ACE862F002B4C60 /* ParseObjC in Frameworks */, 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -111,14 +112,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3917402F2AC6591E00588AF7 /* Packages */ = { - isa = PBXGroup; - children = ( - 391740302AC6591E00588AF7 /* Parse-SDK-iOS-OSX */, - ); - name = Packages; - sourceTree = ""; - }; 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */ = { isa = PBXGroup; children = ( @@ -170,7 +163,6 @@ 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( - 3917402F2AC6591E00588AF7 /* Packages */, 81BA81471A49DA1800E65899 /* ParseStarterProject */, 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */, 81411DDD1BC3658D0004BE84 /* ParseStarter WatchExtension */, @@ -266,6 +258,9 @@ 068C15651BC8F15300820E44 /* PBXTargetDependency */, ); name = "ParseStarter-Swift"; + packageProductDependencies = ( + 395303182ACE862F002B4C60 /* ParseObjC */, + ); productName = ParseStarterProject; productReference = 81BA81451A49DA1800E65899 /* ParseStarter-Swift.app */; productType = "com.apple.product-type.application"; @@ -302,6 +297,9 @@ Base, ); mainGroup = 81BA813C1A49DA1800E65899; + packageReferences = ( + 395303172ACE862F002B4C60 /* XCLocalSwiftPackageReference "../../.." */, + ); productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -415,7 +413,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -438,7 +436,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -458,7 +456,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -478,7 +476,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -663,11 +661,22 @@ }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 395303172ACE862F002B4C60 /* XCLocalSwiftPackageReference "../../.." */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../..; + }; +/* End XCLocalSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ 391740362AC65DCB00588AF7 /* ParseObjC */ = { isa = XCSwiftPackageProductDependency; productName = ParseObjC; }; + 395303182ACE862F002B4C60 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 81BA813D1A49DA1800E65899 /* Project object */; diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9466f0275..5acb74f4a 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,43 +1,41 @@ { - "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" - } + "pins" : [ + { + "identity" : "bolts-objc", + "kind" : "remoteSourceControl", + "location" : "https://github.com/parse-community/Bolts-ObjC.git", + "state" : { + "revision" : "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", + "version" : "1.10.0" } - ] - }, - "version": 1 + }, + { + "identity" : "bolts-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/BoltsFramework/Bolts-Swift.git", + "state" : { + "revision" : "d8c07eee2045a13f34330c0a4664053b5176e3f0", + "version" : "1.5.0" + } + }, + { + "identity" : "facebook-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/facebook/facebook-ios-sdk.git", + "state" : { + "revision" : "7fd8a930a5b2c940a22efafe0e214ed0df671312", + "version" : "15.1.0" + } + }, + { + "identity" : "starscream", + "kind" : "remoteSourceControl", + "location" : "https://github.com/daltoniam/Starscream.git", + "state" : { + "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version" : "4.0.6" + } + } + ], + "version" : 2 } diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift index 593211102..ad4fe6816 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift @@ -9,7 +9,7 @@ import UIKit -import Parse +import ParseCore // If you want to use any of the UI components, uncomment this line // import ParseUI diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift index 92689cef6..512b4fbd6 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift @@ -8,7 +8,7 @@ */ import UIKit -import Parse +import ParseCore class ViewController: UIViewController { diff --git a/Rakefile b/Rakefile index d66374755..cd0be469d 100644 --- a/Rakefile +++ b/Rakefile @@ -470,8 +470,7 @@ namespace :build do task :all do # TODO: watchos objc starter # Rake::Task['build:watchos_starters:objc'].invoke - # TODO: fix compilation errors - # Rake::Task['build:watchos_starters:swift'].invoke + Rake::Task['build:watchos_starters:swift'].invoke end task :swift do From c83b739a3a0d1df46a71168862b7dcc4a722318a Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 09:13:55 -0500 Subject: [PATCH 2/8] fix macos test --- Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m index ff15f17c5..1e178c061 100644 --- a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m +++ b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m @@ -52,13 +52,15 @@ + (NSString *)getDeviceTokenFromKeychain { return store[@"ParsePush"]; } -#if TARGET_OS_IOS - +#if !TARGET_OS_WATCH + (void)clearDeviceToken { // Used in test case setup. [[PFInstallation currentInstallation] _clearDeviceToken]; [[[PFKeychainStore alloc] initWithService:@"ParsePush"] removeObjectForKey:@"ParsePush"]; } +#endif + +#if TARGET_OS_IOS + (void)showAlertViewWithTitle:(nullable NSString *)title message:(nullable NSString *)message NS_EXTENSION_UNAVAILABLE_IOS("") { NSString *cancelButtonTitle = PFCoreLocalizedString(@"OK", @"Default alert view cancel button title."); From 94735b9b565482bc13d752aeff7f2eeb4c8dc2e1 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 10:38:02 -0500 Subject: [PATCH 3/8] test tvos --- .../project.pbxproj | 390 ++---------------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/swiftpm/Package.resolved | 41 ++ .../ParseStarter/AppDelegate.swift | 3 +- .../ParseStarter/ViewController.swift | 1 - Rakefile | 4 +- 6 files changed, 78 insertions(+), 363 deletions(-) create mode 100644 ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index 1ab3286fc..dea6e6cae 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,172 +3,19 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ + 3953032E2ACF0CE7002B4C60 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 3953032D2ACF0CE7002B4C60 /* ParseObjC */; }; 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 = ""; }; 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 +30,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C605FA2292BC39600E4B6D2 /* Bolts.framework in Frameworks */, + 3953032E2ACF0CE7002B4C60 /* ParseObjC in Frameworks */, 7C605F98292BC29800E4B6D2 /* libsqlite3.tbd in Frameworks */, - 7C605F9F292BC38600E4B6D2 /* Parse.framework in Frameworks */, 7C605F96292BC29500E4B6D2 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -193,41 +39,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605F4D292BC26300E4B6D2 /* Products */ = { - 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 */, - ); - 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; - sourceTree = ""; - }; 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( @@ -250,8 +61,6 @@ children = ( 7C605F97292BC29800E4B6D2 /* libsqlite3.tbd */, 7C605F95292BC29500E4B6D2 /* SystemConfiguration.framework */, - 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */, - 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -283,6 +92,9 @@ dependencies = ( ); name = ParseStarter; + packageProductDependencies = ( + 3953032D2ACF0CE7002B4C60 /* ParseObjC */, + ); productName = ParseStarter; productReference = 81C066EC1BFAC1D4001E0658 /* ParseStarter.app */; productType = "com.apple.product-type.application"; @@ -312,18 +124,11 @@ Base, ); mainGroup = 81BA813C1A49DA1800E65899; + packageReferences = ( + 395303262ACF0CE7002B4C60 /* XCLocalSwiftPackageReference "../../.." */, + ); 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 +136,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 +266,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,7 +283,10 @@ ); 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; @@ -648,7 +307,10 @@ ); 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; @@ -680,6 +342,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 395303262ACF0CE7002B4C60 /* XCLocalSwiftPackageReference "../../.." */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../..; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 3953032D2ACF0CE7002B4C60 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* 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-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..5acb74f4a --- /dev/null +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,41 @@ +{ + "pins" : [ + { + "identity" : "bolts-objc", + "kind" : "remoteSourceControl", + "location" : "https://github.com/parse-community/Bolts-ObjC.git", + "state" : { + "revision" : "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", + "version" : "1.10.0" + } + }, + { + "identity" : "bolts-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/BoltsFramework/Bolts-Swift.git", + "state" : { + "revision" : "d8c07eee2045a13f34330c0a4664053b5176e3f0", + "version" : "1.5.0" + } + }, + { + "identity" : "facebook-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/facebook/facebook-ios-sdk.git", + "state" : { + "revision" : "7fd8a930a5b2c940a22efafe0e214ed0df671312", + "version" : "15.1.0" + } + }, + { + "identity" : "starscream", + "kind" : "remoteSourceControl", + "location" : "https://github.com/daltoniam/Starscream.git", + "state" : { + "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", + "version" : "4.0.6" + } + } + ], + "version" : 2 +} diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift index 2d69bf4e2..75972cc61 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift @@ -8,8 +8,7 @@ */ import UIKit - -import Parse +import ParseCore @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 { diff --git a/Rakefile b/Rakefile index cd0be469d..0c9c26255 100644 --- a/Rakefile +++ b/Rakefile @@ -493,10 +493,10 @@ namespace :build do desc 'Build all starters' task :starters do - Rake::Task['build:ios_starters:all'].invoke - Rake::Task['build:macos_starters:all'].invoke Rake::Task['build:tvos_starters:all'].invoke Rake::Task['build:watchos_starters:all'].invoke + Rake::Task['build:ios_starters:all'].invoke + Rake::Task['build:macos_starters:all'].invoke end end From 8147131a453dfd9d01318338333e44ce378892cf Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 10:58:56 -0500 Subject: [PATCH 4/8] remove package.resolved --- ParseStarterProject/.gitignore | 1 + .../xcshareddata/swiftpm/Package.resolved | 43 ------------------- .../xcshareddata/swiftpm/Package.resolved | 43 ------------------- .../xcshareddata/swiftpm/Package.resolved | 43 ------------------- .../xcshareddata/swiftpm/Package.resolved | 43 ------------------- .../xcshareddata/swiftpm/Package.resolved | 41 ------------------ 6 files changed, 1 insertion(+), 213 deletions(-) delete mode 100644 ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ParseStarterProject/.gitignore b/ParseStarterProject/.gitignore index 469a4ac17..b319240b3 100644 --- a/ParseStarterProject/.gitignore +++ b/ParseStarterProject/.gitignore @@ -1 +1,2 @@ *.framework +Package.resolved diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 9466f0275..000000000 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-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 -} diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 9466f0275..000000000 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.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 -} diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 9466f0275..000000000 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-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 -} diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 9466f0275..000000000 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.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 -} diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 5acb74f4a..000000000 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,41 +0,0 @@ -{ - "pins" : [ - { - "identity" : "bolts-objc", - "kind" : "remoteSourceControl", - "location" : "https://github.com/parse-community/Bolts-ObjC.git", - "state" : { - "revision" : "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", - "version" : "1.10.0" - } - }, - { - "identity" : "bolts-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/BoltsFramework/Bolts-Swift.git", - "state" : { - "revision" : "d8c07eee2045a13f34330c0a4664053b5176e3f0", - "version" : "1.5.0" - } - }, - { - "identity" : "facebook-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/facebook/facebook-ios-sdk.git", - "state" : { - "revision" : "7fd8a930a5b2c940a22efafe0e214ed0df671312", - "version" : "15.1.0" - } - }, - { - "identity" : "starscream", - "kind" : "remoteSourceControl", - "location" : "https://github.com/daltoniam/Starscream.git", - "state" : { - "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", - "version" : "4.0.6" - } - } - ], - "version" : 2 -} From 3ffe6f12204d94370b066ad4de9d7e83574a1ce4 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 11:02:39 -0500 Subject: [PATCH 5/8] Delete Package.resolved --- .../xcshareddata/swiftpm/Package.resolved | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved 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 5acb74f4a..000000000 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,41 +0,0 @@ -{ - "pins" : [ - { - "identity" : "bolts-objc", - "kind" : "remoteSourceControl", - "location" : "https://github.com/parse-community/Bolts-ObjC.git", - "state" : { - "revision" : "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2", - "version" : "1.10.0" - } - }, - { - "identity" : "bolts-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/BoltsFramework/Bolts-Swift.git", - "state" : { - "revision" : "d8c07eee2045a13f34330c0a4664053b5176e3f0", - "version" : "1.5.0" - } - }, - { - "identity" : "facebook-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/facebook/facebook-ios-sdk.git", - "state" : { - "revision" : "7fd8a930a5b2c940a22efafe0e214ed0df671312", - "version" : "15.1.0" - } - }, - { - "identity" : "starscream", - "kind" : "remoteSourceControl", - "location" : "https://github.com/daltoniam/Starscream.git", - "state" : { - "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", - "version" : "4.0.6" - } - } - ], - "version" : 2 -} From 60b4eef8f191a7638a8e39c9485528416eb327d6 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 12:10:35 -0500 Subject: [PATCH 6/8] add build failures to artifacts --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfd69d28a..d196f9b79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,10 +76,12 @@ jobs: run: | ARTIFACT_NAME=${{ env.ARTIFACT_NAME }} TEST_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcresult") + BUILD_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcactivitylog") echo ARTIFACT_NAME=${ARTIFACT_NAME//:/-} >> $GITHUB_ENV # replace colon with dashes echo TEST_RESULTS=${TEST_RESULTS} >> $GITHUB_ENV echo "Artifact Name: $ARTIFACT_NAME" echo "Test Result Location: $TEST_RESULTS" + echo "Build Result Location: $BUILD_RESULTS" - name: Upload Artifact Logs if: ${{ failure() }} uses: actions/upload-artifact@v3 @@ -87,6 +89,7 @@ jobs: name: ${{ env.ARTIFACT_NAME }} path: | ~/Library/Developer/Xcode/DerivedData/Parse-*/Logs/Test + ~/Library/Developer/Xcode/DerivedData/**/Logs/Build - name: Upload Coverage uses: codecov/codecov-action@v3.1.1 with: From b03463be6770c81e7d28f8193c88bfea6dbc9464 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 13:40:07 -0500 Subject: [PATCH 7/8] Revert "test tvos" This reverts commit 94735b9b565482bc13d752aeff7f2eeb4c8dc2e1. --- .../project.pbxproj | 390 ++++++++++++++++-- .../contents.xcworkspacedata | 2 +- .../ParseStarter/AppDelegate.swift | 3 +- .../ParseStarter/ViewController.swift | 1 + Rakefile | 4 +- 5 files changed, 363 insertions(+), 37 deletions(-) diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index dea6e6cae..1ab3286fc 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,19 +3,172 @@ archiveVersion = 1; classes = { }; - objectVersion = 60; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 3953032E2ACF0CE7002B4C60 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 3953032D2ACF0CE7002B4C60 /* ParseObjC */; }; 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 = ""; }; 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; }; @@ -30,8 +183,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3953032E2ACF0CE7002B4C60 /* ParseObjC in Frameworks */, + 7C605FA2292BC39600E4B6D2 /* Bolts.framework in Frameworks */, 7C605F98292BC29800E4B6D2 /* libsqlite3.tbd in Frameworks */, + 7C605F9F292BC38600E4B6D2 /* Parse.framework in Frameworks */, 7C605F96292BC29500E4B6D2 /* SystemConfiguration.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -39,6 +193,41 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 7C605F4D292BC26300E4B6D2 /* Products */ = { + 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 */, + ); + 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; + sourceTree = ""; + }; 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( @@ -61,6 +250,8 @@ children = ( 7C605F97292BC29800E4B6D2 /* libsqlite3.tbd */, 7C605F95292BC29500E4B6D2 /* SystemConfiguration.framework */, + 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */, + 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -92,9 +283,6 @@ dependencies = ( ); name = ParseStarter; - packageProductDependencies = ( - 3953032D2ACF0CE7002B4C60 /* ParseObjC */, - ); productName = ParseStarter; productReference = 81C066EC1BFAC1D4001E0658 /* ParseStarter.app */; productType = "com.apple.product-type.application"; @@ -124,11 +312,18 @@ Base, ); mainGroup = 81BA813C1A49DA1800E65899; - packageReferences = ( - 395303262ACF0CE7002B4C60 /* XCLocalSwiftPackageReference "../../.." */, - ); productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 7C605F70292BC26600E4B6D2 /* Products */; + ProjectRef = 7C605F6F292BC26600E4B6D2 /* Bolts.xcodeproj */; + }, + { + ProductGroup = 7C605F4D292BC26300E4B6D2 /* Products */; + ProjectRef = 7C605F4C292BC26300E4B6D2 /* Parse.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 81C066EB1BFAC1D4001E0658 /* ParseStarter */, @@ -136,6 +331,156 @@ }; /* 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; @@ -266,8 +611,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -283,10 +627,7 @@ ); 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; @@ -307,10 +648,7 @@ ); 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; @@ -342,20 +680,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCLocalSwiftPackageReference section */ - 395303262ACF0CE7002B4C60 /* XCLocalSwiftPackageReference "../../.." */ = { - isa = XCLocalSwiftPackageReference; - relativePath = ../../..; - }; -/* End XCLocalSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 3953032D2ACF0CE7002B4C60 /* ParseObjC */ = { - isa = XCSwiftPackageProductDependency; - productName = ParseObjC; - }; -/* 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 919434a62..b162c5ad7 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:/Users/nlutsenko/src/parse/ios-client/StarterProjects/ParseSwiftStarterProject/ParseStarterProject-Swift.xcodeproj"> diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift index 75972cc61..2d69bf4e2 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/AppDelegate.swift @@ -8,7 +8,8 @@ */ import UIKit -import ParseCore + +import Parse @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift index 7d32a9013..69d3e7c40 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/ViewController.swift @@ -8,6 +8,7 @@ */ import UIKit +import Parse class ViewController: UIViewController { diff --git a/Rakefile b/Rakefile index a5e973842..c40ddbbaf 100644 --- a/Rakefile +++ b/Rakefile @@ -493,10 +493,10 @@ namespace :build do desc 'Build all starters' task :starters do - Rake::Task['build:tvos_starters:all'].invoke - Rake::Task['build:watchos_starters:all'].invoke Rake::Task['build:ios_starters:all'].invoke Rake::Task['build:macos_starters:all'].invoke + Rake::Task['build:tvos_starters:all'].invoke + Rake::Task['build:watchos_starters:all'].invoke end end From b9538634d6245642b2dcc32be4f321883e630dee Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Thu, 5 Oct 2023 13:53:16 -0500 Subject: [PATCH 8/8] fix build --- .github/workflows/ci.yml | 2 +- .../project.pbxproj | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d196f9b79..0991a0963 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/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index 00757a437..74fbbe1db 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,14 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 60; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ + 3901ECD82ACF3C7C0076D426 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 3901ECD72ACF3C7C0076D426 /* ParseObjC */; }; 391740322AC65AD500588AF7 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391740312AC65A2000588AF7 /* libsqlite3.tbd */; }; 391740352AC65D0000588AF7 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391740332AC65C6700588AF7 /* libsqlite3.tbd */; }; 391740372AC65DCB00588AF7 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 391740362AC65DCB00588AF7 /* ParseObjC */; }; - 395303192ACE862F002B4C60 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 395303182ACE862F002B4C60 /* ParseObjC */; }; 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */; }; 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFF292BD3DB00E4B6D2 /* SystemConfiguration.framework */; }; 81411DD11BC3658C0004BE84 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81411DCF1BC3658C0004BE84 /* Interface.storyboard */; }; @@ -68,6 +68,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 391740302AC6591E00588AF7 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 391740312AC65A2000588AF7 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 391740332AC65C6700588AF7 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS9.4.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; @@ -104,7 +105,7 @@ files = ( 391740322AC65AD500588AF7 /* libsqlite3.tbd in Frameworks */, 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */, - 395303192ACE862F002B4C60 /* ParseObjC in Frameworks */, + 3901ECD82ACF3C7C0076D426 /* ParseObjC in Frameworks */, 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -112,6 +113,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3917402F2AC6591E00588AF7 /* Packages */ = { + isa = PBXGroup; + children = ( + 391740302AC6591E00588AF7 /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */ = { isa = PBXGroup; children = ( @@ -163,6 +172,7 @@ 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( + 3917402F2AC6591E00588AF7 /* Packages */, 81BA81471A49DA1800E65899 /* ParseStarterProject */, 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */, 81411DDD1BC3658D0004BE84 /* ParseStarter WatchExtension */, @@ -259,7 +269,7 @@ ); name = "ParseStarter-Swift"; packageProductDependencies = ( - 395303182ACE862F002B4C60 /* ParseObjC */, + 3901ECD72ACF3C7C0076D426 /* ParseObjC */, ); productName = ParseStarterProject; productReference = 81BA81451A49DA1800E65899 /* ParseStarter-Swift.app */; @@ -297,9 +307,6 @@ Base, ); mainGroup = 81BA813C1A49DA1800E65899; - packageReferences = ( - 395303172ACE862F002B4C60 /* XCLocalSwiftPackageReference "../../.." */, - ); productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -661,19 +668,12 @@ }; /* End XCConfigurationList section */ -/* Begin XCLocalSwiftPackageReference section */ - 395303172ACE862F002B4C60 /* XCLocalSwiftPackageReference "../../.." */ = { - isa = XCLocalSwiftPackageReference; - relativePath = ../../..; - }; -/* End XCLocalSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ - 391740362AC65DCB00588AF7 /* ParseObjC */ = { + 3901ECD72ACF3C7C0076D426 /* ParseObjC */ = { isa = XCSwiftPackageProductDependency; productName = ParseObjC; }; - 395303182ACE862F002B4C60 /* ParseObjC */ = { + 391740362AC65DCB00588AF7 /* ParseObjC */ = { isa = XCSwiftPackageProductDependency; productName = ParseObjC; };