diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f19a7bcc6..74bda152f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,18 +61,6 @@ jobs: - name: Bundle Install if: steps.cache-gems.outputs.cache-hit != 'true' run: bundle install - - name: Cache Carthage - uses: actions/cache@v3 - id: carthage-cache - with: - path: Carthage - key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }} - restore-keys: | - ${{ runner.os }}-carthage- - - name: Carthage - if: ${{ steps.carthage-cache.outputs.cache-hit != 'true' }} - run: | - carthage bootstrap --use-xcframeworks - name: Build-Test run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script == 'xcode15' && 'build:starters' || matrix.script }} env: diff --git a/.gitmodules b/.gitmodules index 5117672ff..1eeefc253 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "Vendor/xctoolchain"] path = Vendor/xctoolchain url = https://github.com/parse-community/xctoolchain.git -[submodule "Carthage/Checkouts/Bolts-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/facebook-ios-sdk"] - path = Carthage/Checkouts/facebook-ios-sdk - url = https://github.com/facebook/facebook-ios-sdk.git diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 7fa27b6c7..000000000 --- a/Cartfile +++ /dev/null @@ -1,2 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" ~> 1.9.1 -github "facebook/facebook-ios-sdk" == 15.1.0 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index cea6faaa8..000000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.1" -github "facebook/facebook-ios-sdk" "v15.1.0" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 74b67b3b8..000000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74b67b3b8be76a570cdbe193771927971f26e304 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index 7fd8a930a..000000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7fd8a930a5b2c940a22efafe0e214ed0df671312 diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 04bcfee6e..b82eb80e6 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -7,8 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 39A6B6772AD8EA8000123017 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39A6B6762AD8EA8000123017 /* ParseObjC */; }; + 39A6B6792AD8EB1D00123017 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39A6B6782AD8EB1D00123017 /* ParseObjC */; }; 39E22AB62AD0655300D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AB52AD0655300D9AE5C /* OCMock */; }; 39E22ABC2AD0657F00D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22ABB2AD0657F00D9AE5C /* OCMock */; }; + 39E24A0D2AD214540014357C /* Bolts in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A0C2AD214540014357C /* Bolts */; }; + 39E24A0F2AD214720014357C /* Bolts in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A0E2AD214720014357C /* Bolts */; }; + 39E24A112AD214810014357C /* Bolts in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A102AD214810014357C /* Bolts */; }; + 39E24A132AD214980014357C /* Bolts in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A122AD214980014357C /* Bolts */; }; + 39E24A152AD214A40014357C /* Bolts in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A142AD214A40014357C /* Bolts */; }; 4030936B1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4030936C1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4030936D1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2699,7 +2706,6 @@ B14117071E5D078E00F70D7A /* PFFileUploadResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */; }; B14117081E5D078E00F70D7A /* PFFileUploadResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */; }; B14117091E5D078E00F70D7A /* PFFileUploadResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */; }; - BC150D7325A89F9C0092B00E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; @@ -2824,125 +2830,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 4A13518320281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED94291BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; - 4A13518520281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 4A13518720281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ED946E1BE14B5200795F05; - remoteInfo = "Bolts-macOS"; - }; - 4A13518920281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA021BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 4A13518B20281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 4A13518D20281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8178F99C1BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 4A13518F20281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 4A13519120281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; - remoteInfo = "BoltsTests-iOS"; - }; - 4A13519320281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; - remoteInfo = "BoltsTests-macOS"; - }; - 4A13519520281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F5AFCA131BA752770076E927; - remoteInfo = "BoltsTests-tvOS"; - }; - 4A13519720281768000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1EC3016018CDAA8400D06D07; - remoteInfo = BoltsTestUI; - }; - 4A1351F420281933000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8178F9841BB0F87700AD289D; - remoteInfo = "Bolts-watchOS"; - }; - 4A1351F62028193F000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = F5AFC9EA1BA752750076E927; - remoteInfo = "Bolts-tvOS"; - }; - 4AA8ABFE20CEFC9A009306DD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 819573D91C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; - 4AA8AC0720CEFCA2009306DD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1D5D7DA61BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 4AA8AC0920CEFCAD009306DD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81E94D521C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 4ACBE7EA2151FCBF008DFAAF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8EDDA62817E17DDC00655F8A; - remoteInfo = "Bolts-macOS"; - }; 4AE33A2C1F5451B20088DCA0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 09D33641139C54930098E916 /* Project object */; @@ -2950,27 +2837,6 @@ remoteGlobalIDString = 4AE33A0A1F5451AD0088DCA0; remoteInfo = "ParseUnitTests-iOS-host"; }; - 811167461B8402DA003CB026 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 09D33641139C54930098E916 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 97010FAB1630B18F00AB761E; - remoteInfo = "Parse-OSX"; - }; - 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 09D33641139C54930098E916 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 81C3821B19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - BCAFF88A25A88C4F00B95DFC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81ED94111BE147CF00795F05; - remoteInfo = "Bolts-iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3004,7 +2870,6 @@ 09EEA1351435143500E3A3FA /* ParseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseInternal.h; sourceTree = ""; }; 403093691C81F0B200CF09F8 /* PFQueryConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFQueryConstants.h; sourceTree = ""; }; 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFQueryConstants.m; sourceTree = ""; }; - 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; 4ABF398B1F54592100BBA75A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 4AE33A0B1F5451AD0088DCA0 /* ParseUnitTests-iOS-host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUnitTests-iOS-host.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 4AE33A0D1F5451AD0088DCA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -3580,6 +3445,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E24A152AD214A40014357C /* Bolts in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3587,6 +3453,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E24A112AD214810014357C /* Bolts in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3595,6 +3462,7 @@ buildActionMask = 2147483647; files = ( 7CE6ABE0292074CC0054D9D2 /* SystemConfiguration.framework in Frameworks */, + 39A6B6792AD8EB1D00123017 /* ParseObjC in Frameworks */, 7CE6ABDE292074C70054D9D2 /* AudioToolbox.framework in Frameworks */, 39E22AB62AD0655300D9AE5C /* OCMock in Frameworks */, 7CE6ABDC292074C10054D9D2 /* libsqlite3.tbd in Frameworks */, @@ -3605,6 +3473,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39A6B6772AD8EA8000123017 /* ParseObjC in Frameworks */, 39E22ABC2AD0657F00D9AE5C /* OCMock in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3613,6 +3482,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E24A0D2AD214540014357C /* Bolts in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3620,6 +3490,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E24A132AD214980014357C /* Bolts in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3643,10 +3514,10 @@ files = ( 7CE6ABEC292078180054D9D2 /* AppKit.framework in Frameworks */, 7CE6ABEA292077360054D9D2 /* CoreLocation.framework in Frameworks */, + 39E24A0F2AD214720014357C /* Bolts in Frameworks */, 7CE6ABE9292077310054D9D2 /* Security.framework in Frameworks */, 7CE6ABE82920772D0054D9D2 /* SystemConfiguration.framework in Frameworks */, 7CE6ABE7292077240054D9D2 /* libsqlite3.tbd in Frameworks */, - BC150D7325A89F9C0092B00E /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3811,7 +3682,6 @@ 7CE6ABDF292074CC0054D9D2 /* SystemConfiguration.framework */, 7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */, 7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */, - 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -3825,24 +3695,6 @@ name = Views; sourceTree = ""; }; - 4A13517620281768000F5FD5 /* Products */ = { - isa = PBXGroup; - children = ( - 4A13518420281768000F5FD5 /* Bolts.framework */, - 4A13518620281768000F5FD5 /* Bolts.framework */, - 4A13518820281768000F5FD5 /* Bolts.framework */, - 4A13518A20281768000F5FD5 /* Bolts.framework */, - 4A13518C20281768000F5FD5 /* Bolts.framework */, - 4A13518E20281768000F5FD5 /* Bolts.framework */, - 4A13519020281768000F5FD5 /* Bolts.framework */, - 4A13519220281768000F5FD5 /* BoltsTests-iOS.xctest */, - 4A13519420281768000F5FD5 /* BoltsTests-OSX.xctest */, - 4A13519620281768000F5FD5 /* BoltsTests-tvOS.xctest */, - 4A13519820281768000F5FD5 /* BoltsTestUI.app */, - ); - name = Products; - sourceTree = ""; - }; 4AE33A0C1F5451AD0088DCA0 /* ParseUnitTests-iOS-host */ = { isa = PBXGroup; children = ( @@ -6787,9 +6639,11 @@ buildRules = ( ); dependencies = ( - 4A1351F520281933000F5FD5 /* PBXTargetDependency */, ); name = "Parse-watchOS"; + packageProductDependencies = ( + 39E24A142AD214A40014357C /* Bolts */, + ); productName = "Parse-iOS"; productReference = 810156691BB3832700D7C7BD /* Parse.framework */; productType = "com.apple.product-type.framework"; @@ -6807,9 +6661,11 @@ buildRules = ( ); dependencies = ( - 4A1351F72028193F000F5FD5 /* PBXTargetDependency */, ); name = "Parse-tvOS"; + packageProductDependencies = ( + 39E24A102AD214810014357C /* Bolts */, + ); productName = "Parse-iOS"; productReference = 815F24151BD04D150054659F /* Parse.framework */; productType = "com.apple.product-type.framework"; @@ -6826,12 +6682,12 @@ buildRules = ( ); dependencies = ( - 8111674C1B8402DF003CB026 /* PBXTargetDependency */, 4AE33A2D1F5451B20088DCA0 /* PBXTargetDependency */, ); name = "ParseUnitTests-iOS"; packageProductDependencies = ( 39E22AB52AD0655300D9AE5C /* OCMock */, + 39A6B6782AD8EB1D00123017 /* ParseObjC */, ); productName = ParseTests; productReference = 816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */; @@ -6849,11 +6705,11 @@ buildRules = ( ); dependencies = ( - 811167471B8402DA003CB026 /* PBXTargetDependency */, ); name = "ParseUnitTests-macOS"; packageProductDependencies = ( 39E22ABB2AD0657F00D9AE5C /* OCMock */, + 39A6B6762AD8EA8000123017 /* ParseObjC */, ); productName = ParseTests; productReference = 81C09F861AF97A490043B49C /* ParseUnitTests-macOS.xctest */; @@ -6872,9 +6728,11 @@ buildRules = ( ); dependencies = ( - BCAFF88B25A88C4F00B95DFC /* PBXTargetDependency */, ); name = "Parse-iOS"; + packageProductDependencies = ( + 39E24A0C2AD214540014357C /* Bolts */, + ); productName = "Parse-iOS"; productReference = 81C3821C19CCA89E0066284A /* Parse.framework */; productType = "com.apple.product-type.framework"; @@ -6892,9 +6750,11 @@ buildRules = ( ); dependencies = ( - 4AA8AC0820CEFCA2009306DD /* PBXTargetDependency */, ); name = "Parse-iOS-Dynamic"; + packageProductDependencies = ( + 39E24A122AD214980014357C /* Bolts */, + ); productName = "Parse-iOS"; productReference = 81C5845D1C3B0A98000063C6 /* Parse.framework */; productType = "com.apple.product-type.framework"; @@ -6912,7 +6772,6 @@ buildRules = ( ); dependencies = ( - 4AA8AC0A20CEFCAD009306DD /* PBXTargetDependency */, ); name = "Parse-tvOS-Dynamic"; productName = "Parse-iOS"; @@ -6932,7 +6791,6 @@ buildRules = ( ); dependencies = ( - 4AA8ABFF20CEFC9A009306DD /* PBXTargetDependency */, ); name = "Parse-watchOS-Dynamic"; productName = "Parse-iOS"; @@ -6952,9 +6810,11 @@ buildRules = ( ); dependencies = ( - 4ACBE7EB2151FCBF008DFAAF /* PBXTargetDependency */, ); name = "Parse-macOS"; + packageProductDependencies = ( + 39E24A0E2AD214720014357C /* Bolts */, + ); productName = ParseMac; productReference = 97010FAC1630B18F00AB761E /* Parse.framework */; productType = "com.apple.product-type.framework"; @@ -6970,7 +6830,7 @@ ORGANIZATIONNAME = "Parse Inc."; TargetAttributes = { 4AE33A0A1F5451AD0088DCA0 = { - CreatedOnToolsVersion = 9.0; + CreatedOnToolsVersion = 12.0; ProvisioningStyle = Automatic; }; 810155051BB3832700D7C7BD = { @@ -7000,15 +6860,10 @@ mainGroup = 09D3363F139C54930098E916; packageReferences = ( 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */, ); productRefGroup = 09D3364B139C54940098E916 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 4A13517620281768000F5FD5 /* Products */; - ProjectRef = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81C3821B19CCA89E0066284A /* Parse-iOS */, @@ -7025,86 +6880,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 4A13518420281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518320281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13518620281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518520281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13518820281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518720281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13518A20281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518920281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13518C20281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518B20281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13518E20281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518D20281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13519020281768000F5FD5 /* Bolts.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bolts.framework; - remoteRef = 4A13518F20281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13519220281768000F5FD5 /* BoltsTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-iOS.xctest"; - remoteRef = 4A13519120281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13519420281768000F5FD5 /* BoltsTests-OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-OSX.xctest"; - remoteRef = 4A13519320281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13519620281768000F5FD5 /* BoltsTests-tvOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "BoltsTests-tvOS.xctest"; - remoteRef = 4A13519520281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A13519820281768000F5FD5 /* BoltsTestUI.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = BoltsTestUI.app; - remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4AE33A091F5451AD0088DCA0 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -8657,58 +8432,12 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4A1351F520281933000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-watchOS"; - targetProxy = 4A1351F420281933000F5FD5 /* PBXContainerItemProxy */; - }; - 4A1351F72028193F000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-tvOS"; - targetProxy = 4A1351F62028193F000F5FD5 /* PBXContainerItemProxy */; - }; - 4AA8ABFF20CEFC9A009306DD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-watchOS-Dynamic"; - targetProxy = 4AA8ABFE20CEFC9A009306DD /* PBXContainerItemProxy */; - }; - 4AA8AC0820CEFCA2009306DD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS-Dynamic"; - targetProxy = 4AA8AC0720CEFCA2009306DD /* PBXContainerItemProxy */; - }; - 4AA8AC0A20CEFCAD009306DD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-tvOS-Dynamic"; - targetProxy = 4AA8AC0920CEFCAD009306DD /* PBXContainerItemProxy */; - }; - 4ACBE7EB2151FCBF008DFAAF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-macOS"; - targetProxy = 4ACBE7EA2151FCBF008DFAAF /* PBXContainerItemProxy */; - }; 4AE33A2D1F5451B20088DCA0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; target = 4AE33A0A1F5451AD0088DCA0 /* ParseUnitTests-iOS-host */; targetProxy = 4AE33A2C1F5451B20088DCA0 /* PBXContainerItemProxy */; }; - 811167471B8402DA003CB026 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 97010FAB1630B18F00AB761E /* Parse-macOS */; - targetProxy = 811167461B8402DA003CB026 /* PBXContainerItemProxy */; - }; - 8111674C1B8402DF003CB026 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - platformFilter = ios; - target = 81C3821B19CCA89E0066284A /* Parse-iOS */; - targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */; - }; - BCAFF88B25A88C4F00B95DFC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS"; - targetProxy = BCAFF88A25A88C4F00B95DFC /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -9182,9 +8911,25 @@ revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89; }; }; + 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/parse-community/Bolts-ObjC.git"; + requirement = { + kind = exactVersion; + version = 1.10.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 39A6B6762AD8EA8000123017 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39A6B6782AD8EB1D00123017 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; 39E22AB52AD0655300D9AE5C /* OCMock */ = { isa = XCSwiftPackageProductDependency; package = 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; @@ -9195,6 +8940,31 @@ package = 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; productName = OCMock; }; + 39E24A0C2AD214540014357C /* Bolts */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */; + productName = Bolts; + }; + 39E24A0E2AD214720014357C /* Bolts */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */; + productName = Bolts; + }; + 39E24A102AD214810014357C /* Bolts */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */; + productName = Bolts; + }; + 39E24A122AD214980014357C /* Bolts */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */; + productName = Bolts; + }; + 39E24A142AD214A40014357C /* Bolts */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A0B2AD214540014357C /* XCRemoteSwiftPackageReference "Bolts-ObjC" */; + productName = Bolts; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 09D33641139C54930098E916 /* Project object */; diff --git a/Parse/Parse/Source/PFAnalytics.h b/Parse/Parse/Source/PFAnalytics.h index 44ce0065d..e80368691 100644 --- a/Parse/Parse/Source/PFAnalytics.h +++ b/Parse/Parse/Source/PFAnalytics.h @@ -9,11 +9,7 @@ #import -#if __has_include() -#import -#else -#import "BFTask.h" -#endif +@import Bolts; #import "PFConstants.h" diff --git a/Parse/Tests/Other/OCMock/OCMock+Parse.m b/Parse/Tests/Other/OCMock/OCMock+Parse.m index 88026c0d2..a5ba432a3 100644 --- a/Parse/Tests/Other/OCMock/OCMock+Parse.m +++ b/Parse/Tests/Other/OCMock/OCMock+Parse.m @@ -9,7 +9,7 @@ #import "OCMock+Parse.h" -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFCommandRunning.h" diff --git a/Parse/Tests/Other/Swift/SwiftSubclass.swift b/Parse/Tests/Other/Swift/SwiftSubclass.swift index ce93195c6..7563283cc 100644 --- a/Parse/Tests/Other/Swift/SwiftSubclass.swift +++ b/Parse/Tests/Other/Swift/SwiftSubclass.swift @@ -9,7 +9,7 @@ import Foundation -import Parse +import ParseCore @objc public class SwiftSubclass: PFObject, PFSubclassing { diff --git a/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m b/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m index b775f992d..42babae40 100644 --- a/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m +++ b/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m @@ -9,7 +9,7 @@ #import "PFTestCase.h" -@import Bolts.BFTask; +@import Bolts; #import "PFTestSwizzlingUtilities.h" diff --git a/Parse/Tests/Unit/AnalyticsUnitTests.m b/Parse/Tests/Unit/AnalyticsUnitTests.m index ca04bdaba..66f0db362 100644 --- a/Parse/Tests/Unit/AnalyticsUnitTests.m +++ b/Parse/Tests/Unit/AnalyticsUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFAnalyticsController.h" #import "PFUnitTestCase.h" diff --git a/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m b/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m index b53ba885a..5775dfc86 100644 --- a/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m +++ b/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "PFAnonymousAuthenticationProvider.h" #import "PFTestCase.h" diff --git a/Parse/Tests/Unit/CloudCodeControllerTests.m b/Parse/Tests/Unit/CloudCodeControllerTests.m index e484eb758..517991a32 100644 --- a/Parse/Tests/Unit/CloudCodeControllerTests.m +++ b/Parse/Tests/Unit/CloudCodeControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "OCMock+Parse.h" #import "PFCloudCodeController.h" diff --git a/Parse/Tests/Unit/ConfigControllerTests.m b/Parse/Tests/Unit/ConfigControllerTests.m index cdfaa401b..8cad73b44 100644 --- a/Parse/Tests/Unit/ConfigControllerTests.m +++ b/Parse/Tests/Unit/ConfigControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "OCMock+Parse.h" #import "PFCommandResult.h" diff --git a/Parse/Tests/Unit/ConfigUnitTests.m b/Parse/Tests/Unit/ConfigUnitTests.m index 5e90aea1b..2bf960db3 100644 --- a/Parse/Tests/Unit/ConfigUnitTests.m +++ b/Parse/Tests/Unit/ConfigUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFConfigController.h" #import "PFConfig_Private.h" diff --git a/Parse/Tests/Unit/CurrentConfigControllerTests.m b/Parse/Tests/Unit/CurrentConfigControllerTests.m index 7caad1411..79780f3e0 100644 --- a/Parse/Tests/Unit/CurrentConfigControllerTests.m +++ b/Parse/Tests/Unit/CurrentConfigControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "BFTask+Private.h" #import "PFCommandResult.h" diff --git a/Parse/Tests/Unit/DefaultACLControllerTests.m b/Parse/Tests/Unit/DefaultACLControllerTests.m index 17521fa34..2503dfea2 100644 --- a/Parse/Tests/Unit/DefaultACLControllerTests.m +++ b/Parse/Tests/Unit/DefaultACLControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFACLPrivate.h" #import "PFCoreManager.h" diff --git a/Parse/Tests/Unit/ExtensionDataSharingTests.m b/Parse/Tests/Unit/ExtensionDataSharingTests.m index 6d4a0e74c..f9b937861 100644 --- a/Parse/Tests/Unit/ExtensionDataSharingTests.m +++ b/Parse/Tests/Unit/ExtensionDataSharingTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "PFExtensionDataSharingTestHelper.h" #import "PFFileManager.h" diff --git a/Parse/Tests/Unit/FileControllerTests.m b/Parse/Tests/Unit/FileControllerTests.m index f5500670c..93c030a2d 100644 --- a/Parse/Tests/Unit/FileControllerTests.m +++ b/Parse/Tests/Unit/FileControllerTests.m @@ -9,9 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; -@import Bolts.BFTaskCompletionSource; +@import Bolts; #import "PFCommandResult.h" #import "PFCommandRunning.h" diff --git a/Parse/Tests/Unit/FileUnitTests.m b/Parse/Tests/Unit/FileUnitTests.m index e44d4310a..43eb25215 100644 --- a/Parse/Tests/Unit/FileUnitTests.m +++ b/Parse/Tests/Unit/FileUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCoreManager.h" #import "PFFileController.h" diff --git a/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m b/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m index ac57ec53c..53c9f67e3 100644 --- a/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m +++ b/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "BFTask+Private.h" #import "PFObject.h" diff --git a/Parse/Tests/Unit/ObjectOfflineTests.m b/Parse/Tests/Unit/ObjectOfflineTests.m index 7e58e45cf..d560903c7 100644 --- a/Parse/Tests/Unit/ObjectOfflineTests.m +++ b/Parse/Tests/Unit/ObjectOfflineTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "PFObject.h" #import "PFOfflineStore.h" diff --git a/Parse/Tests/Unit/OfflineQueryControllerTests.m b/Parse/Tests/Unit/OfflineQueryControllerTests.m index 4996e2070..5d3900d7d 100644 --- a/Parse/Tests/Unit/OfflineQueryControllerTests.m +++ b/Parse/Tests/Unit/OfflineQueryControllerTests.m @@ -9,8 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; +@import Bolts; #import "OCMock+Parse.h" #import "PFCommandResult.h" diff --git a/Parse/Tests/Unit/PurchaseControllerTests.m b/Parse/Tests/Unit/PurchaseControllerTests.m index 1236b24ea..d204b24fe 100644 --- a/Parse/Tests/Unit/PurchaseControllerTests.m +++ b/Parse/Tests/Unit/PurchaseControllerTests.m @@ -11,8 +11,7 @@ #import -@import Bolts.BFExecutor; -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFCommandRunning.h" diff --git a/Parse/Tests/Unit/PurchaseUnitTests.m b/Parse/Tests/Unit/PurchaseUnitTests.m index 0287b4506..fd5960114 100644 --- a/Parse/Tests/Unit/PurchaseUnitTests.m +++ b/Parse/Tests/Unit/PurchaseUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCommandRunning.h" #import "PFFileManager.h" diff --git a/Parse/Tests/Unit/PushChannelsControllerTests.m b/Parse/Tests/Unit/PushChannelsControllerTests.m index 4ee116712..6a1c38cf8 100644 --- a/Parse/Tests/Unit/PushChannelsControllerTests.m +++ b/Parse/Tests/Unit/PushChannelsControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCurrentInstallationController.h" #import "PFInstallation.h" diff --git a/Parse/Tests/Unit/PushControllerTests.m b/Parse/Tests/Unit/PushControllerTests.m index f7afa7586..84d7aaebd 100644 --- a/Parse/Tests/Unit/PushControllerTests.m +++ b/Parse/Tests/Unit/PushControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFCommandRunning.h" diff --git a/Parse/Tests/Unit/PushUnitTests.m b/Parse/Tests/Unit/PushUnitTests.m index 5569ffd34..8a16b34a3 100644 --- a/Parse/Tests/Unit/PushUnitTests.m +++ b/Parse/Tests/Unit/PushUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCoreManager.h" #import "PFCurrentInstallationController.h" diff --git a/Parse/Tests/Unit/QueryCachedControllerTests.m b/Parse/Tests/Unit/QueryCachedControllerTests.m index 7dcc6d89b..452db085c 100644 --- a/Parse/Tests/Unit/QueryCachedControllerTests.m +++ b/Parse/Tests/Unit/QueryCachedControllerTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCachedQueryController.h" #import "PFCommandResult.h" diff --git a/Parse/Tests/Unit/QueryControllerUnitTests.m b/Parse/Tests/Unit/QueryControllerUnitTests.m index 6dc70aafc..9058bd9eb 100644 --- a/Parse/Tests/Unit/QueryControllerUnitTests.m +++ b/Parse/Tests/Unit/QueryControllerUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; +@import Bolts; #import "BFTask+Private.h" #import "PFCommandResult.h" diff --git a/Parse/Tests/Unit/QueryUnitTests.m b/Parse/Tests/Unit/QueryUnitTests.m index 0fe42af81..d45540e34 100644 --- a/Parse/Tests/Unit/QueryUnitTests.m +++ b/Parse/Tests/Unit/QueryUnitTests.m @@ -9,7 +9,7 @@ #import -@import Bolts.BFTask; +@import Bolts; #import "PFCoreManager.h" #import "PFMacros.h" diff --git a/Parse/Tests/Unit/RoleUnitTests.m b/Parse/Tests/Unit/RoleUnitTests.m index 94bd2aa34..d6c1b3e6b 100644 --- a/Parse/Tests/Unit/RoleUnitTests.m +++ b/Parse/Tests/Unit/RoleUnitTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "PFMockURLProtocol.h" #import "PFRelation.h" diff --git a/Parse/Tests/Unit/SQLiteDatabaseTest.m b/Parse/Tests/Unit/SQLiteDatabaseTest.m index 813258d52..6c02c5b26 100644 --- a/Parse/Tests/Unit/SQLiteDatabaseTest.m +++ b/Parse/Tests/Unit/SQLiteDatabaseTest.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "BFTask+Private.h" #import "PFFileManager.h" diff --git a/Parse/Tests/Unit/URLSessionCommandRunnerTests.m b/Parse/Tests/Unit/URLSessionCommandRunnerTests.m index 01eae6f6d..11372992b 100644 --- a/Parse/Tests/Unit/URLSessionCommandRunnerTests.m +++ b/Parse/Tests/Unit/URLSessionCommandRunnerTests.m @@ -9,8 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFCommandRunningConstants.h" diff --git a/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m b/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m index 44c5e9cde..95dfdaeda 100644 --- a/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m +++ b/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m @@ -9,8 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFConstants.h" diff --git a/Parse/Tests/Unit/URLSessionTests.m b/Parse/Tests/Unit/URLSessionTests.m index 778bd351a..9148affde 100644 --- a/Parse/Tests/Unit/URLSessionTests.m +++ b/Parse/Tests/Unit/URLSessionTests.m @@ -9,8 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFMacros.h" diff --git a/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m b/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m index ad649abcd..a2e3b1cfd 100644 --- a/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m +++ b/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m @@ -9,8 +9,7 @@ #import -@import Bolts.BFCancellationTokenSource; -@import Bolts.BFTask; +@import Bolts; #import "PFCommandResult.h" #import "PFTestCase.h" diff --git a/Parse/Tests/Unit/UserControllerTests.m b/Parse/Tests/Unit/UserControllerTests.m index c9b6801d7..7b76b051e 100644 --- a/Parse/Tests/Unit/UserControllerTests.m +++ b/Parse/Tests/Unit/UserControllerTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "OCMock+Parse.h" #import "PFCommandResult.h" diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj index 5ef8d28eb..17cdc61e2 100644 --- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj +++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj @@ -7,6 +7,16 @@ objects = { /* Begin PBXBuildFile section */ + 39E248D12AD1C2510014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248D02AD1C2510014357C /* ParseObjC */; }; + 39E248D32AD1C25B0014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248D22AD1C25B0014357C /* ParseObjC */; }; + 39E24A202AD219600014357C /* FacebookAEM in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A1F2AD219600014357C /* FacebookAEM */; }; + 39E24A222AD219600014357C /* FacebookBasics in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A212AD219600014357C /* FacebookBasics */; }; + 39E24A242AD219600014357C /* FacebookCore in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A232AD219600014357C /* FacebookCore */; }; + 39E24A262AD219600014357C /* FacebookLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A252AD219600014357C /* FacebookLogin */; }; + 39E24A2A2AD219DC0014357C /* FacebookAEM in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A292AD219DC0014357C /* FacebookAEM */; }; + 39E24A2C2AD219DC0014357C /* FacebookBasics in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A2B2AD219DC0014357C /* FacebookBasics */; }; + 39E24A2E2AD219DC0014357C /* FacebookCore in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A2D2AD219DC0014357C /* FacebookCore */; }; + 39E24A302AD219DC0014357C /* FacebookTV in Frameworks */ = {isa = PBXBuildFile; productRef = 39E24A2F2AD219DC0014357C /* FacebookTV */; }; 7C5F7D27292101490035B219 /* PFFacebookUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7D1E292101370035B219 /* PFFacebookUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C5F7D28292101490035B219 /* ParseFacebookUtilsV4.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7D1B292101370035B219 /* ParseFacebookUtilsV4.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C5F7D29292101490035B219 /* PFFacebookAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7D1F292101370035B219 /* PFFacebookAuthenticationProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -29,134 +39,8 @@ 7C5F7D422921015E0035B219 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7D1A292101370035B219 /* PFFacebookUtils.m */; }; 7C5F7DF4292105800035B219 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7DF3292105800035B219 /* libc++.tbd */; }; 7C5F7DF6292105880035B219 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7DF5292105880035B219 /* Accelerate.framework */; }; - 7C77D01C2929115F00C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; }; - 7C77D01D2929115F00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D01E2929115F00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; }; - 7C77D01F2929115F00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D01B2929114E00C4D90E /* FBSDKTVOSKit.xcframework */; }; - 7C77D0222929118500C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; }; - 7C77D0232929118500C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D0242929118500C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; }; - 7C77D0252929118500C4D90E /* FBSDKLoginKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */; }; - 7C77D0282929119500C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; }; - 7C77D0292929119500C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D02A2929119500C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; }; - 7C77D02B2929119500C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D01B2929114E00C4D90E /* FBSDKTVOSKit.xcframework */; }; - 7C78240429290CA600E9364E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; }; - 7C78240529290CA600E9364E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C78240629290CA600E9364E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; }; - 7C78240729290CA600E9364E /* FBSDKLoginKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */; }; - 844D0B9F2959AE120026E74D /* FBAEMKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA02959AE120026E74D /* FBSDKCoreKit_Basics.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA12959AE120026E74D /* FBSDKCoreKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA22959AE130026E74D /* FBSDKLoginKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA32959AE1B0026E74D /* FBAEMKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA42959AE1B0026E74D /* FBSDKCoreKit_Basics.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA52959AE1B0026E74D /* FBSDKCoreKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA62959AE1B0026E74D /* FBSDKLoginKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 844D0BA72959AE1B0026E74D /* FBSDKTVOSKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D01B2929114E00C4D90E /* FBSDKTVOSKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C77CFB429290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C77CFB629290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C77CFB829290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C77CFBA29290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C77CFBC29290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C77CFBE29290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C77CFC029290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C77CFC229290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C77CFC429290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C77CFC629290F4100C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C77CFC829290F4500C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C3821B19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C77D0192929110300C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 815F22AF1BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C77D0202929117E00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C77D0262929118E00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C5845F1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ BCCC20E1271F1BAB003C9D03 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -164,10 +48,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 844D0B9F2959AE120026E74D /* FBAEMKit.xcframework in Embed Frameworks */, - 844D0BA02959AE120026E74D /* FBSDKCoreKit_Basics.xcframework in Embed Frameworks */, - 844D0BA12959AE120026E74D /* FBSDKCoreKit.xcframework in Embed Frameworks */, - 844D0BA22959AE130026E74D /* FBSDKLoginKit.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -178,11 +58,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 844D0BA32959AE1B0026E74D /* FBAEMKit.xcframework in Embed Frameworks */, - 844D0BA42959AE1B0026E74D /* FBSDKCoreKit_Basics.xcframework in Embed Frameworks */, - 844D0BA52959AE1B0026E74D /* FBSDKCoreKit.xcframework in Embed Frameworks */, - 844D0BA62959AE1B0026E74D /* FBSDKLoginKit.xcframework in Embed Frameworks */, - 844D0BA72959AE1B0026E74D /* FBSDKTVOSKit.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -190,6 +65,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 39E248C92AD1C23F0014357C /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 4AAEAA75200C020E00AA7479 /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA90200C022300AA7479 /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA92200C025100AA7479 /* ParseFacebookUtilsV4-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-iOS-Dynamic.xcconfig"; sourceTree = ""; }; @@ -204,12 +80,6 @@ 7C5F7D24292101370035B219 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = ""; }; 7C5F7DF3292105800035B219 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; }; 7C5F7DF5292105880035B219 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; }; - 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; - 7C77D01B2929114E00C4D90E /* FBSDKTVOSKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKTVOSKit.xcframework; path = ../Carthage/Build/FBSDKTVOSKit.xcframework; sourceTree = ""; }; - 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit.xcframework; path = ../Carthage/Build/FBSDKCoreKit.xcframework; sourceTree = ""; }; - 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit_Basics.xcframework; path = ../Carthage/Build/FBSDKCoreKit_Basics.xcframework; sourceTree = ""; }; - 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKLoginKit.xcframework; path = ../Carthage/Build/FBSDKLoginKit.xcframework; sourceTree = ""; }; - 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBAEMKit.xcframework; path = ../Carthage/Build/FBAEMKit.xcframework; sourceTree = ""; }; 8121EA9F1D39862400AC0B02 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; 8121EAA11D39862400AC0B02 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = ""; }; 8121EAA21D39862400AC0B02 /* macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macOS.xcconfig; sourceTree = ""; }; @@ -233,10 +103,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D0222929118500C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D0232929118500C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D0242929118500C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D0252929118500C4D90E /* FBSDKLoginKit.xcframework in Frameworks */, 7C5F7DF6292105880035B219 /* Accelerate.framework in Frameworks */, 7C5F7DF4292105800035B219 /* libc++.tbd in Frameworks */, ); @@ -246,10 +112,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D0282929119500C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D0292929119500C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D02A2929119500C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D02B2929119500C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -257,10 +119,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D01C2929115F00C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D01D2929115F00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D01E2929115F00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D01F2929115F00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */, + 39E24A2C2AD219DC0014357C /* FacebookBasics in Frameworks */, + 39E24A2A2AD219DC0014357C /* FacebookAEM in Frameworks */, + 39E248D32AD1C25B0014357C /* ParseObjC in Frameworks */, + 39E24A302AD219DC0014357C /* FacebookTV in Frameworks */, + 39E24A2E2AD219DC0014357C /* FacebookCore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,10 +131,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C78240429290CA600E9364E /* FBAEMKit.xcframework in Frameworks */, - 7C78240529290CA600E9364E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C78240629290CA600E9364E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C78240729290CA600E9364E /* FBSDKLoginKit.xcframework in Frameworks */, + 39E24A222AD219600014357C /* FacebookBasics in Frameworks */, + 39E24A202AD219600014357C /* FacebookAEM in Frameworks */, + 39E248D12AD1C2510014357C /* ParseObjC in Frameworks */, + 39E24A262AD219600014357C /* FacebookLogin in Frameworks */, + 39E24A242AD219600014357C /* FacebookCore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -292,6 +156,7 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + 39E248C82AD1C23F0014357C /* Packages */, F52CD63A1B58383C0051AB86 /* Configurations */, 813DFC7E1AB2510300F25A08 /* ParseFacebookUtils */, 0867D69AFE84028FC02AAC07 /* Frameworks */, @@ -306,16 +171,18 @@ children = ( 7C5F7DF5292105880035B219 /* Accelerate.framework */, 7C5F7DF3292105800035B219 /* libc++.tbd */, - 7C78240329290C9B00E9364E /* FBAEMKit.xcframework */, - 7C78240129290C9A00E9364E /* FBSDKCoreKit_Basics.xcframework */, - 7C78240029290C9A00E9364E /* FBSDKCoreKit.xcframework */, - 7C78240229290C9B00E9364E /* FBSDKLoginKit.xcframework */, - 7C77D01B2929114E00C4D90E /* FBSDKTVOSKit.xcframework */, - 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; }; + 39E248C82AD1C23F0014357C /* Packages */ = { + isa = PBXGroup; + children = ( + 39E248C92AD1C23F0014357C /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 7C5F7D19292101370035B219 /* Source */ = { isa = PBXGroup; children = ( @@ -338,23 +205,6 @@ path = Resources; sourceTree = ""; }; - 7C77CFA629290F4000C4D90E /* Products */ = { - isa = PBXGroup; - children = ( - 7C77CFB529290F4100C4D90E /* Parse.framework */, - 7C77CFB729290F4100C4D90E /* Parse.framework */, - 7C77CFB929290F4100C4D90E /* ParseUnitTests-iOS.xctest */, - 7C77CFBB29290F4100C4D90E /* Parse.framework */, - 7C77CFBD29290F4100C4D90E /* ParseUnitTests-macOS.xctest */, - 7C77CFBF29290F4100C4D90E /* Parse.framework */, - 7C77CFC129290F4100C4D90E /* Parse.framework */, - 7C77CFC329290F4100C4D90E /* Parse.framework */, - 7C77CFC529290F4100C4D90E /* Parse.framework */, - 7C77CFC729290F4100C4D90E /* ParseUnitTests-iOS-host.app */, - ); - name = Products; - sourceTree = ""; - }; 8121EA9E1D39862400AC0B02 /* Shared */ = { isa = PBXGroup; children = ( @@ -479,7 +329,6 @@ buildRules = ( ); dependencies = ( - 7C77D0212929117E00C4D90E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-iOS-Dynamic"; packageProductDependencies = ( @@ -502,7 +351,6 @@ buildRules = ( ); dependencies = ( - 7C77D0272929118E00C4D90E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-tvOS-Dynamic"; packageProductDependencies = ( @@ -525,9 +373,15 @@ buildRules = ( ); dependencies = ( - 7C77D01A2929110300C4D90E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-tvOS"; + packageProductDependencies = ( + 39E248D22AD1C25B0014357C /* ParseObjC */, + 39E24A292AD219DC0014357C /* FacebookAEM */, + 39E24A2B2AD219DC0014357C /* FacebookBasics */, + 39E24A2D2AD219DC0014357C /* FacebookCore */, + 39E24A2F2AD219DC0014357C /* FacebookTV */, + ); productName = Breakpad; productReference = 81FE7F8B1C17790400E6BD34 /* ParseFacebookUtilsV4.framework */; productType = "com.apple.product-type.framework"; @@ -546,10 +400,14 @@ buildRules = ( ); dependencies = ( - 7C77CFC929290F4500C4D90E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-iOS"; packageProductDependencies = ( + 39E248D02AD1C2510014357C /* ParseObjC */, + 39E24A1F2AD219600014357C /* FacebookAEM */, + 39E24A212AD219600014357C /* FacebookBasics */, + 39E24A232AD219600014357C /* FacebookCore */, + 39E24A252AD219600014357C /* FacebookLogin */, ); productName = Breakpad; productReference = D2AAC07E0554694100DB518D /* ParseFacebookUtilsV4.framework */; @@ -586,15 +444,10 @@ ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; packageReferences = ( + 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C77CFA629290F4000C4D90E /* Products */; - ProjectRef = 7C77CFA529290F4000C4D90E /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( D2AAC07D0554694100DB518D /* ParseFacebookUtilsV4-iOS */, @@ -605,79 +458,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C77CFB529290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFB429290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFB729290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFB629290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFB929290F4100C4D90E /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C77CFB829290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFBB29290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFBA29290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFBD29290F4100C4D90E /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C77CFBC29290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFBF29290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFBE29290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFC129290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFC029290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFC329290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFC229290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFC529290F4100C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77CFC429290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77CFC729290F4100C4D90E /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C77CFC629290F4100C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4AAEAA70200C020E00AA7479 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -712,7 +492,7 @@ /* Begin PBXShellScriptBuildPhase section */ 4A1351A5202817C7000F5FD5 /* Fetch Latest Dependencies */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -720,13 +500,14 @@ name = "Fetch Latest Dependencies"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ ! -d $SRCROOT/../Carthage/Build ]; then\nmkdir $SRCROOT/../Carthage/Build\nfi\n\ncd $SRCROOT/../Carthage/Build\n\nif [ ! -d \"FBSDKCoreKit.xcframework\" ] || [ ! -d \"FBSDKTVOSKit.xcframework\" ]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://github.com/facebook/facebook-ios-sdk/releases/download/v15.1.0/FacebookSDK-Static_XCFramework.zip\"\ncurl -Lk $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nrm -rf FBSDKCoreKit.xcframework\nrm -rf FBSDKTVOSKit.xcframework\n\nmv fbsdk/XCFrameworks/FBSDKCoreKit.xcframework .\nmv fbsdk/XCFrameworks/FBSDKTVOSKit.xcframework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n"; + shellScript = " +"; }; 4A1351B220281814000F5FD5 /* Fetch Latest Dependencies */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -734,9 +515,10 @@ name = "Fetch Latest Dependencies"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ ! -d $SRCROOT/../Carthage/Build ]; then\nmkdir $SRCROOT/../Carthage/Build\nfi\n\ncd $SRCROOT/../Carthage/Build\n\nif [ ! -d \"FBSDKCoreKit.xcframework\" ] || [ ! -d \"FBSDKLoginKit.xcframework\" ] || [ ! -d \"FBSDKCoreKit_Basics.xcframework\" ] || [ ! -d \"FBAEMKit.xcframework\" ]; then\nARCHIVE_NAME=FBSDK.zip\n\nARCHIVE_URL=\"https://github.com/facebook/facebook-ios-sdk/releases/download/v15.1.0/FacebookSDK-Static_XCFramework.zip\"\ncurl -Lk $ARCHIVE_URL -o $ARCHIVE_NAME\n\nunzip $ARCHIVE_NAME -d fbsdk\nrm -rf FBSDKCoreKit.xcframework\nrm -rf FBSDKLoginKit.xcframework\nrm -rf FBSDKCoreKit_Basics.xcframework\nrm -rf FBAEMKit.xcframework\n\nmv fbsdk/XCFrameworks/FBSDKCoreKit.xcframework .\nmv fbsdk/XCFrameworks/FBSDKLoginKit.xcframework .\nmv fbsdk/XCFrameworks/FBSDKCoreKit_Basics.xcframework .\nmv fbsdk/XCFrameworks/FBAEMKit.xcframework .\n\nrm $ARCHIVE_NAME\nrm -r fbsdk\nfi\n"; + shellScript = " +"; }; 4AAEAA5D200C020E00AA7479 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; @@ -768,7 +550,7 @@ }; 81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -776,13 +558,13 @@ name = "Generate Localizable Strings"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; shellScript = "# Generate localizable strings\nfind $PROJECT_DIR -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/ParseFacebookUtils/Resources\necho \"Finished converting images\"\n"; }; 81FE7F751C17790400E6BD34 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -790,7 +572,7 @@ name = "Generate Localizable Strings"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; shellScript = "# Generate localizable strings\nfind $PROJECT_DIR -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/ParseFacebookUtils/Resources\necho \"Finished converting images\"\n"; }; @@ -835,29 +617,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 7C77CFC929290F4500C4D90E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS"; - targetProxy = 7C77CFC829290F4500C4D90E /* PBXContainerItemProxy */; - }; - 7C77D01A2929110300C4D90E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-tvOS"; - targetProxy = 7C77D0192929110300C4D90E /* PBXContainerItemProxy */; - }; - 7C77D0212929117E00C4D90E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 7C77D0202929117E00C4D90E /* PBXContainerItemProxy */; - }; - 7C77D0272929118E00C4D90E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-tvOS-Dynamic"; - targetProxy = 7C77D0262929118E00C4D90E /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 1DEB921F08733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -1062,6 +821,68 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/facebook/facebook-ios-sdk.git"; + requirement = { + kind = exactVersion; + version = 15.1.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E248D02AD1C2510014357C /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39E248D22AD1C25B0014357C /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39E24A1F2AD219600014357C /* FacebookAEM */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookAEM; + }; + 39E24A212AD219600014357C /* FacebookBasics */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookBasics; + }; + 39E24A232AD219600014357C /* FacebookCore */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookCore; + }; + 39E24A252AD219600014357C /* FacebookLogin */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookLogin; + }; + 39E24A292AD219DC0014357C /* FacebookAEM */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookAEM; + }; + 39E24A2B2AD219DC0014357C /* FacebookBasics */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookBasics; + }; + 39E24A2D2AD219DC0014357C /* FacebookCore */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookCore; + }; + 39E24A2F2AD219DC0014357C /* FacebookTV */ = { + isa = XCSwiftPackageProductDependency; + package = 39E24A1E2AD219600014357C /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */; + productName = FacebookTV; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; } diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 04cd5dae9..919434a62 100644 --- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookAuthenticationProvider.h b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookAuthenticationProvider.h index fdfb9c086..be60f8159 100644 --- a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookAuthenticationProvider.h +++ b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookAuthenticationProvider.h @@ -16,14 +16,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUserAuthenticationDelegate.h" -#endif - +@import ParseCore; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.h b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.h index cada4567b..cded596a0 100644 --- a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.h +++ b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.h @@ -15,13 +15,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUser.h" -#endif +@import ParseCore; #import #import "PFFacebookAuthenticationProvider.h" diff --git a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.m b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.m index d2e9dc22e..a92bf555b 100644 --- a/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.m +++ b/ParseFacebookUtils/ParseFacebookUtils/Source/PFFacebookUtils.m @@ -15,11 +15,7 @@ #import "BFExecutor.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif +@import ParseCore; #import diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj index eadf5d058..0ef4ee9ac 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 39E248DC2AD1C4120014357C /* ParseFacebookUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248DB2AD1C4120014357C /* ParseFacebookUtils */; }; + 39E248DE2AD1C43A0014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248DD2AD1C43A0014357C /* ParseObjC */; }; + 39E248E02AD1C49D0014357C /* ParseFacebookUtilsTvOS in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248DF2AD1C49D0014357C /* ParseFacebookUtilsTvOS */; }; 7C5F7FB129212AAD0035B219 /* PFFacebookDeviceAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7FAF29212A9F0035B219 /* PFFacebookDeviceAuthenticationProvider.h */; }; 7C5F7FB229212AAD0035B219 /* PFFacebookDeviceAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7FB029212A9F0035B219 /* PFFacebookDeviceAuthenticationProvider.m */; }; 7C5F7FB329212AAD0035B219 /* PFFacebookUtilsDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7FAA29212A9F0035B219 /* PFFacebookUtilsDevice.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -17,61 +20,8 @@ 7C5F7FB829212AAE0035B219 /* PFFacebookUtilsDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7FAA29212A9F0035B219 /* PFFacebookUtilsDevice.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C5F7FB929212AAE0035B219 /* PFFacebookUtilsDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7FAC29212A9F0035B219 /* PFFacebookUtilsDevice.m */; }; 7C5F7FBA29212AAE0035B219 /* ParseFacebookUtilsTvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5F7FAB29212A9F0035B219 /* ParseFacebookUtilsTvOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7C77D05E2929161D00C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */; }; - 7C77D05F2929161D00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D0602929161D00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */; }; - 7C77D0612929161D00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05D2929160800C4D90E /* FBSDKTVOSKit.xcframework */; }; - 7C77D0622929164A00C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */; }; - 7C77D0632929164A00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D0642929164A00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */; }; - 7C77D0652929164A00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D05D2929160800C4D90E /* FBSDKTVOSKit.xcframework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 7C5F7FD429212AF20035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = "ParseFacebookUtilsV4-iOS"; - }; - 7C5F7FD629212AF20035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81FE7F8B1C17790400E6BD34; - remoteInfo = "ParseFacebookUtilsV4-tvOS"; - }; - 7C5F7FD829212AF20035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA75200C020E00AA7479; - remoteInfo = "ParseFacebookUtilsV4-iOS-Dynamic"; - }; - 7C5F7FDA29212AF20035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA90200C022300AA7479; - remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic"; - }; - 7C5F7FDC29212AF70035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81FE7F731C17790400E6BD34; - remoteInfo = "ParseFacebookUtilsV4-tvOS"; - }; - 7C5F7FFE292130FC0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 4AAEAA77200C022300AA7479; - remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ BCCC20E4271F1BB3003C9D03 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -86,6 +36,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 39E248D82AD1C3F40014357C /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 4AAEAA90200C022300AA7479 /* ParseFacebookUtilsTvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsTvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsTvOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsTvOS-Dynamic.xcconfig"; sourceTree = ""; }; 7C5F7FA729212A9F0035B219 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = ""; }; @@ -95,11 +46,6 @@ 7C5F7FAC29212A9F0035B219 /* PFFacebookUtilsDevice.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFFacebookUtilsDevice.m; sourceTree = ""; }; 7C5F7FAF29212A9F0035B219 /* PFFacebookDeviceAuthenticationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFFacebookDeviceAuthenticationProvider.h; sourceTree = ""; }; 7C5F7FB029212A9F0035B219 /* PFFacebookDeviceAuthenticationProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFFacebookDeviceAuthenticationProvider.m; sourceTree = ""; }; - 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ParseFacebookUtils.xcodeproj; path = ../ParseFacebookUtils/ParseFacebookUtils.xcodeproj; sourceTree = ""; }; - 7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit_Basics.xcframework; path = ../Carthage/Build/FBSDKCoreKit_Basics.xcframework; sourceTree = ""; }; - 7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBAEMKit.xcframework; path = ../Carthage/Build/FBAEMKit.xcframework; sourceTree = ""; }; - 7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit.xcframework; path = ../Carthage/Build/FBSDKCoreKit.xcframework; sourceTree = ""; }; - 7C77D05D2929160800C4D90E /* FBSDKTVOSKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKTVOSKit.xcframework; path = ../Carthage/Build/FBSDKTVOSKit.xcframework; sourceTree = ""; }; 8121EA9F1D39862400AC0B02 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; 8121EAA11D39862400AC0B02 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = ""; }; 8121EAA21D39862400AC0B02 /* macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macOS.xcconfig; sourceTree = ""; }; @@ -121,10 +67,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D0622929164A00C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D0632929164A00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D0642929164A00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D0652929164A00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -132,10 +74,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D05E2929161D00C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D05F2929161D00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D0602929161D00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D0612929161D00C4D90E /* FBSDKTVOSKit.xcframework in Frameworks */, + 39E248DE2AD1C43A0014357C /* ParseObjC in Frameworks */, + 39E248DC2AD1C4120014357C /* ParseFacebookUtils in Frameworks */, + 39E248E02AD1C49D0014357C /* ParseFacebookUtilsTvOS in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -154,6 +95,7 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + 39E248D72AD1C3F40014357C /* Packages */, F52CD63A1B58383C0051AB86 /* Configurations */, 7C5F7FA529212A9F0035B219 /* ParseFacebookUtilsTvOS */, 0867D69AFE84028FC02AAC07 /* Frameworks */, @@ -166,15 +108,18 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */, - 7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */, - 7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */, - 7C77D05D2929160800C4D90E /* FBSDKTVOSKit.xcframework */, - 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */, ); name = Frameworks; sourceTree = ""; }; + 39E248D72AD1C3F40014357C /* Packages */ = { + isa = PBXGroup; + children = ( + 39E248D82AD1C3F40014357C /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 7C5F7FA529212A9F0035B219 /* ParseFacebookUtilsTvOS */ = { isa = PBXGroup; children = ( @@ -221,17 +166,6 @@ path = AuthenticationProvider; sourceTree = ""; }; - 7C5F7FBC29212AF10035B219 /* Products */ = { - isa = PBXGroup; - children = ( - 7C5F7FD529212AF20035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7FD729212AF20035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7FD929212AF20035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7FDB29212AF20035B219 /* ParseFacebookUtilsV4.framework */, - ); - name = Products; - sourceTree = ""; - }; 8121EA9E1D39862400AC0B02 /* Shared */ = { isa = PBXGroup; children = ( @@ -324,7 +258,6 @@ buildRules = ( ); dependencies = ( - 7C5F7FFF292130FC0035B219 /* PBXTargetDependency */, ); name = "ParseFacebookUtilsTvOS-Dynamic"; packageProductDependencies = ( @@ -345,9 +278,13 @@ buildRules = ( ); dependencies = ( - 7C5F7FDD29212AF70035B219 /* PBXTargetDependency */, ); name = ParseFacebookUtilsTvOS; + packageProductDependencies = ( + 39E248DB2AD1C4120014357C /* ParseFacebookUtils */, + 39E248DD2AD1C43A0014357C /* ParseObjC */, + 39E248DF2AD1C49D0014357C /* ParseFacebookUtilsTvOS */, + ); productName = Breakpad; productReference = 81FE7F8B1C17790400E6BD34 /* ParseFacebookUtilsTvOS.framework */; productType = "com.apple.product-type.framework"; @@ -391,12 +328,6 @@ ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C5F7FBC29212AF10035B219 /* Products */; - ProjectRef = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81FE7F731C17790400E6BD34 /* ParseFacebookUtilsTvOS */, @@ -405,37 +336,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C5F7FD529212AF20035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7FD429212AF20035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7FD729212AF20035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7FD629212AF20035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7FD929212AF20035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7FD829212AF20035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7FDB29212AF20035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7FDA29212AF20035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4AAEAA8B200C022300AA7479 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -474,19 +374,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 7C5F7FDD29212AF70035B219 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseFacebookUtilsV4-tvOS"; - targetProxy = 7C5F7FDC29212AF70035B219 /* PBXContainerItemProxy */; - }; - 7C5F7FFF292130FC0035B219 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseFacebookUtilsV4-tvOS-Dynamic"; - targetProxy = 7C5F7FFE292130FC0035B219 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -567,6 +454,7 @@ baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 12.0; @@ -578,6 +466,7 @@ baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 12.0; @@ -615,6 +504,21 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E248DB2AD1C4120014357C /* ParseFacebookUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtils; + }; + 39E248DD2AD1C43A0014357C /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39E248DF2AD1C49D0014357C /* ParseFacebookUtilsTvOS */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtilsTvOS; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; } diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.h b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.h index 325a58b97..0e2936014 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.h +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.h @@ -9,11 +9,7 @@ #import -#if __has_include() -#import -#else -#import "PFFacebookAuthenticationProvider.h" -#endif +@import ParseFacebookUtils; @interface PFFacebookDeviceAuthenticationProvider : PFFacebookAuthenticationProvider diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.m b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.m index 2ea70aa57..1367ea7ab 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.m +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Internal/AuthenticationProvider/PFFacebookDeviceAuthenticationProvider.m @@ -17,15 +17,12 @@ #import "BFTaskCompletionSource.h" #endif +@import ParseFacebookUtils; + #import #import #import -#if __has_include() -#import -#else -#import "PFFacebookUtils.h" -#endif @interface PFFacebookDeviceAuthenticationProvider () { BFTaskCompletionSource *_loginTaskCompletionSource; diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.h b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.h index e74ad10f0..6907fd3ea 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.h +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.h @@ -4,12 +4,7 @@ // // Created by Volodymyr Nazarkevych on 29.11.2022. // - -#if __has_include() -#import -#else -#import "PFFacebookUtils.h" -#endif +@import ParseFacebookUtils; @interface PFFacebookUtilsDevice : PFFacebookUtils diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.m b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.m index 93ab23bd8..24a48bbbe 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.m +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS/Source/PFFacebookUtilsDevice.m @@ -15,17 +15,8 @@ #import "BFExecutor.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif - -#if __has_include() -#import -#else -#import "PFFacebookUtils.h" -#endif +@import ParseCore; +@import ParseFacebookUtils; #import #import "PFFacebookDeviceAuthenticationProvider.h" diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj index 7555acc0f..568fd64c8 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj @@ -7,7 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 39A6B6732AD8E90100123017 /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39A6B6722AD8E90100123017 /* ParseObjC */; }; + 39A6B6752AD8E96B00123017 /* ParseFacebookUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39A6B6742AD8E96B00123017 /* ParseFacebookUtils */; }; 39E22AC52AD065BA00D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AC42AD065BA00D9AE5C /* OCMock */; }; + 39E248E92AD1C4D60014357C /* ParseFacebookUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39E248E82AD1C4D60014357C /* ParseFacebookUtils */; }; 7C5F7E2829210C9C0035B219 /* FacebookUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7E1B29210C970035B219 /* FacebookUtilsTests.m */; }; 7C5F7E2929210C9C0035B219 /* FacebookAuthenticationProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7E1C29210C970035B219 /* FacebookAuthenticationProviderTests.m */; }; 7C5F7E2A29210CA00035B219 /* PFFacebookTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C5F7E2129210C970035B219 /* PFFacebookTestCase.m */; }; @@ -31,62 +34,11 @@ 7C5F7EDE29211E6A0035B219 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EDD29211E6A0035B219 /* SystemConfiguration.framework */; }; 7C5F7EE029211E6E0035B219 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EDF29211E6E0035B219 /* AudioToolbox.framework */; }; 7C5F7EE229211E870035B219 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EE129211E870035B219 /* Accelerate.framework */; }; - 7C77D047292913DC00C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D045292913CF00C4D90E /* FBAEMKit.xcframework */; }; - 7C77D048292913DC00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D03C292913CF00C4D90E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D049292913DC00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D044292913CF00C4D90E /* FBSDKCoreKit.xcframework */; }; - 7C77D04A292913DC00C4D90E /* FBSDKLoginKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D046292913CF00C4D90E /* FBSDKLoginKit.xcframework */; }; - 7C77D04C292913EC00C4D90E /* FBAEMKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D045292913CF00C4D90E /* FBAEMKit.xcframework */; }; - 7C77D04D292913EC00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D03C292913CF00C4D90E /* FBSDKCoreKit_Basics.xcframework */; }; - 7C77D04E292913EC00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D044292913CF00C4D90E /* FBSDKCoreKit.xcframework */; }; - 7C77D04F292913EC00C4D90E /* FBSDKLoginKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D046292913CF00C4D90E /* FBSDKLoginKit.xcframework */; }; 7C77D0512929156900C4D90E /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D0502929156900C4D90E /* libc++.tbd */; }; 7C77D0532929157600C4D90E /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D0522929157600C4D90E /* Accelerate.framework */; }; - 7CD81D17292D16DC0074F64D /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7E5D29210E590035B219 /* ParseFacebookUtilsV4.framework */; platformFilter = ios; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 7C5F7E5C29210E590035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = "ParseFacebookUtilsV4-iOS"; - }; - 7C5F7E5E29210E590035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81FE7F8B1C17790400E6BD34; - remoteInfo = "ParseFacebookUtilsV4-tvOS"; - }; - 7C5F7E6029210E590035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA75200C020E00AA7479; - remoteInfo = "ParseFacebookUtilsV4-iOS-Dynamic"; - }; - 7C5F7E6229210E590035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA90200C022300AA7479; - remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic"; - }; - 7C5F7E7F29210E600035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseFacebookUtilsV4-iOS"; - }; - 7C5F7E8D292114240035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 4AAEAA5B200C020E00AA7479; - remoteInfo = "ParseFacebookUtilsV4-iOS-Dynamic"; - }; B9A7EE7323C49272003E606E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -117,6 +69,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 39E248E72AD1C4BE0014357C /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 4AAEAA75200C020E00AA7479 /* ParseFacebookUtilsiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7C5F7E1B29210C970035B219 /* FacebookUtilsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FacebookUtilsTests.m; sourceTree = ""; }; 7C5F7E1C29210C970035B219 /* FacebookAuthenticationProviderTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FacebookAuthenticationProviderTests.m; sourceTree = ""; }; @@ -127,16 +80,11 @@ 7C5F7E2729210C970035B219 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7C5F7E2C29210CF30035B219 /* ParseFacebookTestApplication.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ParseFacebookTestApplication.xcconfig; sourceTree = ""; }; 7C5F7E2D29210CF30035B219 /* ParseFacebookUtils-UnitTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtils-UnitTests.xcconfig"; sourceTree = ""; }; - 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ParseFacebookUtils.xcodeproj; path = ../ParseFacebookUtils/ParseFacebookUtils.xcodeproj; sourceTree = ""; }; 7C5F7ED929211E5E0035B219 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 7C5F7EDB29211E640035B219 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 7C5F7EDD29211E6A0035B219 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 7C5F7EDF29211E6E0035B219 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 7C5F7EE129211E870035B219 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; - 7C77D03C292913CF00C4D90E /* FBSDKCoreKit_Basics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit_Basics.xcframework; path = ../Carthage/Build/FBSDKCoreKit_Basics.xcframework; sourceTree = ""; }; - 7C77D044292913CF00C4D90E /* FBSDKCoreKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit.xcframework; path = ../Carthage/Build/FBSDKCoreKit.xcframework; sourceTree = ""; }; - 7C77D045292913CF00C4D90E /* FBAEMKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBAEMKit.xcframework; path = ../Carthage/Build/FBAEMKit.xcframework; sourceTree = ""; }; - 7C77D046292913CF00C4D90E /* FBSDKLoginKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKLoginKit.xcframework; path = ../Carthage/Build/FBSDKLoginKit.xcframework; sourceTree = ""; }; 7C77D0502929156900C4D90E /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; }; 7C77D0522929157600C4D90E /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; }; 7CACE61A291EA74D003359B5 /* ParseFacebookUtilsiOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsiOS-Dynamic.xcconfig"; sourceTree = ""; }; @@ -174,10 +122,6 @@ files = ( 7C77D0532929157600C4D90E /* Accelerate.framework in Frameworks */, 7C77D0512929156900C4D90E /* libc++.tbd in Frameworks */, - 7C77D04C292913EC00C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D04D292913EC00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D04E292913EC00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D04F292913EC00C4D90E /* FBSDKLoginKit.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -185,9 +129,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7CD81D17292D16DC0074F64D /* ParseFacebookUtilsV4.framework in Frameworks */, + 39A6B6752AD8E96B00123017 /* ParseFacebookUtils in Frameworks */, 7C5F7EE229211E870035B219 /* Accelerate.framework in Frameworks */, 39E22AC52AD065BA00D9AE5C /* OCMock in Frameworks */, + 39A6B6732AD8E90100123017 /* ParseObjC in Frameworks */, 7C5F7EE029211E6E0035B219 /* AudioToolbox.framework in Frameworks */, 7C5F7EDE29211E6A0035B219 /* SystemConfiguration.framework in Frameworks */, 7C5F7EDC29211E640035B219 /* libc++.tbd in Frameworks */, @@ -199,10 +144,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D047292913DC00C4D90E /* FBAEMKit.xcframework in Frameworks */, - 7C77D048292913DC00C4D90E /* FBSDKCoreKit_Basics.xcframework in Frameworks */, - 7C77D049292913DC00C4D90E /* FBSDKCoreKit.xcframework in Frameworks */, - 7C77D04A292913DC00C4D90E /* FBSDKLoginKit.xcframework in Frameworks */, + 39E248E92AD1C4D60014357C /* ParseFacebookUtils in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -230,6 +172,7 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + 39E248E62AD1C4BE0014357C /* Packages */, F52CD63A1B58383C0051AB86 /* Configurations */, 7CACE61C291EA75A003359B5 /* ParseFacebookUtilsiOS */, 7C5F7E1929210C970035B219 /* Tests */, @@ -250,15 +193,18 @@ 7C5F7EDD29211E6A0035B219 /* SystemConfiguration.framework */, 7C5F7EDB29211E640035B219 /* libc++.tbd */, 7C5F7ED929211E5E0035B219 /* libsqlite3.tbd */, - 7C77D045292913CF00C4D90E /* FBAEMKit.xcframework */, - 7C77D03C292913CF00C4D90E /* FBSDKCoreKit_Basics.xcframework */, - 7C77D044292913CF00C4D90E /* FBSDKCoreKit.xcframework */, - 7C77D046292913CF00C4D90E /* FBSDKLoginKit.xcframework */, - 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */, ); name = Frameworks; sourceTree = ""; }; + 39E248E62AD1C4BE0014357C /* Packages */ = { + isa = PBXGroup; + children = ( + 39E248E72AD1C4BE0014357C /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 7C5F7E1929210C970035B219 /* Tests */ = { isa = PBXGroup; children = ( @@ -329,17 +275,6 @@ path = Resources; sourceTree = ""; }; - 7C5F7E3A29210E580035B219 /* Products */ = { - isa = PBXGroup; - children = ( - 7C5F7E5D29210E590035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7E5F29210E590035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7E6129210E590035B219 /* ParseFacebookUtilsV4.framework */, - 7C5F7E6329210E590035B219 /* ParseFacebookUtilsV4.framework */, - ); - name = Products; - sourceTree = ""; - }; 7CACE61C291EA75A003359B5 /* ParseFacebookUtilsiOS */ = { isa = PBXGroup; children = ( @@ -486,7 +421,6 @@ buildRules = ( ); dependencies = ( - 7C5F7E8E292114240035B219 /* PBXTargetDependency */, ); name = "ParseFacebookUtilsiOS-Dynamic"; packageProductDependencies = ( @@ -512,6 +446,8 @@ name = "ParseFacebookUtils-UnitTests"; packageProductDependencies = ( 39E22AC42AD065BA00D9AE5C /* OCMock */, + 39A6B6722AD8E90100123017 /* ParseObjC */, + 39A6B6742AD8E96B00123017 /* ParseFacebookUtils */, ); productName = "ParseFacebookUtilsV4-Tests"; productReference = 81CB98C61AB7905D00136FA5 /* ParseFacebookUtilsiOS-UnitTests.xctest */; @@ -529,10 +465,10 @@ buildRules = ( ); dependencies = ( - 7C5F7E8029210E600035B219 /* PBXTargetDependency */, ); name = ParseFacebookUtilsiOS; packageProductDependencies = ( + 39E248E82AD1C4D60014357C /* ParseFacebookUtils */, ); productName = Breakpad; productReference = D2AAC07E0554694100DB518D /* ParseFacebookUtilsiOS.framework */; @@ -608,12 +544,6 @@ ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C5F7E3A29210E580035B219 /* Products */; - ProjectRef = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; - }, - ); projectRoot = ""; targets = ( D2AAC07D0554694100DB518D /* ParseFacebookUtilsiOS */, @@ -624,37 +554,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C5F7E5D29210E590035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7E5C29210E590035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7E5F29210E590035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7E5E29210E590035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7E6129210E590035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7E6029210E590035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7E6329210E590035B219 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 7C5F7E6229210E590035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4AAEAA70200C020E00AA7479 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -726,16 +625,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 7C5F7E8029210E600035B219 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseFacebookUtilsV4-iOS"; - targetProxy = 7C5F7E7F29210E600035B219 /* PBXContainerItemProxy */; - }; - 7C5F7E8E292114240035B219 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseFacebookUtilsV4-iOS-Dynamic"; - targetProxy = 7C5F7E8D292114240035B219 /* PBXContainerItemProxy */; - }; B9A7EE7423C49272003E606E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = F535C73A1B54B4A800A7D81E /* ParseFacebookTestApplication */; @@ -753,6 +642,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7CACE61B291EA74D003359B5 /* ParseFacebookUtilsiOS.xcconfig */; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -770,6 +660,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7CACE61B291EA74D003359B5 /* ParseFacebookUtilsiOS.xcconfig */; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -1000,11 +891,23 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 39A6B6722AD8E90100123017 /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39A6B6742AD8E96B00123017 /* ParseFacebookUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtils; + }; 39E22AC42AD065BA00D9AE5C /* OCMock */ = { isa = XCSwiftPackageProductDependency; package = 39E22AC32AD065BA00D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; productName = OCMock; }; + 39E248E82AD1C4D60014357C /* ParseFacebookUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtils; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.h b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.h index 3ad69742e..aaf2e8720 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.h +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.h @@ -8,22 +8,10 @@ */ #import - #import -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUser.h" -#endif - -#if __has_include() -#import -#else -#import "PFFacebookAuthenticationProvider.h" -#endif +@import ParseCore; +@import ParseFacebookUtils; @class BFTask<__covariant BFGenericType>; diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.m b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.m index c83941654..10390d318 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.m +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Internal/AuthenticationProvider/PFFacebookMobileAuthenticationProvider.m @@ -18,20 +18,12 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif +@import ParseCore; +@import ParseFacebookUtils; #import #import -#if __has_include() -#import -#else -#import "PFFacebookUtils.h" -#endif @implementation PFFacebookMobileAuthenticationProvider diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.h b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.h index 815c56e66..62f520d7e 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.h +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.h @@ -7,11 +7,7 @@ #import -#if __has_include() -#import -#else -#import "PFFacebookUtils.h" -#endif +@import ParseFacebookUtils; #import diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.m b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.m index 320ee371e..999fe5a98 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.m +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Source/PFFacebookUtilsDevice.m @@ -14,11 +14,7 @@ #import "BFExecutor.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif +@import ParseCore; #import diff --git a/ParseFacebookUtilsiOS/Tests/Unit/FacebookAuthenticationProviderTests.m b/ParseFacebookUtilsiOS/Tests/Unit/FacebookAuthenticationProviderTests.m index 5c7dedf96..be693619f 100644 --- a/ParseFacebookUtilsiOS/Tests/Unit/FacebookAuthenticationProviderTests.m +++ b/ParseFacebookUtilsiOS/Tests/Unit/FacebookAuthenticationProviderTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; @import FBSDKCoreKit.FBSDKAccessToken; @import FBSDKLoginKit; diff --git a/ParseFacebookUtilsiOS/Tests/Unit/FacebookUtilsTests.m b/ParseFacebookUtilsiOS/Tests/Unit/FacebookUtilsTests.m index 7d5a76842..2e2df432f 100644 --- a/ParseFacebookUtilsiOS/Tests/Unit/FacebookUtilsTests.m +++ b/ParseFacebookUtilsiOS/Tests/Unit/FacebookUtilsTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Parse; +@import ParseCore; #import diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj index e63f5f608..9f30c48a4 100644 --- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj +++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; }; 39E22B102AD070A500D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22B0F2AD070A500D9AE5C /* OCMock */; }; + 39E2490B2AD1C6470014357C /* ParseTwitterUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39E2490A2AD1C6470014357C /* ParseTwitterUtils */; }; + 39E2490D2AD1C6520014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E2490C2AD1C6520014357C /* ParseObjC */; }; 7C605D0B292A91D700E4B6D2 /* PFTwitterLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C605D02292A91D700E4B6D2 /* PFTwitterLocalization.m */; }; 7C605D0C292A91D700E4B6D2 /* PFTwitterLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C605D02292A91D700E4B6D2 /* PFTwitterLocalization.m */; }; 7C77D07E2929241300C4D90E /* PF_Twitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C77D079292923FF00C4D90E /* PF_Twitter.m */; }; @@ -60,90 +62,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 4A1350A82027F4B8000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C3821B19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 4A51E4072027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 4A51E4092027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 4A51E40B2027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 4A51E40D2027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 4A51E40F2027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 4A51E4112027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 4A51E4132027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 4A51E4152027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 4A51E4172027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 4A51E4192027CC0F0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 4A51E41B2027CC1C0066DE1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; 8166FB941B4F1E9A003841A2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -151,18 +69,11 @@ remoteGlobalIDString = 8166FB661B4F1D77003841A2; remoteInfo = ParseTwitterTestApplication; }; - B9783142240D050B0049C02B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseTwitterUtils-iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTwitterLocalization.h; sourceTree = ""; }; - 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; + 39E249092AD1C61F0014357C /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 7C605D02292A91D700E4B6D2 /* PFTwitterLocalization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFTwitterLocalization.m; sourceTree = ""; }; 7C77D076292923FF00C4D90E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ParseTwitterUtils.strings; sourceTree = ""; }; 7C77D077292923FF00C4D90E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = ""; }; @@ -242,6 +153,7 @@ files = ( 39E22B102AD070A500D9AE5C /* OCMock in Frameworks */, 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */, + 39E2490B2AD1C6470014357C /* ParseTwitterUtils in Frameworks */, 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */, 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */, 816832521D1E1A7900315E21 /* Security.framework in Frameworks */, @@ -259,6 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E2490D2AD1C6520014357C /* ParseObjC in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -279,13 +192,13 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + 39E249082AD1C61F0014357C /* Packages */, B99F4FFE2444B5B00061A6F5 /* ParseTwitterTestApplication.entitlements */, F51535381B57451200C49F56 /* Configurations */, 8135E48C1B4B6A0E0092F452 /* ParseTwitterUtils */, 81CB98D21AB7906D00136FA5 /* Tests */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - 8EF82AB7049F0059A572B973 /* Pods */, ); indentWidth = 4; name = Breakpad; @@ -295,27 +208,17 @@ isa = PBXGroup; children = ( B9A7EEC123C49D94003E606E /* CoreGraphics.framework */, - 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */, 813DFC8E1AB2513300F25A08 /* System Frameworks */, ); name = Frameworks; sourceTree = ""; }; - 4A51E3FB2027CC0F0066DE1A /* Products */ = { + 39E249082AD1C61F0014357C /* Packages */ = { isa = PBXGroup; children = ( - 4A51E4082027CC0F0066DE1A /* Parse.framework */, - 4A51E40A2027CC0F0066DE1A /* Parse.framework */, - 4A51E40C2027CC0F0066DE1A /* ParseUnitTests-iOS.xctest */, - 4A51E40E2027CC0F0066DE1A /* Parse.framework */, - 4A51E4102027CC0F0066DE1A /* ParseUnitTests-macOS.xctest */, - 4A51E4122027CC0F0066DE1A /* Parse.framework */, - 4A51E4142027CC0F0066DE1A /* Parse.framework */, - 4A51E4162027CC0F0066DE1A /* Parse.framework */, - 4A51E4182027CC0F0066DE1A /* Parse.framework */, - 4A51E41A2027CC0F0066DE1A /* ParseUnitTests-iOS-host.app */, + 39E249092AD1C61F0014357C /* Parse-SDK-iOS-OSX */, ); - name = Products; + name = Packages; sourceTree = ""; }; 7C77D074292923FF00C4D90E /* Resources */ = { @@ -520,13 +423,6 @@ name = Resources; sourceTree = ""; }; - 8EF82AB7049F0059A572B973 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - name = Pods; - sourceTree = ""; - }; F51535381B57451200C49F56 /* Configurations */ = { isa = PBXGroup; children = ( @@ -609,12 +505,12 @@ buildRules = ( ); dependencies = ( - B9783143240D050B0049C02B /* PBXTargetDependency */, 8166FB951B4F1E9A003841A2 /* PBXTargetDependency */, ); name = "ParseTwitterUtils-Tests"; packageProductDependencies = ( 39E22B0F2AD070A500D9AE5C /* OCMock */, + 39E2490A2AD1C6470014357C /* ParseTwitterUtils */, ); productName = "ParseFacebookUtilsV4-Tests"; productReference = 81CB98C61AB7905D00136FA5 /* ParseTwitterUtils-Tests.xctest */; @@ -633,7 +529,6 @@ buildRules = ( ); dependencies = ( - 4A51E41C2027CC1C0066DE1A /* PBXTargetDependency */, ); name = "ParseTwitterUtils-iOS-Dynamic"; productName = Breakpad; @@ -653,9 +548,11 @@ buildRules = ( ); dependencies = ( - 4A1350A92027F4B8000F5FD5 /* PBXTargetDependency */, ); name = "ParseTwitterUtils-iOS"; + packageProductDependencies = ( + 39E2490C2AD1C6520014357C /* ParseObjC */, + ); productName = Breakpad; productReference = D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */; productType = "com.apple.product-type.framework"; @@ -693,12 +590,6 @@ ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 4A51E3FB2027CC0F0066DE1A /* Products */; - ProjectRef = 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */; - }, - ); projectRoot = ""; targets = ( D2AAC07D0554694100DB518D /* ParseTwitterUtils-iOS */, @@ -709,79 +600,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 4A51E4082027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4072027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E40A2027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4092027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E40C2027CC0F0066DE1A /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 4A51E40B2027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E40E2027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E40D2027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E4102027CC0F0066DE1A /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 4A51E40F2027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E4122027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4112027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E4142027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4132027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E4162027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4152027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E4182027CC0F0066DE1A /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 4A51E4172027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A51E41A2027CC0F0066DE1A /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 4A51E4192027CC0F0066DE1A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 8139B1341A7BF6B5002BEF84 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -816,7 +634,7 @@ /* Begin PBXShellScriptBuildPhase section */ 81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 8; files = ( ); inputPaths = ( @@ -824,7 +642,7 @@ name = "Generate Localizable Strings"; outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; shellScript = "# Generate localizable strings\nLOCALIZATION_FOLDER=$PROJECT_DIR/ParseTwitterUtils/Resources/en.lproj\nLOCALIZATION_MACRO=PFTWLocalizedString\n\nfind $PROJECT_DIR/ParseTwitterUtils -name '*.m' -print0 | xargs -0 xcrun extractLocStrings -s $LOCALIZATION_MACRO -q -o $LOCALIZATION_FOLDER\n\nmv $LOCALIZATION_FOLDER/Localizable.strings $LOCALIZATION_FOLDER/ParseTwitterUtils.strings\n"; showEnvVarsInLog = 0; @@ -901,28 +719,12 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4A1350A92027F4B8000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS"; - targetProxy = 4A1350A82027F4B8000F5FD5 /* PBXContainerItemProxy */; - }; - 4A51E41C2027CC1C0066DE1A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 4A51E41B2027CC1C0066DE1A /* PBXContainerItemProxy */; - }; 8166FB951B4F1E9A003841A2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; target = 8166FB661B4F1D77003841A2 /* ParseTwitterTestApplication */; targetProxy = 8166FB941B4F1E9A003841A2 /* PBXContainerItemProxy */; }; - B9783143240D050B0049C02B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - platformFilter = ios; - target = D2AAC07D0554694100DB518D /* ParseTwitterUtils-iOS */; - targetProxy = B9783142240D050B0049C02B /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -941,7 +743,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -951,7 +753,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -997,7 +799,7 @@ baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1008,7 +810,7 @@ baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1035,7 +837,7 @@ baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1046,7 +848,7 @@ baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1120,6 +922,14 @@ package = 39E22B0E2AD070A500D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; productName = OCMock; }; + 39E2490A2AD1C6470014357C /* ParseTwitterUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseTwitterUtils; + }; + 39E2490C2AD1C6520014357C /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; diff --git a/ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m b/ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m index 73ac12e36..537b0bb3a 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m +++ b/ParseTwitterUtils/ParseTwitterUtils/Internal/Dialog/PFOAuth1FlowDialog.m @@ -10,11 +10,7 @@ #import "PFOAuth1FlowDialog.h" #import -#if __has_include() -#import -#else -#import "PFNetworkActivityIndicatorManager.h" -#endif +@import ParseCore; @implementation PFOAuth1FlowDialog diff --git a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.h b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.h index 2d6b19c48..6c836a102 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.h +++ b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.h @@ -9,11 +9,7 @@ #import -#if __has_include() -#import -#else -#import "PFUserAuthenticationDelegate.h" -#endif +@import ParseCore; @class BFTask<__covariant BFGenericType>; @class PF_Twitter; diff --git a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.m b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.m index d8cd8bba0..8af1b5384 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.m +++ b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterAuthenticationProvider.m @@ -15,11 +15,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif +@import ParseCore; #import "PFTwitterPrivateUtilities.h" #import "PF_Twitter.h" diff --git a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterPrivateUtilities.h b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterPrivateUtilities.h index e22fc2d75..f90f54919 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterPrivateUtilities.h +++ b/ParseTwitterUtils/ParseTwitterUtils/Internal/PFTwitterPrivateUtilities.h @@ -15,11 +15,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif +@import ParseCore; @interface PFTwitterPrivateUtilities : NSObject diff --git a/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.h b/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.h index 963ac9321..14b2344a0 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.h +++ b/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.h @@ -9,13 +9,7 @@ #import -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUser.h" -#endif +@import ParseCore; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.m b/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.m index 9235a444a..c6cdb23f8 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.m +++ b/ParseTwitterUtils/ParseTwitterUtils/Source/PFTwitterUtils.m @@ -17,11 +17,7 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif +@import ParseCore; #import "PFTwitterAuthenticationProvider.h" #import "PFTwitterPrivateUtilities.h" diff --git a/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.h b/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.h index 051b0feb3..bef15ba51 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.h +++ b/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.h @@ -9,11 +9,7 @@ #import -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif +@import ParseCore; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.m b/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.m index 92450f3b0..d7cb9e122 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.m +++ b/ParseTwitterUtils/ParseTwitterUtils/Source/PF_Twitter.m @@ -22,11 +22,7 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif +@import ParseCore; #import "PFOAuth1FlowDialog.h" #import "PFTwitterAlertView.h" diff --git a/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m b/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m index 71719b96a..7fe6b8aaf 100644 --- a/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m +++ b/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -@import Bolts.BFTask; +@import Bolts; #import "PFTwitterAuthenticationProvider.h" #import "PFTwitterTestCase.h" diff --git a/ParseTwitterUtils/Tests/Unit/TwitterTests.m b/ParseTwitterUtils/Tests/Unit/TwitterTests.m index 8e81b81c7..a4131ffc8 100644 --- a/ParseTwitterUtils/Tests/Unit/TwitterTests.m +++ b/ParseTwitterUtils/Tests/Unit/TwitterTests.m @@ -8,8 +8,8 @@ */ @import Accounts; -@import Bolts.BFTask; -@import Parse.PFConstants; +@import Bolts; +@import ParseCore; @import Social; #import "PFOAuth1FlowDialog.h" diff --git a/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m b/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m index 37f5998e3..63121d04a 100644 --- a/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m +++ b/ParseTwitterUtils/Tests/Unit/TwitterUtilsTests.m @@ -11,7 +11,7 @@ #import "PFTwitterUtils_Private.h" #import "PF_Twitter.h" -@import Parse; +@import ParseCore; ///-------------------------------------- #pragma mark - Tests diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj index 6e29be35a..dead509ac 100644 --- a/ParseUI/ParseUI.xcodeproj/project.pbxproj +++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj @@ -7,7 +7,17 @@ objects = { /* Begin PBXBuildFile section */ + 39452DEA2AD8FB9A0066C2AE /* ParseTwitterUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */; }; + 39452DEC2AD8FC110066C2AE /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DEB2AD8FC110066C2AE /* ParseObjC */; }; + 39452DF82AD9121D0066C2AE /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DF72AD9121D0066C2AE /* ParseObjC */; }; + 39452DFA2AD9121D0066C2AE /* ParseUI in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DF92AD9121D0066C2AE /* ParseUI */; }; + 39452DFD2AD914110066C2AE /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DFC2AD914110066C2AE /* BoltsSwift */; }; 39E22AD72AD0676700D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AD62AD0676700D9AE5C /* OCMock */; }; + 39E249A12AD1DD2E0014357C /* ParseFacebookUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249A02AD1DD2E0014357C /* ParseFacebookUtils */; }; + 39E249A32AD1DD2E0014357C /* ParseFacebookUtilsiOS in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249A22AD1DD2E0014357C /* ParseFacebookUtilsiOS */; }; + 39E249A52AD1DD2E0014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249A42AD1DD2E0014357C /* ParseObjC */; }; + 39E249A72AD1DD3A0014357C /* ParseTwitterUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249A62AD1DD3A0014357C /* ParseTwitterUtils */; }; + 39E249AB2AD1DE8F0014357C /* ParseFacebookUtilsiOS in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */; }; 7C77D109292A509000C4D90E /* PFPurchaseTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0C9292A507500C4D90E /* PFPurchaseTableViewCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C77D10A292A509000C4D90E /* PFTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0CB292A507500C4D90E /* PFTextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C77D10B292A509000C4D90E /* PFQueryTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0CD292A507500C4D90E /* PFQueryTableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -126,10 +136,8 @@ 7C77D1A5292A512300C4D90E /* PFActionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C77D102292A507500C4D90E /* PFActionButton.m */; }; 7C77D1A6292A512300C4D90E /* PFDismissButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C77D104292A507500C4D90E /* PFDismissButton.m */; }; 7C77D1A7292A512300C4D90E /* PFLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C77D108292A507500C4D90E /* PFLoadingView.m */; }; - 7C77D207292A537400C4D90E /* ParseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D162292A510400C4D90E /* ParseUI.framework */; }; 7C77D221292A575B00C4D90E /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D220292A575B00C4D90E /* Social.framework */; }; 7C77D222292A580800C4D90E /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D220292A575B00C4D90E /* Social.framework */; }; - 7C77D22E292A604700C4D90E /* ParseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D22D292A604700C4D90E /* ParseUI.framework */; }; 8129E5F51A9CB067006752BC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 81472FA71A1AB37500FD6EED /* Images.xcassets */; }; 8129E5F71A9CB067006752BC /* 0.png in Resources */ = {isa = PBXBuildFile; fileRef = 81472FA91A1AB37500FD6EED /* 0.png */; }; 8129E5F81A9CB067006752BC /* 1.png in Resources */ = {isa = PBXBuildFile; fileRef = 81472FAA1A1AB37500FD6EED /* 1.png */; }; @@ -184,226 +192,24 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 4A0ECCAC200DA7D100BA84A3 /* PBXContainerItemProxy */ = { + 39452DF12AD910490066C2AE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = 4A9A9496200D0329005D8F4B; - remoteInfo = ParseUI; - }; - 4A0ECCB0200DA8DC00BA84A3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4A0ECBE4200D8C0200BA84A3; - remoteInfo = "ParseUI-Dynamic"; - }; - 7C77D138292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 7C77D13A292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C77D13C292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 7C77D13E292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 7C77D140292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 7C77D142292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 7C77D144292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 7C77D146292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 7C77D148292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 7C77D14A292A50BF00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; - 7C77D14E292A50F600C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 7C77D1B0292A51AA00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = "ParseTwitterUtils-iOS"; - }; - 7C77D1B2292A51AA00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81ECACD71D1E14E000FA7673; - remoteInfo = "ParseTwitterUtils-iOS-Dynamic"; - }; - 7C77D1B4292A51AA00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CB98C61AB7905D00136FA5; - remoteInfo = "ParseTwitterUtils-Tests"; - }; - 7C77D1B6292A51AA00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8166FB671B4F1D77003841A2; - remoteInfo = ParseTwitterTestApplication; - }; - 7C77D1DF292A522800C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = ParseFacebookUtilsiOS; - }; - 7C77D1E1292A522800C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA75200C020E00AA7479; - remoteInfo = "ParseFacebookUtilsiOS-Dynamic"; - }; - 7C77D1E3292A522800C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81CB98C61AB7905D00136FA5; - remoteInfo = "ParseFacebookUtils-UnitTests"; - }; - 7C77D1E5292A522800C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F535C73B1B54B4A800A7D81E; - remoteInfo = ParseFacebookTestApplication; - }; - 84745C482939EE77002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = "ParseFacebookUtilsV4-iOS"; - }; - 84745C4A2939EE77002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81FE7F8B1C17790400E6BD34; - remoteInfo = "ParseFacebookUtilsV4-tvOS"; - }; - 84745C4C2939EE77002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA75200C020E00AA7479; - remoteInfo = "ParseFacebookUtilsV4-iOS-Dynamic"; - }; - 84745C4E2939EE77002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AAEAA90200C022300AA7479; - remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic"; - }; - 84745C622939EFD7002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C3821B19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 84745C6B293B3F03002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseTwitterUtils-iOS"; - }; - 84745C6D293B3F09002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseFacebookUtilsV4-iOS"; - }; - 84745C6F293B3F46002D00B2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = ParseFacebookUtilsiOS; + remoteGlobalIDString = 81472F661A1AB33800FD6EED; + remoteInfo = ParseUIDemo; }; - BCCBE8CF23BFB89D0044A79C /* PBXContainerItemProxy */ = { + 39452DF52AD911740066C2AE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 4A9A9496200D0329005D8F4B; remoteInfo = ParseUI; }; - BCCBE8D723BFB9EB0044A79C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 81472F661A1AB33800FD6EED; - remoteInfo = ParseUIDemo; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 39E2499F2AD1DD160014357C /* Parse-SDK-iOS-OSX */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Parse-SDK-iOS-OSX"; path = ..; sourceTree = ""; }; 4A9A947E200D0226005D8F4B /* convert_images.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = convert_images.rb; sourceTree = ""; }; 4A9A9480200D02CE005D8F4B /* ParseUI-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseUI-iOS.xcconfig"; sourceTree = ""; }; 4A9A9482200D02CE005D8F4B /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; @@ -497,10 +303,7 @@ 7C77D106292A507500C4D90E /* PFActionButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFActionButton.h; sourceTree = ""; }; 7C77D107292A507500C4D90E /* PFLoadingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFLoadingView.h; sourceTree = ""; }; 7C77D108292A507500C4D90E /* PFLoadingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFLoadingView.m; sourceTree = ""; }; - 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; 7C77D162292A510400C4D90E /* ParseUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ParseTwitterUtils.xcodeproj; path = ../ParseTwitterUtils/ParseTwitterUtils.xcodeproj; sourceTree = ""; }; - 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ParseFacebookUtilsiOS.xcodeproj; path = ../ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj; sourceTree = ""; }; 7C77D21F292A56F600C4D90E /* ParseUIDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseUIDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7C77D220292A575B00C4D90E /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; 7C77D22D292A604700C4D90E /* ParseUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -562,7 +365,6 @@ 81FC6B6B1A9D1CE900104E45 /* SubtitleImageCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubtitleImageCollectionViewController.swift; sourceTree = ""; }; 81FC6B711A9D1CFD00104E45 /* SimpleQueryCollectionStoryboard-Swift.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "SimpleQueryCollectionStoryboard-Swift.storyboard"; path = "ParseUIDemo/Swift/Resources/SimpleQueryCollectionStoryboard-Swift.storyboard"; sourceTree = SOURCE_ROOT; }; 81FC6B741A9D1D4700104E45 /* CustomProductTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomProductTableViewController.swift; sourceTree = ""; }; - 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ParseFacebookUtils.xcodeproj; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/ParseFacebookUtils/ParseFacebookUtils.xcodeproj"; sourceTree = ""; }; BC32E14523ABAE04009BDFCD /* ParseUIDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = ParseUIDemo.entitlements; path = ParseUIDemo/ParseUIDemo.entitlements; sourceTree = ""; }; BCCBE8CB23BFB89D0044A79C /* SignInWithAppleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SignInWithAppleTests.m; sourceTree = ""; }; BCCBE8CD23BFB89D0044A79C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -586,6 +388,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E249A72AD1DD3A0014357C /* ParseTwitterUtils in Frameworks */, + 39E249A52AD1DD2E0014357C /* ParseObjC in Frameworks */, + 39E249A32AD1DD2E0014357C /* ParseFacebookUtilsiOS in Frameworks */, + 39E249A12AD1DD2E0014357C /* ParseFacebookUtils in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -593,7 +399,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39452DFA2AD9121D0066C2AE /* ParseUI in Frameworks */, + 39452DF82AD9121D0066C2AE /* ParseObjC in Frameworks */, 7C77D221292A575B00C4D90E /* Social.framework in Frameworks */, + 39452DFD2AD914110066C2AE /* BoltsSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -601,6 +410,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39452DEA2AD8FB9A0066C2AE /* ParseTwitterUtils in Frameworks */, + 39E249AB2AD1DE8F0014357C /* ParseFacebookUtilsiOS in Frameworks */, 7C77D222292A580800C4D90E /* Social.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -609,9 +420,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7C77D22E292A604700C4D90E /* ParseUI.framework in Frameworks */, + 39452DEC2AD8FC110066C2AE /* ParseObjC in Frameworks */, 39E22AD72AD0676700D9AE5C /* OCMock in Frameworks */, - 7C77D207292A537400C4D90E /* ParseUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -621,6 +431,7 @@ 0867D691FE84028FC02AAC07 /* Breakpad */ = { isa = PBXGroup; children = ( + 39E2499E2AD1DD160014357C /* Packages */, 4A9A9422200D0226005D8F4B /* ParseUI */, 81472F621A1AB31F00FD6EED /* ParseUIDemo */, BCCBE8CA23BFB89D0044A79C /* SignInWithAppleTests */, @@ -630,18 +441,22 @@ 7C77D22D292A604700C4D90E /* ParseUI.framework */, 7C77D22F292A604700C4D90E /* ParseUIDemo-Swift.app */, 7C77D230292A604700C4D90E /* SignInWithAppleTests.xctest */, - 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */, ); name = Breakpad; sourceTree = ""; }; + 39E2499E2AD1DD160014357C /* Packages */ = { + isa = PBXGroup; + children = ( + 39E2499F2AD1DD160014357C /* Parse-SDK-iOS-OSX */, + ); + name = Packages; + sourceTree = ""; + }; 3F5307328F84566C90FBCF25 /* Frameworks */ = { isa = PBXGroup; children = ( 7C77D220292A575B00C4D90E /* Social.framework */, - 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */, - 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */, - 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -866,45 +681,6 @@ path = Buttons; sourceTree = ""; }; - 7C77D12A292A50BF00C4D90E /* Products */ = { - isa = PBXGroup; - children = ( - 7C77D139292A50BF00C4D90E /* Parse.framework */, - 7C77D13B292A50BF00C4D90E /* Parse.framework */, - 7C77D13D292A50BF00C4D90E /* ParseUnitTests-iOS.xctest */, - 7C77D13F292A50BF00C4D90E /* Parse.framework */, - 7C77D141292A50BF00C4D90E /* ParseUnitTests-macOS.xctest */, - 7C77D143292A50BF00C4D90E /* Parse.framework */, - 7C77D145292A50BF00C4D90E /* Parse.framework */, - 7C77D147292A50BF00C4D90E /* Parse.framework */, - 7C77D149292A50BF00C4D90E /* Parse.framework */, - 7C77D14B292A50BF00C4D90E /* ParseUnitTests-iOS-host.app */, - ); - name = Products; - sourceTree = ""; - }; - 7C77D1A9292A51AA00C4D90E /* Products */ = { - isa = PBXGroup; - children = ( - 7C77D1B1292A51AA00C4D90E /* ParseTwitterUtils.framework */, - 7C77D1B3292A51AA00C4D90E /* ParseTwitterUtils.framework */, - 7C77D1B5292A51AA00C4D90E /* ParseTwitterUtils-Tests.xctest */, - 7C77D1B7292A51AA00C4D90E /* ParseTwitterTestApplication.app */, - ); - name = Products; - sourceTree = ""; - }; - 7C77D1D6292A522800C4D90E /* Products */ = { - isa = PBXGroup; - children = ( - 7C77D1E0292A522800C4D90E /* ParseFacebookUtilsiOS.framework */, - 7C77D1E2292A522800C4D90E /* ParseFacebookUtilsiOS.framework */, - 7C77D1E4292A522800C4D90E /* ParseFacebookUtilsiOS-UnitTests.xctest */, - 7C77D1E6292A522800C4D90E /* ParseFacebookTestApplication.app */, - ); - name = Products; - sourceTree = ""; - }; 7C77D246292A606800C4D90E /* Sign In With Apple */ = { isa = PBXGroup; children = ( @@ -1118,17 +894,6 @@ path = ProductTableViewController; sourceTree = ""; }; - 84745C402939EE77002D00B2 /* Products */ = { - isa = PBXGroup; - children = ( - 84745C492939EE77002D00B2 /* ParseFacebookUtilsV4.framework */, - 84745C4B2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */, - 84745C4D2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */, - 84745C4F2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */, - ); - name = Products; - sourceTree = ""; - }; BCCBE8CA23BFB89D0044A79C /* SignInWithAppleTests */ = { isa = PBXGroup; children = ( @@ -1232,7 +997,6 @@ buildRules = ( ); dependencies = ( - 7C77D14F292A50F600C4D90E /* PBXTargetDependency */, ); name = "ParseUI-Dynamic"; productName = ParseUI; @@ -1251,12 +1015,14 @@ buildRules = ( ); dependencies = ( - 84745C70293B3F46002D00B2 /* PBXTargetDependency */, - 84745C6E293B3F09002D00B2 /* PBXTargetDependency */, - 84745C6C293B3F03002D00B2 /* PBXTargetDependency */, - 84745C632939EFD7002D00B2 /* PBXTargetDependency */, ); name = ParseUI; + packageProductDependencies = ( + 39E249A02AD1DD2E0014357C /* ParseFacebookUtils */, + 39E249A22AD1DD2E0014357C /* ParseFacebookUtilsiOS */, + 39E249A42AD1DD2E0014357C /* ParseObjC */, + 39E249A62AD1DD3A0014357C /* ParseTwitterUtils */, + ); productName = ParseUI; productReference = 7C77D22D292A604700C4D90E /* ParseUI.framework */; productType = "com.apple.product-type.framework"; @@ -1272,9 +1038,13 @@ buildRules = ( ); dependencies = ( - 4A0ECCB1200DA8DC00BA84A3 /* PBXTargetDependency */, ); name = "ParseUIDemo-Swift"; + packageProductDependencies = ( + 39452DF72AD9121D0066C2AE /* ParseObjC */, + 39452DF92AD9121D0066C2AE /* ParseUI */, + 39452DFC2AD914110066C2AE /* BoltsSwift */, + ); productName = ParseUIDemo; productReference = 7C77D22F292A604700C4D90E /* ParseUIDemo-Swift.app */; productType = "com.apple.product-type.application"; @@ -1290,9 +1060,13 @@ buildRules = ( ); dependencies = ( - 4A0ECCAD200DA7D100BA84A3 /* PBXTargetDependency */, + 39452DF62AD911740066C2AE /* PBXTargetDependency */, ); name = ParseUIDemo; + packageProductDependencies = ( + 39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */, + 39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */, + ); productName = ParseUIDemo; productReference = 7C77D21F292A56F600C4D90E /* ParseUIDemo.app */; productType = "com.apple.product-type.application"; @@ -1308,12 +1082,12 @@ buildRules = ( ); dependencies = ( - BCCBE8D023BFB89D0044A79C /* PBXTargetDependency */, - BCCBE8D823BFB9EB0044A79C /* PBXTargetDependency */, + 39452DF22AD910490066C2AE /* PBXTargetDependency */, ); name = SignInWithAppleTests; packageProductDependencies = ( 39E22AD62AD0676700D9AE5C /* OCMock */, + 39452DEB2AD8FC110066C2AE /* ParseObjC */, ); productName = SignInWithAppleTests; productReference = 7C77D230292A604700C4D90E /* SignInWithAppleTests.xctest */; @@ -1372,27 +1146,10 @@ mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; packageReferences = ( 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + 39452DFB2AD914110066C2AE /* XCRemoteSwiftPackageReference "Bolts-Swift" */, ); productRefGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 7C77D12A292A50BF00C4D90E /* Products */; - ProjectRef = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; - }, - { - ProductGroup = 84745C402939EE77002D00B2 /* Products */; - ProjectRef = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; - }, - { - ProductGroup = 7C77D1D6292A522800C4D90E /* Products */; - ProjectRef = 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */; - }, - { - ProductGroup = 7C77D1A9292A51AA00C4D90E /* Products */; - ProjectRef = 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 81472F661A1AB33800FD6EED /* ParseUIDemo */, @@ -1404,163 +1161,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 7C77D139292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D138292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D13B292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D13A292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D13D292A50BF00C4D90E /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 7C77D13C292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D13F292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D13E292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D141292A50BF00C4D90E /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 7C77D140292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D143292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D142292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D145292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D144292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D147292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D146292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D149292A50BF00C4D90E /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 7C77D148292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D14B292A50BF00C4D90E /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 7C77D14A292A50BF00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1B1292A51AA00C4D90E /* ParseTwitterUtils.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseTwitterUtils.framework; - remoteRef = 7C77D1B0292A51AA00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1B3292A51AA00C4D90E /* ParseTwitterUtils.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseTwitterUtils.framework; - remoteRef = 7C77D1B2292A51AA00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1B5292A51AA00C4D90E /* ParseTwitterUtils-Tests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseTwitterUtils-Tests.xctest"; - remoteRef = 7C77D1B4292A51AA00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1B7292A51AA00C4D90E /* ParseTwitterTestApplication.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = ParseTwitterTestApplication.app; - remoteRef = 7C77D1B6292A51AA00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1E0292A522800C4D90E /* ParseFacebookUtilsiOS.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsiOS.framework; - remoteRef = 7C77D1DF292A522800C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1E2292A522800C4D90E /* ParseFacebookUtilsiOS.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsiOS.framework; - remoteRef = 7C77D1E1292A522800C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1E4292A522800C4D90E /* ParseFacebookUtilsiOS-UnitTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseFacebookUtilsiOS-UnitTests.xctest"; - remoteRef = 7C77D1E3292A522800C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1E6292A522800C4D90E /* ParseFacebookTestApplication.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = ParseFacebookTestApplication.app; - remoteRef = 7C77D1E5292A522800C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84745C492939EE77002D00B2 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 84745C482939EE77002D00B2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84745C4B2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 84745C4A2939EE77002D00B2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84745C4D2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 84745C4C2939EE77002D00B2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84745C4F2939EE77002D00B2 /* ParseFacebookUtilsV4.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ParseFacebookUtilsV4.framework; - remoteRef = 84745C4E2939EE77002D00B2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4A0ECC20200D8C0200BA84A3 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1745,50 +1345,15 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4A0ECCAD200DA7D100BA84A3 /* PBXTargetDependency */ = { + 39452DF22AD910490066C2AE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 4A9A9496200D0329005D8F4B /* ParseUI */; - targetProxy = 4A0ECCAC200DA7D100BA84A3 /* PBXContainerItemProxy */; - }; - 4A0ECCB1200DA8DC00BA84A3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4A0ECBE4200D8C0200BA84A3 /* ParseUI-Dynamic */; - targetProxy = 4A0ECCB0200DA8DC00BA84A3 /* PBXContainerItemProxy */; - }; - 7C77D14F292A50F600C4D90E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 7C77D14E292A50F600C4D90E /* PBXContainerItemProxy */; - }; - 84745C632939EFD7002D00B2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS"; - targetProxy = 84745C622939EFD7002D00B2 /* PBXContainerItemProxy */; - }; - 84745C6C293B3F03002D00B2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseTwitterUtils-iOS"; - targetProxy = 84745C6B293B3F03002D00B2 /* PBXContainerItemProxy */; - }; - 84745C6E293B3F09002D00B2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "ParseFacebookUtilsV4-iOS"; - targetProxy = 84745C6D293B3F09002D00B2 /* PBXContainerItemProxy */; - }; - 84745C70293B3F46002D00B2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = ParseFacebookUtilsiOS; - targetProxy = 84745C6F293B3F46002D00B2 /* PBXContainerItemProxy */; + target = 81472F661A1AB33800FD6EED /* ParseUIDemo */; + targetProxy = 39452DF12AD910490066C2AE /* PBXContainerItemProxy */; }; - BCCBE8D023BFB89D0044A79C /* PBXTargetDependency */ = { + 39452DF62AD911740066C2AE /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4A9A9496200D0329005D8F4B /* ParseUI */; - targetProxy = BCCBE8CF23BFB89D0044A79C /* PBXContainerItemProxy */; - }; - BCCBE8D823BFB9EB0044A79C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 81472F661A1AB33800FD6EED /* ParseUIDemo */; - targetProxy = BCCBE8D723BFB9EB0044A79C /* PBXContainerItemProxy */; + targetProxy = 39452DF52AD911740066C2AE /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -2030,6 +1595,7 @@ baseConfigurationReference = 4A9A9480200D02CE005D8F4B /* ParseUI-iOS.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -2099,6 +1665,7 @@ baseConfigurationReference = 4A9A9480200D02CE005D8F4B /* ParseUI-iOS.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -2480,6 +2047,14 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + 39452DFB2AD914110066C2AE /* XCRemoteSwiftPackageReference "Bolts-Swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/BoltsFramework/Bolts-Swift.git"; + requirement = { + kind = exactVersion; + version = 1.5.0; + }; + }; 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/erikdoe/ocmock"; @@ -2491,11 +2066,52 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseTwitterUtils; + }; + 39452DEB2AD8FC110066C2AE /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39452DF72AD9121D0066C2AE /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39452DF92AD9121D0066C2AE /* ParseUI */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseUI; + }; + 39452DFC2AD914110066C2AE /* BoltsSwift */ = { + isa = XCSwiftPackageProductDependency; + package = 39452DFB2AD914110066C2AE /* XCRemoteSwiftPackageReference "Bolts-Swift" */; + productName = BoltsSwift; + }; 39E22AD62AD0676700D9AE5C /* OCMock */ = { isa = XCSwiftPackageProductDependency; package = 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; productName = OCMock; }; + 39E249A02AD1DD2E0014357C /* ParseFacebookUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtils; + }; + 39E249A22AD1DD2E0014357C /* ParseFacebookUtilsiOS */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtilsiOS; + }; + 39E249A42AD1DD2E0014357C /* ParseObjC */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseObjC; + }; + 39E249A62AD1DD3A0014357C /* ParseTwitterUtils */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseTwitterUtils; + }; + 39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */ = { + isa = XCSwiftPackageProductDependency; + productName = ParseFacebookUtilsiOS; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; diff --git a/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleAuthenticationProvider.h b/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleAuthenticationProvider.h index 0aea3d98e..a7b79552c 100644 --- a/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleAuthenticationProvider.h +++ b/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleAuthenticationProvider.h @@ -8,11 +8,7 @@ #import -#if __has_include() -#import -#else -#import "PFUserAuthenticationDelegate.h" -#endif +@import ParseCore; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleUtils.h b/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleUtils.h index 048765191..ff92b4f5c 100644 --- a/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleUtils.h +++ b/ParseUI/ParseUI/Internal/Sign In With Apple/PFAppleUtils.h @@ -8,14 +8,7 @@ #import -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUser.h" -#endif - +@import ParseCore; @import AuthenticationServices; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseUI/ParseUI/Source/PFImageView.h b/ParseUI/ParseUI/Source/PFImageView.h index f82c251b7..63a68466b 100644 --- a/ParseUI/ParseUI/Source/PFImageView.h +++ b/ParseUI/ParseUI/Source/PFImageView.h @@ -20,15 +20,10 @@ */ #import - -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif - #import "ParseUIConstants.h" +@import ParseCore; + NS_ASSUME_NONNULL_BEGIN typedef void(^PFImageViewImageResultBlock)(UIImage *__nullable image, NSError *__nullable error); diff --git a/ParseUI/ParseUI/Source/PFImageView.m b/ParseUI/ParseUI/Source/PFImageView.m index b1d5c6fcd..387b1a4d0 100644 --- a/ParseUI/ParseUI/Source/PFImageView.m +++ b/ParseUI/ParseUI/Source/PFImageView.m @@ -20,6 +20,7 @@ */ #import "PFImageView.h" +#import "PFImageCache.h" #if __has_include() #import @@ -27,13 +28,7 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "PFFileObject.h" -#endif - -#import "PFImageCache.h" +@import ParseCore; @implementation PFImageView diff --git a/ParseUI/ParseUI/Source/PFLogInViewController.h b/ParseUI/ParseUI/Source/PFLogInViewController.h index bd8f03706..b5e8ffee7 100644 --- a/ParseUI/ParseUI/Source/PFLogInViewController.h +++ b/ParseUI/ParseUI/Source/PFLogInViewController.h @@ -20,16 +20,11 @@ */ #import - -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif - #import "ParseUIConstants.h" #import "PFLogInView.h" +@import ParseCore; + NS_ASSUME_NONNULL_BEGIN @import AuthenticationServices; diff --git a/ParseUI/ParseUI/Source/PFLogInViewController.m b/ParseUI/ParseUI/Source/PFLogInViewController.m index 2eaa95410..58b1828be 100644 --- a/ParseUI/ParseUI/Source/PFLogInViewController.m +++ b/ParseUI/ParseUI/Source/PFLogInViewController.m @@ -20,13 +20,6 @@ */ #import "PFLogInViewController.h" - -#if __has_include() -#import -#else -#import "PFUser.h" -#endif - #import "PFActionButton.h" #import "PFUIAlertView.h" #import "PFLocalization.h" @@ -36,6 +29,8 @@ #import "PFLogInView_Private.h" #import "PFAppleUtils.h" +@import ParseCore; + NSString *const PFLogInSuccessNotification = @"com.parse.ui.login.success"; NSString *const PFLogInFailureNotification = @"com.parse.ui.login.failure"; NSString *const PFLogInCancelNotification = @"com.parse.ui.login.cancel"; diff --git a/ParseUI/ParseUI/Source/PFProductTableViewController.m b/ParseUI/ParseUI/Source/PFProductTableViewController.m index 2d1488bc1..47271de22 100644 --- a/ParseUI/ParseUI/Source/PFProductTableViewController.m +++ b/ParseUI/ParseUI/Source/PFProductTableViewController.m @@ -20,21 +20,12 @@ */ #import "PFProductTableViewController.h" - -#if __has_include() -#import -#import -#import -#else -#import "PFUser.h" -#import "PFPurchase.h" -#import "PFQuery.h" -#endif - #import "PFUIAlertView.h" #import "PFLocalization.h" #import "PFPurchaseTableViewCell.h" +@import ParseCore; + static NSString *const PFProductMetadataPriceKey = @"price"; static NSString *const PFProductMetadataPriceLocaleKey = @"priceLocale"; diff --git a/ParseUI/ParseUI/Source/PFQueryCollectionViewController.h b/ParseUI/ParseUI/Source/PFQueryCollectionViewController.h index 4cbc0d940..48a97550a 100644 --- a/ParseUI/ParseUI/Source/PFQueryCollectionViewController.h +++ b/ParseUI/ParseUI/Source/PFQueryCollectionViewController.h @@ -20,15 +20,10 @@ */ #import - -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif - #import "ParseUIConstants.h" +@import ParseCore; + NS_ASSUME_NONNULL_BEGIN @class BFTask<__covariant BFGenericType>; diff --git a/ParseUI/ParseUI/Source/PFQueryCollectionViewController.m b/ParseUI/ParseUI/Source/PFQueryCollectionViewController.m index b34802187..0f3ded0fd 100644 --- a/ParseUI/ParseUI/Source/PFQueryCollectionViewController.m +++ b/ParseUI/ParseUI/Source/PFQueryCollectionViewController.m @@ -29,11 +29,7 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif +@import ParseCore; #import "PFActivityIndicatorCollectionReusableView.h" #import "PFCollectionViewCell.h" diff --git a/ParseUI/ParseUI/Source/PFQueryTableViewController.h b/ParseUI/ParseUI/Source/PFQueryTableViewController.h index 4418015cf..3460f4caf 100644 --- a/ParseUI/ParseUI/Source/PFQueryTableViewController.h +++ b/ParseUI/ParseUI/Source/PFQueryTableViewController.h @@ -20,15 +20,10 @@ */ #import - -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif - #import "ParseUIConstants.h" +@import ParseCore; + NS_ASSUME_NONNULL_BEGIN @class BFTask<__covariant BFGenericType>; diff --git a/ParseUI/ParseUI/Source/PFQueryTableViewController.m b/ParseUI/ParseUI/Source/PFQueryTableViewController.m index 347214a20..655e89e35 100644 --- a/ParseUI/ParseUI/Source/PFQueryTableViewController.m +++ b/ParseUI/ParseUI/Source/PFQueryTableViewController.m @@ -31,11 +31,7 @@ #import "BFTaskCompletionSource.h" #endif -#if __has_include() -#import -#else -#import "Parse.h" -#endif +@import ParseCore; #import "PFActivityIndicatorTableViewCell.h" #import "PFImageView.h" diff --git a/ParseUI/ParseUI/Source/PFSignUpViewController.h b/ParseUI/ParseUI/Source/PFSignUpViewController.h index 4cc695a9c..6c667d15e 100644 --- a/ParseUI/ParseUI/Source/PFSignUpViewController.h +++ b/ParseUI/ParseUI/Source/PFSignUpViewController.h @@ -20,16 +20,11 @@ */ #import - -#if __has_include() -#import -#else -#import "PFConstants.h" -#endif - #import "ParseUIConstants.h" #import "PFSignUpView.h" +@import ParseCore; + @class PFUser; @protocol PFSignUpViewControllerDelegate; diff --git a/ParseUI/ParseUI/Source/PFSignUpViewController.m b/ParseUI/ParseUI/Source/PFSignUpViewController.m index 8addffaa6..2f6431e46 100644 --- a/ParseUI/ParseUI/Source/PFSignUpViewController.m +++ b/ParseUI/ParseUI/Source/PFSignUpViewController.m @@ -20,20 +20,13 @@ */ #import "PFSignUpViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFConstants.h" -#import "PFUser.h" -#endif - #import "PFUIAlertView.h" #import "PFLocalization.h" #import "PFPrimaryButton.h" #import "PFTextField.h" +@import ParseCore; + NSString *const PFSignUpSuccessNotification = @"com.parse.ui.signup.success"; NSString *const PFSignUpFailureNotification = @"com.parse.ui.signup.failure"; NSString *const PFSignUpCancelNotification = @"com.parse.ui.signup.cancel"; diff --git a/ParseUI/ParseUIDemo/Classes/AppDelegate.m b/ParseUI/ParseUIDemo/Classes/AppDelegate.m index a025ce74f..1f7ccd8a3 100644 --- a/ParseUI/ParseUIDemo/Classes/AppDelegate.m +++ b/ParseUI/ParseUIDemo/Classes/AppDelegate.m @@ -20,27 +20,12 @@ */ #import "AppDelegate.h" - -#if __has_include() -#import -#else -#import "Parse.h" -#endif - -#if __has_include() -#import -#else -#import "ParseTwitterUtils.h" -#endif - -#if __has_include() -#import -#else -#import "ParseFacebookUtilsiOS.h" -#endif - #import "PFUIDemoViewController.h" +@import ParseCore; +@import ParseTwitterUtils; +@import ParseFacebookUtilsiOS; + @implementation AppDelegate #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.m index b9cf905a2..3f71ce92f 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.m @@ -27,11 +27,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#else -#import "PFObject.h" -#endif +@import ParseCore; @interface DeletionCollectionViewController() diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.m index 826290f74..efd0d6879 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.m @@ -20,17 +20,10 @@ */ #import "PaginatedCollectionViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFCollectionViewCell.h" +@import ParseCore; + @implementation PaginatedCollectionViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.m index 2a91c847e..d3391f6d5 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.m @@ -20,17 +20,10 @@ */ #import "SectionedCollectionViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFCollectionViewCell.h" +@import ParseCore; + #pragma mark - #pragma mark SimpleCollectionReusableView diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.m index bbcc23f9a..3f683af9f 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.m @@ -20,15 +20,10 @@ */ #import "SimpleCollectionViewController.h" - -#if __has_include() -#import -#else -#import "PFQuery.h" -#endif - #import "PFCollectionViewCell.h" +@import ParseCore; + @implementation SimpleCollectionViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.m index b8e416a1a..8fd4cae08 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.m @@ -20,15 +20,10 @@ */ #import "StoryboardCollectionViewController.h" - -#if __has_include() -#import -#else -#import "PFQuery.h" -#endif - #import "PFCollectionViewCell.h" +@import ParseCore; + @implementation StoryboardCollectionViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.m index dd99c456f..095af1ff8 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.m @@ -20,16 +20,11 @@ */ #import "SubtitleImageCollectionViewController.h" - -#if __has_include() -#import -#else -#import "PFQuery.h" -#endif - #import "PFCollectionViewCell.h" #import "PFImageView.h" +@import ParseCore; + @implementation SubtitleImageCollectionViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/CustomProductTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/CustomProductTableViewController.m index 072c04c49..535fc00b4 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/CustomProductTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/CustomProductTableViewController.m @@ -21,13 +21,7 @@ #import "CustomProductTableViewController.h" -#if __has_include() -#import -#import -#else -#import "PFQuery.h" -#import "PFPurchase.h" -#endif +@import ParseCore; @implementation CustomProductTableViewController diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/DeletionTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/DeletionTableViewController.m index b4bb48793..5b3f0b93c 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/DeletionTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/DeletionTableViewController.m @@ -27,11 +27,7 @@ #import "BFTask.h" #endif -#if __has_include() -#import -#else -#import "PFObject.h" -#endif +@import ParseCore; @interface DeletionTableViewController() diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.m index 9d4265f82..db202d4fa 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.m @@ -20,17 +20,10 @@ */ #import "PaginatedTableViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFTableViewCell.h" +@import ParseCore; + @implementation PaginatedTableViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SectionedTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SectionedTableViewController.m index 46a5fa0bd..9ccdfac00 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SectionedTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SectionedTableViewController.m @@ -20,17 +20,10 @@ */ #import "SectionedTableViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFTableViewCell.h" +@import ParseCore; + @interface SectionedTableViewController () { NSArray *_sectionSortedKeys; diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SimpleTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SimpleTableViewController.m index 772c90b28..2c2b6d56b 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SimpleTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SimpleTableViewController.m @@ -20,17 +20,10 @@ */ #import "SimpleTableViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFTableViewCell.h" +@import ParseCore; + @implementation SimpleTableViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.m index 6fb500e9b..504c7be09 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.m @@ -20,17 +20,10 @@ */ #import "StoryboardTableViewController.h" - -#if __has_include() -#import -#import -#else -#import "PFObject.h" -#import "PFQuery.h" -#endif - #import "PFTableViewCell.h" +@import ParseCore; + @implementation StoryboardTableViewController #pragma mark - diff --git a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.m b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.m index 63dace8c5..3998c5dc9 100644 --- a/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.m +++ b/ParseUI/ParseUIDemo/Classes/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.m @@ -20,15 +20,10 @@ */ #import "SubtitleImageTableViewController.h" - -#if __has_include() -#import -#else -#import "PFObject.h" -#endif - #import "PFTableViewCell.h" +@import ParseCore; + @implementation SubtitleImageTableViewController - (UITableViewCell *)tableView:(UITableView *)tableView diff --git a/ParseUI/ParseUIDemo/Swift/AppDelegate.swift b/ParseUI/ParseUIDemo/Swift/AppDelegate.swift index d055e5352..34d465a11 100644 --- a/ParseUI/ParseUIDemo/Swift/AppDelegate.swift +++ b/ParseUI/ParseUIDemo/Swift/AppDelegate.swift @@ -20,7 +20,7 @@ */ import UIKit -import Parse +import ParseCore import ParseFacebookUtilsiOS import ParseTwitterUtils diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/LogInViewController/CustomLogInViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/LogInViewController/CustomLogInViewController.swift index 1a3689b09..59ba336be 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/LogInViewController/CustomLogInViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/LogInViewController/CustomLogInViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class CustomLogInViewController: PFLogInViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/ProductTableViewController/CustomProductTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/ProductTableViewController/CustomProductTableViewController.swift index 82faeb50a..bb6c6795d 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/ProductTableViewController/CustomProductTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/ProductTableViewController/CustomProductTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class CustomProductTableViewController: PFProductTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift index 1ca7d36f8..d93fe60cf 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift @@ -8,10 +8,10 @@ import UIKit -import Parse +import ParseCore import ParseUI -import Bolts.BFTask +import BoltsSwift class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlertViewDelegate { convenience init(className: String?) { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift index 7fbba76bc..caef91883 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class PaginatedCollectionViewController: PFQueryCollectionViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift index 2bc3000c4..9e32e52c4 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SimpleCollectionReusableView : UICollectionReusableView { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift index a713cf647..472e0e4c6 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SimpleCollectionViewController: PFQueryCollectionViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift index 87d139e7e..520551d8e 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class StoryboardCollectionViewController: PFQueryCollectionViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.swift index 90daf8079..e934bd39d 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SubtitleImageCollectionViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SubtitleImageCollectionViewController: PFQueryCollectionViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift index e90022fe1..34d2d1c1f 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift @@ -8,10 +8,10 @@ import UIKit -import Parse +import ParseCore import ParseUI -import Bolts.BFTask +import BoltsSwift class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelegate { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.swift index c8d5f705a..f1596353e 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/PaginatedTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class PaginatedTableViewController: PFQueryTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift index c1774fbe1..c7edab07f 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SectionedTableViewController: PFQueryTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SimpleTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SimpleTableViewController.swift index 993d0d8c5..ac948c151 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SimpleTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SimpleTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SimpleTableViewController: PFQueryTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.swift index 43f103331..8a8ca41b4 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/StoryboardTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class StoryboardTableViewController: PFQueryTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.swift index 68c158bd7..65cabb92a 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SubtitleImageTableViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class SubtitleImageTableViewController: PFQueryTableViewController { diff --git a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/SignUpViewController/CustomSignUpViewController.swift b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/SignUpViewController/CustomSignUpViewController.swift index bf885db07..d9d6fcf2e 100644 --- a/ParseUI/ParseUIDemo/Swift/CustomViewControllers/SignUpViewController/CustomSignUpViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/CustomViewControllers/SignUpViewController/CustomSignUpViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI class CustomSignUpViewController: PFSignUpViewController { diff --git a/ParseUI/ParseUIDemo/Swift/UIDemoViewController.swift b/ParseUI/ParseUIDemo/Swift/UIDemoViewController.swift index 01543634c..e4c4fa154 100644 --- a/ParseUI/ParseUIDemo/Swift/UIDemoViewController.swift +++ b/ParseUI/ParseUIDemo/Swift/UIDemoViewController.swift @@ -21,7 +21,7 @@ import UIKit -import Parse +import ParseCore import ParseUI enum UIDemoType : Int { diff --git a/ParseUI/SignInWithAppleTests/SignInWithAppleTests.m b/ParseUI/SignInWithAppleTests/SignInWithAppleTests.m index cb17a0989..b74b76ba0 100644 --- a/ParseUI/SignInWithAppleTests/SignInWithAppleTests.m +++ b/ParseUI/SignInWithAppleTests/SignInWithAppleTests.m @@ -8,7 +8,7 @@ #import #import "PFAppleUtils.h" -#import "Parse/PFUser.h" +@import ParseCore; @import OCMock; diff --git a/Rakefile b/Rakefile index 457d58e91..154e24945 100644 --- a/Rakefile +++ b/Rakefile @@ -245,6 +245,7 @@ namespace :test do task :all do Rake::Task['test:parseui:framework'].invoke Rake::Task['test:parseui:demo_objc'].invoke + Rake::Task['test:parseui:demo_swift'].invoke end task :framework do diff --git a/Scripts/build_third_party.rb b/Scripts/build_third_party.rb deleted file mode 100755 index 507b7078d..000000000 --- a/Scripts/build_third_party.rb +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env ruby -# -# Copyright (c) 2015-present, Parse, LLC. -# All rights reserved. -# -# This source code is licensed under the BSD-style license found in the -# LICENSE file in the root directory of this source tree. An additional grant -# of patent rights can be found in the PATENTS file in the same directory. -# - -framework_path = ARGV[0] -build_script = ARGV[1] - -if framework_path.nil? || build_script.nil? - puts "Use this script to build a third party framework for iOS/OSX." - puts "It is intended to support building Bolts.framework and FacebookSDK.framework" - puts "Usage: 'build_third_party.rb " - exit(1) -end - -# Don't use rubygems git to make it run in any environment -last_revision = `git log -n 1 --format=%h #{framework_path}` - -build_revision_path = File.join(framework_path, 'build', 'build_revision') -build_revision = File.exist?(build_revision_path) ? File.open(build_revision_path, 'rb').read : nil - -if last_revision == build_revision - puts "No changes in #{framework_path}. Skipping build." -else - puts "Found local changes in #{framework_path}. Building third party." - - result = system("XCTOOL=xcodebuild ./#{build_script}") - if result - File.open(build_revision_path, 'w') { |f| f.write(last_revision) } - exit(0) - else - exit(1) - end -end