diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83bd1c162..cfd69d28a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,6 @@ on: branches: - "**" env: - CI_XCODE_11: /Applications/Xcode_11.7.app/Contents/Developer CI_XCODE_14: /Applications/Xcode_14.2.app/Contents/Developer jobs: tests: @@ -24,9 +23,9 @@ jobs: - test:twitter_utils:ios - test:parseui:all - test:parse_live_query:all - - package:release + - build:starters fail-fast: false - runs-on: ${{ (matrix.script == 'package:release' && 'macos-11') || 'macos-12' }} + runs-on: macos-12 steps: - uses: actions/checkout@v3 - name: Setup Ruby @@ -68,7 +67,7 @@ jobs: - name: Build-Test run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script }} env: - DEVELOPER_DIR: ${{ (matrix.script == 'package:release' && env.CI_XCODE_11) || env.CI_XCODE_14 }} + DEVELOPER_DIR: ${{ env.CI_XCODE_14 }} - name: Generate Environment Variables if: ${{ always() }} env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d6d6c24f3..80b39d7fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,6 +30,10 @@ For analyzing bugs, creating bug fixes and features we recommend to clone this r ``` bundle exec rake test:ios ``` +5. Ensure the project builds. You can use the [Starter Projects](https://github.com/parse-community/Parse-SDK-iOS-OSX/tree/master/ParseStarterProject) to perform integration tests. + ``` + bundle exec rake build:starters + ``` Check the [Rakefile](Rakefile) and the [GitHub workflows](.github/workflows) for more information. # Bugs diff --git a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/Parse.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 +} diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj index 6515f8336..b048400be 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj @@ -3,167 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 7C605F4A292BC22A00E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F39292BC22300E4B6D2 /* Bolts.framework */; }; - 7C605F4B292BC23000E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605F19292BC22000E4B6D2 /* Parse.framework */; }; + 3917406B2ACCB7B700588AF7 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 3917406A2ACCB7B700588AF7 /* ParseObjC */; }; 814C3AD21B69887B00E307BB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 814C3ACE1B69887B00E307BB /* MainMenu.xib */; }; 814C3AD31B69887B00E307BB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AD01B69887B00E307BB /* Images.xcassets */; }; 81CC85BE1A49F2E00076DE19 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81CC85BD1A49F2E00076DE19 /* AppDelegate.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C605F12292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605F14292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605F16292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605F18292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605F1A292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605F1C292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605F1E292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605F20292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605F22292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605F24292BC22000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605F34292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605F36292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605F38292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605F3A292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605F3C292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605F3E292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605F40292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605F42292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605F44292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605F46292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605F48292BC22300E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 81CC85DE1A49F5340076DE19 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -177,8 +26,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; + 391740692ACCB72C00588AF7 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 814C3ACF1B69887B00E307BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 814C3AD01B69887B00E307BB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 814C3AD11B69887B00E307BB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -191,47 +39,19 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C605F4B292BC23000E4B6D2 /* Parse.framework in Frameworks */, - 7C605F4A292BC22A00E4B6D2 /* Bolts.framework in Frameworks */, + 3917406B2ACCB7B700588AF7 /* ParseObjC in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605F04292BC21F00E4B6D2 /* Products */ = { + 391740682ACCB72C00588AF7 /* Packages */ = { isa = PBXGroup; children = ( - 7C605F13292BC22000E4B6D2 /* Parse.framework */, - 7C605F15292BC22000E4B6D2 /* Parse.framework */, - 7C605F17292BC22000E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605F19292BC22000E4B6D2 /* Parse.framework */, - 7C605F1B292BC22000E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605F1D292BC22000E4B6D2 /* Parse.framework */, - 7C605F1F292BC22000E4B6D2 /* Parse.framework */, - 7C605F21292BC22000E4B6D2 /* Parse.framework */, - 7C605F23292BC22000E4B6D2 /* Parse.framework */, - 7C605F25292BC22000E4B6D2 /* ParseUnitTests-iOS-host.app */, + 391740692ACCB72C00588AF7 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605F27292BC22200E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605F35292BC22300E4B6D2 /* Bolts.framework */, - 7C605F37292BC22300E4B6D2 /* Bolts.framework */, - 7C605F39292BC22300E4B6D2 /* Bolts.framework */, - 7C605F3B292BC22300E4B6D2 /* Bolts.framework */, - 7C605F3D292BC22300E4B6D2 /* Bolts.framework */, - 7C605F3F292BC22300E4B6D2 /* Bolts.framework */, - 7C605F41292BC22300E4B6D2 /* Bolts.framework */, - 7C605F43292BC22300E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605F45292BC22300E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605F47292BC22300E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605F49292BC22300E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 814C3ACD1B69887B00E307BB /* Resources */ = { @@ -246,6 +66,7 @@ 81CC85AF1A49F2E00076DE19 = { isa = PBXGroup; children = ( + 391740682ACCB72C00588AF7 /* Packages */, 81CC85BA1A49F2E00076DE19 /* ParseOSXStarterProject */, 814C3ACD1B69887B00E307BB /* Resources */, 81CC85DC1A49F3DA0076DE19 /* Frameworks */, @@ -273,8 +94,6 @@ 81CC85DC1A49F3DA0076DE19 /* Frameworks */ = { isa = PBXGroup; children = ( - 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */, - 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -296,6 +115,9 @@ dependencies = ( ); name = "ParseOSXStarterProject-Swift"; + packageProductDependencies = ( + 3917406A2ACCB7B700588AF7 /* ParseObjC */, + ); productName = ParseOSXStarterProject; productReference = 81CC85B81A49F2E00076DE19 /* ParseOSXStarterProject-Swift.app */; productType = "com.apple.product-type.application"; @@ -327,16 +149,6 @@ mainGroup = 81CC85AF1A49F2E00076DE19; productRefGroup = 81CC85B91A49F2E00076DE19 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605F27292BC22200E4B6D2 /* Products */; - ProjectRef = 7C605F26292BC22200E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605F04292BC21F00E4B6D2 /* Products */; - ProjectRef = 7C605F03292BC21F00E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81CC85B71A49F2E00076DE19 /* ParseOSXStarterProject-Swift */, @@ -344,156 +156,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605F13292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F12292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F15292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F14292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F17292BC22000E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605F16292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F19292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F18292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F1B292BC22000E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605F1A292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F1D292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F1C292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F1F292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F1E292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F21292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F20292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F23292BC22000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605F22292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F25292BC22000E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605F24292BC22000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F35292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F34292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F37292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F36292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F39292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F38292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F3B292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F3A292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F3D292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F3C292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F3F292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F3E292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F41292BC22300E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605F40292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F43292BC22300E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605F42292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F45292BC22300E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605F44292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F47292BC22300E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605F46292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605F49292BC22300E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605F48292BC22300E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 81CC85B61A49F2E00076DE19 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -625,7 +287,8 @@ MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; }; name = Release; }; @@ -640,7 +303,10 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = Resources/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "ParseOSXStarterProject-Swift"; SWIFT_VERSION = 5.0; @@ -658,7 +324,10 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = Resources/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "ParseOSXStarterProject-Swift"; SWIFT_VERSION = 5.0; @@ -687,6 +356,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 3917406A2ACCB7B700588AF7 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 81CC85B01A49F2E00076DE19 /* Project object */; } diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 8713af992..919434a62 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> 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 new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-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 +} diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift index 788cfa582..07a9512f6 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift @@ -8,8 +8,7 @@ */ import Cocoa - -import Parse +import ParseCore @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { @@ -78,4 +77,4 @@ class AppDelegate: NSObject, NSApplicationDelegate { // func application(application: NSApplication, didReceiveRemoteNotification userInfo: [String : AnyObject]) { // PFAnalytics.trackAppOpened(withRemoteNotificationPayload: userInfo) // } -} \ No newline at end of file +} diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj index e355fb058..c61776eac 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj @@ -3,13 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ + 39CDA1A72ACCBF4A00DF2D18 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CDA1A62ACCBF4A00DF2D18 /* ParseObjC */; }; 7C605EFC292BC1D500E4B6D2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605EFB292BC1D500E4B6D2 /* AppKit.framework */; }; - 7C605EFD292BC1D900E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605ECA292BC1CC00E4B6D2 /* Parse.framework */; }; - 7C605EFE292BC1DD00E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605EEA292BC1CE00E4B6D2 /* Bolts.framework */; }; 814C3ADD1B6988E300E307BB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AD61B6988E300E307BB /* Credits.rtf */; }; 814C3ADE1B6988E300E307BB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AD81B6988E300E307BB /* InfoPlist.strings */; }; 814C3ADF1B6988E300E307BB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 814C3ADA1B6988E300E307BB /* MainMenu.xib */; }; @@ -17,156 +16,6 @@ 978816D3163F1D6F00C613D2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 978816D2163F1D6F00C613D2 /* AppDelegate.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C605EC3292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605EC5292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605EC7292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605EC9292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605ECB292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605ECD292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605ECF292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605ED1292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605ED3292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605ED5292BC1CC00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605EE5292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605EE7292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605EE9292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605EEB292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605EED292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605EEF292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605EF1292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605EF3292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605EF5292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605EF7292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605EF9292BC1CE00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 978818AB1641C2A800C613D2 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -180,8 +29,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; + 39CDA1A52ACCBE5C00DF2D18 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 7C605EFB292BC1D500E4B6D2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 814C3AD71B6988E300E307BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; 814C3AD91B6988E300E307BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -198,8 +46,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C605EFE292BC1DD00E4B6D2 /* Bolts.framework in Frameworks */, - 7C605EFD292BC1D900E4B6D2 /* Parse.framework in Frameworks */, + 39CDA1A72ACCBF4A00DF2D18 /* ParseObjC in Frameworks */, 7C605EFC292BC1D500E4B6D2 /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -207,39 +54,12 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605EB5292BC1CB00E4B6D2 /* Products */ = { + 39CDA1A42ACCBE5C00DF2D18 /* Packages */ = { isa = PBXGroup; children = ( - 7C605EC4292BC1CC00E4B6D2 /* Parse.framework */, - 7C605EC6292BC1CC00E4B6D2 /* Parse.framework */, - 7C605EC8292BC1CC00E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605ECA292BC1CC00E4B6D2 /* Parse.framework */, - 7C605ECC292BC1CC00E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605ECE292BC1CC00E4B6D2 /* Parse.framework */, - 7C605ED0292BC1CC00E4B6D2 /* Parse.framework */, - 7C605ED2292BC1CC00E4B6D2 /* Parse.framework */, - 7C605ED4292BC1CC00E4B6D2 /* Parse.framework */, - 7C605ED6292BC1CC00E4B6D2 /* ParseUnitTests-iOS-host.app */, + 39CDA1A52ACCBE5C00DF2D18 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605ED8292BC1CE00E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605EE6292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EE8292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EEA292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EEC292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EEE292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EF0292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EF2292BC1CE00E4B6D2 /* Bolts.framework */, - 7C605EF4292BC1CE00E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605EF6292BC1CE00E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605EF8292BC1CE00E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605EFA292BC1CE00E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 814C3AD51B6988E300E307BB /* Resources */ = { @@ -255,6 +75,7 @@ 978816B0163F1D6F00C613D2 = { isa = PBXGroup; children = ( + 39CDA1A42ACCBE5C00DF2D18 /* Packages */, 978816C5163F1D6F00C613D2 /* ParseOSXStarterProject */, 814C3AD51B6988E300E307BB /* Resources */, 978816BE163F1D6F00C613D2 /* Frameworks */, @@ -274,8 +95,6 @@ isa = PBXGroup; children = ( 7C605EFB292BC1D500E4B6D2 /* AppKit.framework */, - 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */, - 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -316,6 +135,9 @@ dependencies = ( ); name = ParseOSXStarterProject; + packageProductDependencies = ( + 39CDA1A62ACCBF4A00DF2D18 /* ParseObjC */, + ); productName = ParseOSXStarterProject; productReference = 978816BB163F1D6F00C613D2 /* ParseOSXStarterProject.app */; productType = "com.apple.product-type.application"; @@ -340,16 +162,6 @@ mainGroup = 978816B0163F1D6F00C613D2; productRefGroup = 978816BC163F1D6F00C613D2 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605ED8292BC1CE00E4B6D2 /* Products */; - ProjectRef = 7C605ED7292BC1CE00E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605EB5292BC1CB00E4B6D2 /* Products */; - ProjectRef = 7C605EB4292BC1CB00E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 978816BA163F1D6F00C613D2 /* ParseOSXStarterProject */, @@ -357,156 +169,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605EC4292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605EC3292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EC6292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605EC5292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EC8292BC1CC00E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605EC7292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ECA292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605EC9292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ECC292BC1CC00E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605ECB292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ECE292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605ECD292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ED0292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605ECF292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ED2292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605ED1292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ED4292BC1CC00E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605ED3292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605ED6292BC1CC00E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605ED5292BC1CC00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EE6292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EE5292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EE8292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EE7292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EEA292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EE9292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EEC292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EEB292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EEE292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EED292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EF0292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EEF292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EF2292BC1CE00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605EF1292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EF4292BC1CE00E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605EF3292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EF6292BC1CE00E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605EF5292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EF8292BC1CE00E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605EF7292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605EFA292BC1CE00E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605EF9292BC1CE00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 978816B9163F1D6F00C613D2 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -567,6 +229,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -617,6 +280,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -656,6 +320,7 @@ 978816DA163F1D6F00C613D2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -673,6 +338,7 @@ 978816DB163F1D6F00C613D2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -709,6 +375,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39CDA1A62ACCBF4A00DF2D18 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 978816B2163F1D6F00C613D2 /* Project object */; } diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata index f20f6ef7c..919434a62 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> 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 new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.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 +} diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m index 94c118032..3c1cd5cfd 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m @@ -9,7 +9,7 @@ #import "AppDelegate.h" -#import +@import ParseCore; @implementation AppDelegate diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj index bf303c5ce..165991067 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj @@ -3,12 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 53; objects = { /* Begin PBXBuildFile section */ - 7C605E5B292BC08B00E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E24292BC03600E4B6D2 /* Parse.framework */; }; - 7C605E5C292BC08F00E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E46292BC04200E4B6D2 /* Bolts.framework */; }; + 39CDA1BC2ACCBFAD00DF2D18 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39CDA1BB2ACCBFAD00DF2D18 /* ParseObjC */; }; 7C605E60292BC0E300E4B6D2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E5F292BC0E300E4B6D2 /* AudioToolbox.framework */; }; 7C605E62292BC0EC00E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E61292BC0EC00E4B6D2 /* SystemConfiguration.framework */; }; 7C605E64292BC0EF00E4B6D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E63292BC0EF00E4B6D2 /* libsqlite3.tbd */; }; @@ -19,159 +18,8 @@ 81BA814D1A49DA1800E65899 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81BA814C1A49DA1800E65899 /* ViewController.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C605E23292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605E25292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605E27292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605E29292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605E2B292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605E2D292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605E2F292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605E31292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605E33292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605E35292BC03600E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605E45292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605E47292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605E49292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605E4B292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605E4D292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605E4F292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605E51292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605E53292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605E55292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605E57292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605E59292BC04200E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; + 39CDA1BA2ACCBF9300DF2D18 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 7C605E5F292BC0E300E4B6D2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 7C605E61292BC0EC00E4B6D2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 7C605E63292BC0EF00E4B6D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; @@ -191,48 +39,20 @@ files = ( 7C605E64292BC0EF00E4B6D2 /* libsqlite3.tbd in Frameworks */, 7C605E62292BC0EC00E4B6D2 /* SystemConfiguration.framework in Frameworks */, + 39CDA1BC2ACCBFAD00DF2D18 /* ParseObjC in Frameworks */, 7C605E60292BC0E300E4B6D2 /* AudioToolbox.framework in Frameworks */, - 7C605E5C292BC08F00E4B6D2 /* Bolts.framework in Frameworks */, - 7C605E5B292BC08B00E4B6D2 /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605E15292BC03600E4B6D2 /* Products */ = { + 39CDA1B92ACCBF9300DF2D18 /* Packages */ = { isa = PBXGroup; children = ( - 7C605E24292BC03600E4B6D2 /* Parse.framework */, - 7C605E26292BC03600E4B6D2 /* Parse.framework */, - 7C605E28292BC03600E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605E2A292BC03600E4B6D2 /* Parse.framework */, - 7C605E2C292BC03600E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605E2E292BC03600E4B6D2 /* Parse.framework */, - 7C605E30292BC03600E4B6D2 /* Parse.framework */, - 7C605E32292BC03600E4B6D2 /* Parse.framework */, - 7C605E34292BC03600E4B6D2 /* Parse.framework */, - 7C605E36292BC03600E4B6D2 /* ParseUnitTests-iOS-host.app */, + 39CDA1BA2ACCBF9300DF2D18 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605E38292BC04200E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605E46292BC04200E4B6D2 /* Bolts.framework */, - 7C605E48292BC04200E4B6D2 /* Bolts.framework */, - 7C605E4A292BC04200E4B6D2 /* Bolts.framework */, - 7C605E4C292BC04200E4B6D2 /* Bolts.framework */, - 7C605E4E292BC04200E4B6D2 /* Bolts.framework */, - 7C605E50292BC04200E4B6D2 /* Bolts.framework */, - 7C605E52292BC04200E4B6D2 /* Bolts.framework */, - 7C605E54292BC04200E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605E56292BC04200E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605E58292BC04200E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605E5A292BC04200E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 814C3AC51B69877600E307BB /* Resources */ = { @@ -248,6 +68,7 @@ 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( + 39CDA1B92ACCBF9300DF2D18 /* Packages */, 81BA81471A49DA1800E65899 /* ParseStarterProject */, 814C3AC51B69877600E307BB /* Resources */, 81BA816A1A49DB5600E65899 /* Frameworks */, @@ -279,8 +100,6 @@ 7C605E63292BC0EF00E4B6D2 /* libsqlite3.tbd */, 7C605E61292BC0EC00E4B6D2 /* SystemConfiguration.framework */, 7C605E5F292BC0E300E4B6D2 /* AudioToolbox.framework */, - 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */, - 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -301,6 +120,9 @@ dependencies = ( ); name = "ParseStarterProject-Swift"; + packageProductDependencies = ( + 39CDA1BB2ACCBFAD00DF2D18 /* ParseObjC */, + ); productName = ParseStarterProject; productReference = 81BA81451A49DA1800E65899 /* ParseStarterProject-Swift.app */; productType = "com.apple.product-type.application"; @@ -311,8 +133,9 @@ 81BA813D1A49DA1800E65899 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = Parse; TargetAttributes = { 81BA81441A49DA1800E65899 = { @@ -332,16 +155,6 @@ mainGroup = 81BA813C1A49DA1800E65899; productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605E38292BC04200E4B6D2 /* Products */; - ProjectRef = 7C605E37292BC04200E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605E15292BC03600E4B6D2 /* Products */; - ProjectRef = 7C605E14292BC03600E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81BA81441A49DA1800E65899 /* ParseStarterProject-Swift */, @@ -349,156 +162,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605E24292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E23292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E26292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E25292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E28292BC03600E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605E27292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E2A292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E29292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E2C292BC03600E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605E2B292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E2E292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E2D292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E30292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E2F292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E32292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E31292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E34292BC03600E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605E33292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E36292BC03600E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605E35292BC03600E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E46292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E45292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E48292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E47292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E4A292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E49292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E4C292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E4B292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E4E292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E4D292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E50292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E4F292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E52292BC04200E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E51292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E54292BC04200E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605E53292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E56292BC04200E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605E55292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E58292BC04200E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605E57292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E5A292BC04200E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605E59292BC04200E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 81BA81431A49DA1800E65899 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -541,6 +204,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -559,6 +223,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -583,7 +248,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -596,6 +261,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -614,6 +280,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -631,10 +298,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; 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; }; @@ -644,13 +312,17 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", ); INFOPLIST_FILE = Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "ParseStarterProject-Swift"; SWIFT_VERSION = 5.0; @@ -661,13 +333,17 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", ); INFOPLIST_FILE = Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "ParseStarterProject-Swift"; SWIFT_VERSION = 5.0; @@ -696,6 +372,13 @@ defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39CDA1BB2ACCBFAD00DF2D18 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 81BA813D1A49DA1800E65899 /* Project object */; } diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata index b162c5ad7..919434a62 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> 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 new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-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 +} diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift index 6abcded63..69b522685 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift @@ -10,7 +10,7 @@ import UIKit import UserNotifications -import Parse +import ParseCore // If you want to use any of the UI components, uncomment this line // import ParseUI diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift index 92689cef6..512b4fbd6 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/ViewController.swift @@ -8,7 +8,7 @@ */ import UIKit -import Parse +import ParseCore class ViewController: UIViewController { diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj index 8667844f1..552283547 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj @@ -3,21 +3,20 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ 09ABC07F13A1D52D009C3FCF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 09ABC07E13A1D52D009C3FCF /* main.m */; }; 09ABC08213A1D52D009C3FCF /* ParseStarterProjectAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 09ABC08113A1D52D009C3FCF /* ParseStarterProjectAppDelegate.m */; }; 09ABC08813A1D52E009C3FCF /* ParseStarterProjectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 09ABC08713A1D52E009C3FCF /* ParseStarterProjectViewController.m */; }; - 7C605DE0292BBEEF00E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DCC292BBED500E4B6D2 /* Parse.framework */; }; + 39173FEA2AC64DDD00588AF7 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39173FE92AC64DDD00588AF7 /* ParseObjC */; }; 7C605DE2292BBFB600E4B6D2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DE1292BBFB600E4B6D2 /* AudioToolbox.framework */; }; 7C605DE4292BBFC300E4B6D2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DE3292BBFC300E4B6D2 /* UIKit.framework */; }; 7C605DE6292BBFC700E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DE5292BBFC700E4B6D2 /* SystemConfiguration.framework */; }; 7C605DE8292BBFCD00E4B6D2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DE7292BBFCD00E4B6D2 /* Security.framework */; }; 7C605DEA292BBFD000E4B6D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DE9292BBFD000E4B6D2 /* libsqlite3.tbd */; }; 7C605DEC292BBFEE00E4B6D2 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DEB292BBFEE00E4B6D2 /* StoreKit.framework */; }; - 7C605E11292BC00200E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605DFC292BBFFD00E4B6D2 /* Bolts.framework */; }; 7C605E13292BC00B00E4B6D2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605E12292BC00B00E4B6D2 /* CoreLocation.framework */; }; 814C3ABD1B69864600E307BB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AB21B69864600E307BB /* Default-568h@2x.png */; }; 814C3ABE1B69864600E307BB /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AB31B69864600E307BB /* Default.png */; }; @@ -27,156 +26,6 @@ 814C3AC21B69864600E307BB /* ParseStarterProjectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AB91B69864600E307BB /* ParseStarterProjectViewController.xib */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C605DCB292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605DCD292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605DCF292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605DD1292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605DD3292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605DD5292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605DD7292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605DD9292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605DDB292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605DDD292BBED500E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605DFB292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605DFD292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605DFF292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605E01292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605E03292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605E05292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605E07292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605E09292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605E0B292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605E0D292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605E0F292BBFFD00E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 09ABC06D13A1D52D009C3FCF /* ParseStarterProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseStarterProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; 09ABC07E13A1D52D009C3FCF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -184,14 +33,13 @@ 09ABC08113A1D52D009C3FCF /* ParseStarterProjectAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ParseStarterProjectAppDelegate.m; sourceTree = ""; }; 09ABC08613A1D52E009C3FCF /* ParseStarterProjectViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseStarterProjectViewController.h; sourceTree = ""; }; 09ABC08713A1D52E009C3FCF /* ParseStarterProjectViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ParseStarterProjectViewController.m; sourceTree = ""; }; - 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; + 39173FE82AC64B7100588AF7 /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ../../..; sourceTree = ""; }; 7C605DE1292BBFB600E4B6D2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 7C605DE3292BBFC300E4B6D2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 7C605DE5292BBFC700E4B6D2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 7C605DE7292BBFCD00E4B6D2 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 7C605DE9292BBFD000E4B6D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 7C605DEB292BBFEE00E4B6D2 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; - 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; 7C605E12292BC00B00E4B6D2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 814C3AB21B69864600E307BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 814C3AB31B69864600E307BB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; @@ -208,14 +56,13 @@ buildActionMask = 2147483647; files = ( 7C605E13292BC00B00E4B6D2 /* CoreLocation.framework in Frameworks */, - 7C605E11292BC00200E4B6D2 /* Bolts.framework in Frameworks */, 7C605DEC292BBFEE00E4B6D2 /* StoreKit.framework in Frameworks */, + 39173FEA2AC64DDD00588AF7 /* ParseObjC in Frameworks */, 7C605DEA292BBFD000E4B6D2 /* libsqlite3.tbd in Frameworks */, 7C605DE8292BBFCD00E4B6D2 /* Security.framework in Frameworks */, 7C605DE6292BBFC700E4B6D2 /* SystemConfiguration.framework in Frameworks */, 7C605DE4292BBFC300E4B6D2 /* UIKit.framework in Frameworks */, 7C605DE2292BBFB600E4B6D2 /* AudioToolbox.framework in Frameworks */, - 7C605DE0292BBEEF00E4B6D2 /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -225,6 +72,7 @@ 09ABC06213A1D52D009C3FCF = { isa = PBXGroup; children = ( + 39173FE72AC64B7100588AF7 /* Packages */, 09ABC07713A1D52D009C3FCF /* ParseStarterProject */, 814C3AB11B69864600E307BB /* Resources */, 09ABC07013A1D52D009C3FCF /* Frameworks */, @@ -250,8 +98,6 @@ 7C605DE5292BBFC700E4B6D2 /* SystemConfiguration.framework */, 7C605DE3292BBFC300E4B6D2 /* UIKit.framework */, 7C605DE1292BBFB600E4B6D2 /* AudioToolbox.framework */, - 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */, - 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -278,39 +124,12 @@ name = "Other Sources"; sourceTree = ""; }; - 7C605DBD292BBED500E4B6D2 /* Products */ = { + 39173FE72AC64B7100588AF7 /* Packages */ = { isa = PBXGroup; children = ( - 7C605DCC292BBED500E4B6D2 /* Parse.framework */, - 7C605DCE292BBED500E4B6D2 /* Parse.framework */, - 7C605DD0292BBED500E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605DD2292BBED500E4B6D2 /* Parse.framework */, - 7C605DD4292BBED500E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605DD6292BBED500E4B6D2 /* Parse.framework */, - 7C605DD8292BBED500E4B6D2 /* Parse.framework */, - 7C605DDA292BBED500E4B6D2 /* Parse.framework */, - 7C605DDC292BBED500E4B6D2 /* Parse.framework */, - 7C605DDE292BBED500E4B6D2 /* ParseUnitTests-iOS-host.app */, + 39173FE82AC64B7100588AF7 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605DEE292BBFFD00E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605DFC292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605DFE292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E00292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E02292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E04292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E06292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E08292BBFFD00E4B6D2 /* Bolts.framework */, - 7C605E0A292BBFFD00E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605E0C292BBFFD00E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605E0E292BBFFD00E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605E10292BBFFD00E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 814C3AB11B69864600E307BB /* Resources */ = { @@ -341,6 +160,9 @@ dependencies = ( ); name = ParseStarterProject; + packageProductDependencies = ( + 39173FE92AC64DDD00588AF7 /* ParseObjC */, + ); productName = ParseStarterProject; productReference = 09ABC06D13A1D52D009C3FCF /* ParseStarterProject.app */; productType = "com.apple.product-type.application"; @@ -369,16 +191,6 @@ mainGroup = 09ABC06213A1D52D009C3FCF; productRefGroup = 09ABC06E13A1D52D009C3FCF /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605DEE292BBFFD00E4B6D2 /* Products */; - ProjectRef = 7C605DED292BBFFD00E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605DBD292BBED500E4B6D2 /* Products */; - ProjectRef = 7C605DBC292BBED500E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 09ABC06C13A1D52D009C3FCF /* ParseStarterProject */, @@ -386,156 +198,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605DCC292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DCB292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DCE292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DCD292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DD0292BBED500E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605DCF292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DD2292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DD1292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DD4292BBED500E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605DD3292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DD6292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DD5292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DD8292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DD7292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DDA292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DD9292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DDC292BBED500E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605DDB292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DDE292BBED500E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605DDD292BBED500E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DFC292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605DFB292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605DFE292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605DFD292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E00292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605DFF292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E02292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E01292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E04292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E03292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E06292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E05292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E08292BBFFD00E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605E07292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E0A292BBFFD00E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605E09292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E0C292BBFFD00E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605E0B292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E0E292BBFFD00E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605E0D292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605E10292BBFFD00E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605E0F292BBFFD00E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 09ABC06B13A1D52D009C3FCF /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -598,6 +260,7 @@ 09ABC08C13A1D52E009C3FCF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -636,6 +299,7 @@ 09ABC08D13A1D52E009C3FCF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_MODULES = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -729,6 +393,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39173FE92AC64DDD00588AF7 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 09ABC06413A1D52D009C3FCF /* Project object */; } diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 0fc58ae10..919434a62 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> 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 new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.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 +} diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m index 3395f01ad..f072fa6e7 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +@import ParseCore; // If you want to use any of the UI components, uncomment this line // #import diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectViewController.m b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectViewController.m index 296e4e4f1..1ae28a44a 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectViewController.m +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectViewController.m @@ -9,8 +9,6 @@ #import "ParseStarterProjectViewController.h" -#import - @implementation ParseStarterProjectViewController #pragma mark - diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/ExtensionDelegate.swift b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/ExtensionDelegate.swift index 4c5bc4d66..6bf41d3b6 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/ExtensionDelegate.swift +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/ExtensionDelegate.swift @@ -8,7 +8,7 @@ */ import WatchKit -import Parse +import ParseCore class ExtensionDelegate: NSObject, WKExtensionDelegate { diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/InterfaceController.swift b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/InterfaceController.swift index ed8beaa1b..dbd7c9774 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/InterfaceController.swift +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/InterfaceController.swift @@ -9,7 +9,7 @@ import WatchKit import Foundation -import Parse +import ParseCore class InterfaceController: WKInterfaceController { diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index 1e9bff080..ae818a40c 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -3,17 +3,15 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 7C605FEA292BC43800E4B6D2 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FD5292BC43400E4B6D2 /* Bolts.framework */; }; - 7C605FEB292BC43D00E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FB3292BC43000E4B6D2 /* Parse.framework */; }; - 7C605FEC292BC47200E4B6D2 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FC1292BC43000E4B6D2 /* Parse.framework */; }; - 7C605FFC292BC5B400E4B6D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FF8292BC5A200E4B6D2 /* libsqlite3.tbd */; }; + 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 */; }; 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */; }; 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFF292BD3DB00E4B6D2 /* SystemConfiguration.framework */; }; - 7C606001292BD3DE00E4B6D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C605FFA292BC5A900E4B6D2 /* libsqlite3.tbd */; }; 81411DD11BC3658C0004BE84 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81411DCF1BC3658C0004BE84 /* Interface.storyboard */; }; 81411DD31BC3658C0004BE84 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 81411DD21BC3658C0004BE84 /* Assets.xcassets */; }; 81411DDA1BC3658D0004BE84 /* ParseStarter Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 81411DD91BC3658C0004BE84 /* ParseStarter Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -34,153 +32,6 @@ remoteGlobalIDString = 81411DCC1BC3658C0004BE84; remoteInfo = ParseStarter; }; - 7C605FB2292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C605FB4292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C605FB6292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C605FB8292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C605FBA292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C605FBC292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C605FBE292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C605FC0292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C605FC2292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C605FC4292BC43000E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C605FD4292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 7C605FD6292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 7C605FD8292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 7C605FDA292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 7C605FDC292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 7C605FDE292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 7C605FE0292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 7C605FE2292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 7C605FE4292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 7C605FE6292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 7C605FE8292BC43400E4B6D2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; 81411DDB1BC3658D0004BE84 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 81BA813D1A49DA1800E65899 /* Project object */; @@ -216,10 +67,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../../../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../../../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; - 7C605FF8292BC5A200E4B6D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS9.1.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 7C605FFA292BC5A900E4B6D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; + 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; }; 7C605FFF292BD3DB00E4B6D2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 81411DCD1BC3658C0004BE84 /* ParseStarter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseStarter.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -243,8 +93,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C605FFC292BC5B400E4B6D2 /* libsqlite3.tbd in Frameworks */, - 7C605FEC292BC47200E4B6D2 /* Parse.framework in Frameworks */, + 391740372AC65DCB00588AF7 /* ParseObjC in Frameworks */, + 391740352AC65D0000588AF7 /* libsqlite3.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -252,50 +102,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C606001292BD3DE00E4B6D2 /* libsqlite3.tbd in Frameworks */, + 391740322AC65AD500588AF7 /* libsqlite3.tbd in Frameworks */, 7C606000292BD3DC00E4B6D2 /* SystemConfiguration.framework in Frameworks */, 7C605FFE292BD3D700E4B6D2 /* AudioToolbox.framework in Frameworks */, - 7C605FEB292BC43D00E4B6D2 /* Parse.framework in Frameworks */, - 7C605FEA292BC43800E4B6D2 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 7C605FA4292BC43000E4B6D2 /* Products */ = { + 3917402F2AC6591E00588AF7 /* Packages */ = { isa = PBXGroup; children = ( - 7C605FB3292BC43000E4B6D2 /* Parse.framework */, - 7C605FB5292BC43000E4B6D2 /* Parse.framework */, - 7C605FB7292BC43000E4B6D2 /* ParseUnitTests-iOS.xctest */, - 7C605FB9292BC43000E4B6D2 /* Parse.framework */, - 7C605FBB292BC43000E4B6D2 /* ParseUnitTests-macOS.xctest */, - 7C605FBD292BC43000E4B6D2 /* Parse.framework */, - 7C605FBF292BC43000E4B6D2 /* Parse.framework */, - 7C605FC1292BC43000E4B6D2 /* Parse.framework */, - 7C605FC3292BC43000E4B6D2 /* Parse.framework */, - 7C605FC5292BC43000E4B6D2 /* ParseUnitTests-iOS-host.app */, + 391740302AC6591E00588AF7 /* Parse-SDK-iOS-OSX */, ); - name = Products; - sourceTree = ""; - }; - 7C605FC7292BC43400E4B6D2 /* Products */ = { - isa = PBXGroup; - children = ( - 7C605FD5292BC43400E4B6D2 /* Bolts.framework */, - 7C605FD7292BC43400E4B6D2 /* Bolts.framework */, - 7C605FD9292BC43400E4B6D2 /* Bolts.framework */, - 7C605FDB292BC43400E4B6D2 /* Bolts.framework */, - 7C605FDD292BC43400E4B6D2 /* Bolts.framework */, - 7C605FDF292BC43400E4B6D2 /* Bolts.framework */, - 7C605FE1292BC43400E4B6D2 /* Bolts.framework */, - 7C605FE3292BC43400E4B6D2 /* BoltsTests-iOS.xctest */, - 7C605FE5292BC43400E4B6D2 /* BoltsTests-OSX.xctest */, - 7C605FE7292BC43400E4B6D2 /* BoltsTests-tvOS.xctest */, - 7C605FE9292BC43400E4B6D2 /* BoltsTestUI.app */, - ); - name = Products; + name = Packages; sourceTree = ""; }; 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */ = { @@ -349,6 +170,7 @@ 81BA813C1A49DA1800E65899 = { isa = PBXGroup; children = ( + 3917402F2AC6591E00588AF7 /* Packages */, 81BA81471A49DA1800E65899 /* ParseStarterProject */, 81411DCE1BC3658C0004BE84 /* ParseStarter WatchApp */, 81411DDD1BC3658D0004BE84 /* ParseStarter WatchExtension */, @@ -381,12 +203,10 @@ 81BA816A1A49DB5600E65899 /* Frameworks */ = { isa = PBXGroup; children = ( + 391740312AC65A2000588AF7 /* libsqlite3.tbd */, + 391740332AC65C6700588AF7 /* libsqlite3.tbd */, 7C605FFF292BD3DB00E4B6D2 /* SystemConfiguration.framework */, 7C605FFD292BD3D700E4B6D2 /* AudioToolbox.framework */, - 7C605FF8292BC5A200E4B6D2 /* libsqlite3.tbd */, - 7C605FFA292BC5A900E4B6D2 /* libsqlite3.tbd */, - 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */, - 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -424,6 +244,9 @@ dependencies = ( ); name = "ParseStarter Extension"; + packageProductDependencies = ( + 391740362AC65DCB00588AF7 /* ParseObjC */, + ); productName = "ParseStarter Extension"; productReference = 81411DD91BC3658C0004BE84 /* ParseStarter Extension.appex */; productType = "com.apple.product-type.watchkit2-extension"; @@ -481,16 +304,6 @@ mainGroup = 81BA813C1A49DA1800E65899; productRefGroup = 81BA81461A49DA1800E65899 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C605FC7292BC43400E4B6D2 /* Products */; - ProjectRef = 7C605FC6292BC43400E4B6D2 /* Bolts.xcodeproj */; - }, - { - ProductGroup = 7C605FA4292BC43000E4B6D2 /* Products */; - ProjectRef = 7C605FA3292BC43000E4B6D2 /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81BA81441A49DA1800E65899 /* ParseStarter-Swift */, @@ -500,156 +313,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C605FB3292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FB2292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FB5292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FB4292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FB7292BC43000E4B6D2 /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C605FB6292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FB9292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FB8292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FBB292BC43000E4B6D2 /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C605FBA292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FBD292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FBC292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FBF292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FBE292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FC1292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FC0292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FC3292BC43000E4B6D2 /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C605FC2292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FC5292BC43000E4B6D2 /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C605FC4292BC43000E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FD5292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FD4292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FD7292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FD6292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FD9292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FD8292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FDB292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FDA292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FDD292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FDC292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FDF292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FDE292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FE1292BC43400E4B6D2 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 7C605FE0292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FE3292BC43400E4B6D2 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 7C605FE2292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FE5292BC43400E4B6D2 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 7C605FE4292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FE7292BC43400E4B6D2 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 7C605FE6292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C605FE9292BC43400E4B6D2 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 7C605FE8292BC43400E4B6D2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 81411DCB1BC3658C0004BE84 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -741,7 +404,11 @@ FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "ParseStarter Extension/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -760,7 +427,11 @@ FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "ParseStarter Extension/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -908,7 +579,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; 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; }; @@ -922,7 +594,10 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter; PRODUCT_NAME = "ParseStarter-Swift"; SWIFT_VERSION = 5.0; @@ -937,7 +612,10 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter; PRODUCT_NAME = "ParseStarter-Swift"; SWIFT_VERSION = 5.0; @@ -984,6 +662,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 391740362AC65DCB00588AF7 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 81BA813D1A49DA1800E65899 /* Project object */; } diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata index b162c5ad7..919434a62 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> 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 new file mode 100644 index 000000000..9466f0275 --- /dev/null +++ b/ParseStarterProject/watchOS/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 +} diff --git a/Rakefile b/Rakefile index 3261c8042..d66374755 100644 --- a/Rakefile +++ b/Rakefile @@ -12,6 +12,7 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_framework_task' script_folder = File.expand_path(File.dirname(__FILE__)) build_folder = File.join(script_folder, 'build') +starters_folder = File.join(script_folder, 'ParseStarterProject') release_folder = File.join(build_folder, 'release') bolts_build_folder = File.join(script_folder, 'Carthage', 'Build') bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC') @@ -19,6 +20,8 @@ ios_simulator = 'platform="iOS Simulator",name="iPhone 14"' tvos_simulator = 'platform="tvOS Simulator",name="Apple TV"' watchos_simulator = 'platform="watchOS Simulator",name="Apple Watch Series 8 (45mm)"' +build_action = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD]; + module Constants require 'plist' @@ -317,7 +320,7 @@ namespace :build do t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -340,7 +343,7 @@ namespace :build do t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -351,6 +354,151 @@ namespace :build do end end end + + namespace :ios_starters do + task :all do + Rake::Task['build:ios_starters:objc'].invoke + Rake::Task['build:ios_starters:swift'].invoke + end + + task :objc do + project = 'ParseStarterProject' + ios_starters_folder = File.join(starters_folder, 'iOS', project) + task = XCTask::BuildTask.new do |t| + t.directory = ios_starters_folder + t.project = "#{project}.xcodeproj" + t.scheme = project + t.configuration = 'Debug' + t.sdk = 'iphonesimulator' + t.destinations = [ios_simulator] + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'iOS Starter Project Failed!' + exit(1) + end + end + + task :swift do + project = 'ParseStarterProject-Swift' + ios_starters_folder = File.join(starters_folder, 'iOS', project) + task = XCTask::BuildTask.new do |t| + t.directory = ios_starters_folder + t.project = "#{project}.xcodeproj" + t.scheme = project + t.configuration = 'Debug' + t.sdk = 'iphonesimulator' + t.destinations = [ios_simulator] + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'iOS Starter Project Failed!' + exit(1) + end + end + end + + namespace :macos_starters do + task :all do + Rake::Task['build:macos_starters:objc'].invoke + Rake::Task['build:macos_starters:swift'].invoke + end + + task :objc do + macos_starter_folder = File.join(starters_folder, 'OSX', 'ParseOSXStarterProject') + task = XCTask::BuildTask.new do |t| + t.directory = macos_starter_folder + t.project = 'ParseOSXStarterProject.xcodeproj' + t.scheme = 'ParseOSXStarterProject' + t.configuration = 'Debug' + t.sdk = 'macosx' + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'macOS Starter Project Failed!' + exit(1) + end + end + + task :swift do + macos_starter_folder = File.join(starters_folder, 'OSX', 'ParseOSXStarterProject-Swift') + task = XCTask::BuildTask.new do |t| + t.directory = macos_starter_folder + t.project = 'ParseOSXStarterProject-Swift.xcodeproj' + t.scheme = 'ParseOSXStarterProject-Swift' + t.configuration = 'Debug' + t.sdk = 'macosx' + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'macOS Starter Project Failed!' + exit(1) + end + end + end + + namespace :tvos_starters do + task :all do + # TODO: tvos objc starter + # Rake::Task['build:tvos_starters:objc'].invoke + Rake::Task['build:tvos_starters:swift'].invoke + end + + task :swift do + tvos_starter_folder = File.join(starters_folder, 'tvOS', 'ParseStarterProject-Swift') + task = XCTask::BuildTask.new do |t| + t.directory = tvos_starter_folder + t.project = 'ParseStarter-Swift.xcodeproj' + t.scheme = 'ParseStarter' + t.configuration = 'Debug' + t.destinations = [tvos_simulator] + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'tvOS Starter Project Failed!' + exit(1) + end + end + end + + namespace :watchos_starters 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 + end + + task :swift do + watchos_starter_folder = File.join(starters_folder, 'watchOS', 'ParseStarterProject-Swift') + task = XCTask::BuildTask.new do |t| + t.directory = watchos_starter_folder + t.project = 'ParseStarter-Swift.xcodeproj' + t.scheme = 'ParseStarter' + t.configuration = 'Debug' + t.destinations = [watchos_simulator] + t.actions = build_action + t.formatter = XCTask::BuildFormatter::XCPRETTY + end + unless task.execute + puts 'watchOS Starter Project Failed!' + exit(1) + end + end + end + + 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 + end end namespace :package do @@ -672,7 +820,7 @@ namespace :test do t.destinations = [ios_simulator] t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -693,7 +841,7 @@ namespace :test do t.destinations = [ios_simulator] t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -723,7 +871,7 @@ namespace :test do t.destinations = [ios_simulator] t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -744,7 +892,7 @@ namespace :test do t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -765,7 +913,7 @@ namespace :test do t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -785,7 +933,7 @@ namespace :test do t.configuration = 'Debug' - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] + t.actions = build_action t.formatter = XCTask::BuildFormatter::XCPRETTY end @@ -796,81 +944,4 @@ namespace :test do end end end - - - desc 'Run Starter Project Tests' - task :starters do |_| - results = [] - ios_schemes = ['ParseStarterProject', - 'ParseStarterProject-Swift'] - osx_schemes = ['ParseOSXStarterProject', - 'ParseOSXStarterProject-Swift'] - tvos_schemes = ['ParseStarter-tvOS'] - watchos_schemes = ['ParseWatchStarter-watchOS'] - - ios_schemes.each do |scheme| - task = XCTask::BuildTask.new do |t| - t.directory = script_folder - t.workspace = 'Parse.xcworkspace' - - t.scheme = scheme - t.configuration = 'Debug' - t.sdk = 'iphonesimulator' - t.destinations = [ios_simulator] - - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] - t.formatter = XCTask::BuildFormatter::XCPRETTY - end - results << task.execute - end - osx_schemes.each do |scheme| - task = XCTask::BuildTask.new do |t| - t.directory = script_folder - t.workspace = 'Parse.xcworkspace' - - t.scheme = scheme - t.configuration = 'Debug' - t.sdk = 'macosx' - - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] - t.formatter = XCTask::BuildFormatter::XCPRETTY - end - results << task.execute - end - watchos_schemes.each do |scheme| - task = XCTask::BuildTask.new do |t| - t.directory = script_folder - t.workspace = 'Parse.xcworkspace' - - t.scheme = scheme - t.configuration = 'Debug' - t.destinations = [ios_simulator] - - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] - t.formatter = XCTask::BuildFormatter::XCPRETTY - end - results << task.execute - end - tvos_schemes.each do |scheme| - task = XCTask::BuildTask.new do |t| - t.directory = script_folder - t.workspace = 'Parse.xcworkspace' - - t.scheme = scheme - t.configuration = 'Debug' - t.destinations = [tvos_simulator] - - t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] - t.formatter = XCTask::BuildFormatter::XCPRETTY - end - results << task.execute - end - - results.each do |result| - unless result - puts 'Starter Project Tests Failed!' - exit(1) - end - end - end end