From 3d1ad340702e98635f2c5e59314c8855512e88ea Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 11:05:10 -0500 Subject: [PATCH 1/6] refactor: Remove OCMock Carthage Dependency --- .github/workflows/ci.yml | 7 + .gitmodules | 3 - Carthage/Checkouts/OCMock | 1 - Package.resolved | 9 + Package.swift | 106 +++--- Parse.xcworkspace/contents.xcworkspacedata | 7 - .../xcshareddata/swiftpm/Package.resolved | 9 + .../Configurations/Parse-iOS-Dynamic.xcconfig | 2 +- .../ParseUnitTests-iOS.xcconfig | 2 +- Parse/Parse.xcodeproj/project.pbxproj | 206 +++-------- Parse/Parse/Resources/Parse-iOS.Info.plist | 2 +- .../project.pbxproj | 24 +- .../Resources/Info-iOS.plist | 2 +- .../project.pbxproj | 187 +--------- .../ParseFacebookUtils-UnitTests.xcconfig | 2 +- .../project.pbxproj | 334 ++---------------- .../Resources/Info-iOS.plist | 2 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 8 +- .../project.pbxproj | 4 +- .../project.pbxproj | 8 +- .../ParseTwitterTestApplication.xcconfig | 2 +- .../ParseTwitterUtils-Tests.xcconfig | 2 +- .../ParseTwitterUtils-iOS-Dynamic.xcconfig | 2 +- .../project.pbxproj | 101 ++---- .../Resources/Info-iOS.plist | 2 +- ParseUI/ParseUI.xcodeproj/project.pbxproj | 226 +++++------- ParseUI/ParseUI/Resources/Info-iOS.plist | 2 +- README.md | 6 + 28 files changed, 325 insertions(+), 943 deletions(-) delete mode 160000 Carthage/Checkouts/OCMock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0991a0963..42fbe023b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,13 @@ jobs: runs-on: macos-12 steps: - uses: actions/checkout@v3 + - name: Cache SPM + uses: actions/cache@v3 + with: + path: ~/Library/Developer/Xcode/DerivedData/Parse*/SourcePackages/ + key: ${{ runner.os }}-spm-${{ hashFiles('Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved') }} + restore-keys: | + ${{ runner.os }}-spm- - name: Setup Ruby uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108 - name: Cache Gems diff --git a/.gitmodules b/.gitmodules index 49b3e0705..5117672ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/OCMock"] - path = Carthage/Checkouts/OCMock - url = https://github.com/erikdoe/OCMock.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/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock deleted file mode 160000 index 4a49ebb98..000000000 --- a/Carthage/Checkouts/OCMock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a49ebb985bc16fae9489771aa35482ccbea14a3 diff --git a/Package.resolved b/Package.resolved index c9738b414..37b0ec50a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -28,6 +28,15 @@ "version": "15.1.0" } }, + { + "package": "OCMock", + "repositoryURL": "https://github.com/erikdoe/ocmock.git", + "state": { + "branch": null, + "revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89", + "version": null + } + }, { "package": "Starscream", "repositoryURL": "https://github.com/daltoniam/Starscream.git", diff --git a/Package.swift b/Package.swift index d80817991..113ae6c00 100644 --- a/Package.swift +++ b/Package.swift @@ -5,12 +5,15 @@ import PackageDescription let package = Package( name: "ParseObjC", defaultLocalization: "en", - platforms: [.iOS(.v12), - .macOS(.v10_15), - .tvOS(.v12), - .watchOS(.v2)], + platforms: [ + .iOS(.v12), + .macOS(.v10_15), + .tvOS(.v12), + .watchOS(.v4) + ], products: [ .library(name: "ParseObjC", targets: ["ParseCore"]), + .library(name: "ParseFacebookUtils", targets: ["ParseFacebookUtils"]), .library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]), .library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]), .library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]), @@ -21,7 +24,8 @@ let package = Package( .package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"), .package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"), .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"), - .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0") + .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0"), + .package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89")) ], targets: [ .target( @@ -31,7 +35,8 @@ let package = Package( exclude: ["Resources/Parse-tvOS.Info.plist", "Resources/Parse-iOS.Info.plist", "Resources/Parse-OSX.Info.plist", "Resources/Parse-watchOS.Info.plist"], resources: [.process("Resources")], publicHeadersPath: "Source", - cSettings: [.headerSearchPath("Internal/**")]), + cSettings: [.headerSearchPath("Internal/**")] + ), .target( name: "ParseFacebookUtils", dependencies: [ @@ -42,53 +47,64 @@ let package = Package( path: "ParseFacebookUtils/ParseFacebookUtils", exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"], resources: [.process("Resources")], - publicHeadersPath: "Source"), - .target(name: "ParseFacebookUtilsiOS", - dependencies: [ + publicHeadersPath: "Source" + ), + .target( + name: "ParseFacebookUtilsiOS", + dependencies: [ "ParseFacebookUtils" - ], - path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS", - exclude: ["Resources/Info-iOS.plist"], - resources: [.process("Resources")], - publicHeadersPath: "Source", - cSettings: [.headerSearchPath("Internal/**")]), - .target(name: "ParseFacebookUtilsTvOS", - dependencies: [ + ], + path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS", + exclude: ["Resources/Info-iOS.plist"], + resources: [.process("Resources")], + publicHeadersPath: "Source", + cSettings: [.headerSearchPath("Internal/**")] + ), + .target( + name: "ParseFacebookUtilsTvOS", + dependencies: [ "ParseFacebookUtils", .product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS])) - ], - path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS", - exclude: ["Resources/Info-tvOS.plist"], - resources: [.process("Resources")], - publicHeadersPath: "Source", - cSettings: [.headerSearchPath("Internal/**")]), - .target(name: "ParseTwitterUtils", - dependencies: [ + ], + path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS", + exclude: ["Resources/Info-tvOS.plist"], + resources: [.process("Resources")], + publicHeadersPath: "Source", + cSettings: [.headerSearchPath("Internal/**")] + ), + .target( + name: "ParseTwitterUtils", + dependencies: [ "ParseCore" - ], - path: "ParseTwitterUtils/ParseTwitterUtils", - exclude: ["Resources/Info-iOS.plist"], - resources: [.process("Resources")], - publicHeadersPath: "Source", - cSettings: [.headerSearchPath("Internal/**")]), - .target(name: "ParseUI", - dependencies: [ + ], + path: "ParseTwitterUtils/ParseTwitterUtils", + exclude: ["Resources/Info-iOS.plist"], + resources: [.process("Resources")], + publicHeadersPath: "Source", + cSettings: [.headerSearchPath("Internal/**")] + ), + .target( + name: "ParseUI", + dependencies: [ "ParseFacebookUtilsiOS", "ParseTwitterUtils" - ], - path: "ParseUI/ParseUI", - exclude: ["Resources/Info-iOS.plist"], - resources: [.process("Resources")], - publicHeadersPath: "Source", - cSettings: [.headerSearchPath("Internal/**")]), - .target(name: "ParseLiveQuery", - dependencies: [ + ], + path: "ParseUI/ParseUI", + exclude: ["Resources/Info-iOS.plist"], + resources: [.process("Resources")], + publicHeadersPath: "Source", + cSettings: [.headerSearchPath("Internal/**")] + ), + .target( + name: "ParseLiveQuery", + dependencies: [ .product(name: "BoltsSwift", package: "Bolts-Swift"), "Starscream", "ParseCore" - ], - path: "ParseLiveQuery/ParseLiveQuery", - exclude: ["Resources/Info.plist"], - resources: [.process("Resources")]) + ], + path: "ParseLiveQuery/ParseLiveQuery", + exclude: ["Resources/Info.plist"], + resources: [.process("Resources")] + ) ] ) diff --git a/Parse.xcworkspace/contents.xcworkspacedata b/Parse.xcworkspace/contents.xcworkspacedata index 0344fa5af..d265c108f 100644 --- a/Parse.xcworkspace/contents.xcworkspacedata +++ b/Parse.xcworkspace/contents.xcworkspacedata @@ -22,13 +22,6 @@ - - - - diff --git a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9466f0275..6459dc20f 100644 --- a/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -28,6 +28,15 @@ "version": "15.1.0" } }, + { + "package": "OCMock", + "repositoryURL": "https://github.com/erikdoe/ocmock.git", + "state": { + "branch": null, + "revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89", + "version": null + } + }, { "package": "Starscream", "repositoryURL": "https://github.com/daltoniam/Starscream.git", diff --git a/Parse/Configurations/Parse-iOS-Dynamic.xcconfig b/Parse/Configurations/Parse-iOS-Dynamic.xcconfig index 1414a1262..6dc0a5577 100644 --- a/Parse/Configurations/Parse-iOS-Dynamic.xcconfig +++ b/Parse/Configurations/Parse-iOS-Dynamic.xcconfig @@ -13,7 +13,7 @@ PRODUCT_NAME = Parse PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist diff --git a/Parse/Configurations/ParseUnitTests-iOS.xcconfig b/Parse/Configurations/ParseUnitTests-iOS.xcconfig index d281ee0c5..a87c8e2e6 100644 --- a/Parse/Configurations/ParseUnitTests-iOS.xcconfig +++ b/Parse/Configurations/ParseUnitTests-iOS.xcconfig @@ -16,7 +16,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios SWIFT_VERSION = 5.0 -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 515d0caa8..04bcfee6e 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 39E22AB62AD0655300D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AB52AD0655300D9AE5C /* OCMock */; }; + 39E22ABC2AD0657F00D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22ABB2AD0657F00D9AE5C /* OCMock */; }; 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, ); }; }; @@ -2962,69 +2964,6 @@ remoteGlobalIDString = 81C3821B19CCA89E0066284A; remoteInfo = "Parse-iOS"; }; - BC105FC424C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0A814632FD000B04273; - remoteInfo = OCMock; - }; - BC105FC624C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 03565A3118F0566E003AE91E; - remoteInfo = OCMockTests; - }; - BC105FC824C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0DC14632FF700B04273; - remoteInfo = OCMockLib; - }; - BC105FCA24C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D31108AD1828DB8700737925; - remoteInfo = OCMockLibTests; - }; - BC105FCC24C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F0B950F11B0080BE00942C38; - remoteInfo = "OCMock iOS"; - }; - BC105FCE24C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 817EB1621BD765130047E85A; - remoteInfo = "OCMock tvOS"; - }; - BC105FD024C5D0C900295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DE97CA022B43EE60098C63F; - remoteInfo = "OCMock watchOS"; - }; - BC105FD224C5D0D600295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 030EF0A714632FD000B04273; - remoteInfo = OCMock; - }; - BC105FD424C5D0E100295EF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = F0B950F01B0080BE00942C38; - remoteInfo = "OCMock iOS"; - }; BCAFF88A25A88C4F00B95DFC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; @@ -3581,7 +3520,6 @@ 97E18AE51623835600B17A67 /* PFLocationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFLocationManager.m; sourceTree = ""; }; A6E295801E961727009917BF /* ParseManagerPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseManagerPrivate.h; sourceTree = ""; }; B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = ""; }; - BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = ../Carthage/Checkouts/OCMock/Source/OCMock.xcodeproj; sourceTree = ""; }; F50C66311B33A708001941A6 /* PFPushUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPushUtilities.h; sourceTree = ""; }; F50C66321B33A708001941A6 /* PFPushUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPushUtilities.m; sourceTree = ""; }; F50E486C1B83ED270055094D /* PFFileStagingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileStagingController.h; sourceTree = ""; }; @@ -3658,6 +3596,7 @@ files = ( 7CE6ABE0292074CC0054D9D2 /* SystemConfiguration.framework in Frameworks */, 7CE6ABDE292074C70054D9D2 /* AudioToolbox.framework in Frameworks */, + 39E22AB62AD0655300D9AE5C /* OCMock in Frameworks */, 7CE6ABDC292074C10054D9D2 /* libsqlite3.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3666,6 +3605,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 39E22ABC2AD0657F00D9AE5C /* OCMock in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3871,7 +3811,6 @@ 7CE6ABDF292074CC0054D9D2 /* SystemConfiguration.framework */, 7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */, 7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */, - BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, ); name = Frameworks; @@ -5148,20 +5087,6 @@ path = CurrentUserController; sourceTree = ""; }; - BC105FBB24C5D0C900295EF7 /* Products */ = { - isa = PBXGroup; - children = ( - BC105FC524C5D0C900295EF7 /* OCMock.framework */, - BC105FC724C5D0C900295EF7 /* OCMockTests.xctest */, - BC105FC924C5D0C900295EF7 /* libOCMock.a */, - BC105FCB24C5D0C900295EF7 /* OCMockLibTests.xctest */, - BC105FCD24C5D0C900295EF7 /* OCMock.framework */, - BC105FCF24C5D0C900295EF7 /* OCMock.framework */, - BC105FD124C5D0C900295EF7 /* OCMock.framework */, - ); - name = Products; - sourceTree = ""; - }; F50C66301B33A6CE001941A6 /* Utilites */ = { isa = PBXGroup; children = ( @@ -6901,11 +6826,13 @@ buildRules = ( ); dependencies = ( - BC105FD524C5D0E100295EF7 /* PBXTargetDependency */, 8111674C1B8402DF003CB026 /* PBXTargetDependency */, 4AE33A2D1F5451B20088DCA0 /* PBXTargetDependency */, ); name = "ParseUnitTests-iOS"; + packageProductDependencies = ( + 39E22AB52AD0655300D9AE5C /* OCMock */, + ); productName = ParseTests; productReference = 816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -6922,10 +6849,12 @@ buildRules = ( ); dependencies = ( - BC105FD324C5D0D600295EF7 /* PBXTargetDependency */, 811167471B8402DA003CB026 /* PBXTargetDependency */, ); name = "ParseUnitTests-macOS"; + packageProductDependencies = ( + 39E22ABB2AD0657F00D9AE5C /* OCMock */, + ); productName = ParseTests; productReference = 81C09F861AF97A490043B49C /* ParseUnitTests-macOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -7069,6 +6998,9 @@ Base, ); mainGroup = 09D3363F139C54930098E916; + packageReferences = ( + 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + ); productRefGroup = 09D3364B139C54940098E916 /* Products */; projectDirPath = ""; projectReferences = ( @@ -7076,10 +7008,6 @@ ProductGroup = 4A13517620281768000F5FD5 /* Products */; ProjectRef = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; }, - { - ProductGroup = BC105FBB24C5D0C900295EF7 /* Products */; - ProjectRef = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -7175,55 +7103,6 @@ remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BC105FC524C5D0C900295EF7 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = BC105FC424C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FC724C5D0C900295EF7 /* OCMockTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockTests.xctest; - remoteRef = BC105FC624C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FC924C5D0C900295EF7 /* libOCMock.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libOCMock.a; - remoteRef = BC105FC824C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FCB24C5D0C900295EF7 /* OCMockLibTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockLibTests.xctest; - remoteRef = BC105FCA24C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FCD24C5D0C900295EF7 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = BC105FCC24C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FCF24C5D0C900295EF7 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = BC105FCE24C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BC105FD124C5D0C900295EF7 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = BC105FD024C5D0C900295EF7 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -8825,17 +8704,6 @@ target = 81C3821B19CCA89E0066284A /* Parse-iOS */; targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */; }; - BC105FD324C5D0D600295EF7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = OCMock; - targetProxy = BC105FD224C5D0D600295EF7 /* PBXContainerItemProxy */; - }; - BC105FD524C5D0E100295EF7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "OCMock iOS"; - platformFilter = ios; - targetProxy = BC105FD424C5D0E100295EF7 /* PBXContainerItemProxy */; - }; BCAFF88B25A88C4F00B95DFC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Bolts-iOS"; @@ -8867,7 +8735,7 @@ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; }; name = Debug; @@ -8884,7 +8752,7 @@ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; SWIFT_COMPILATION_MODE = wholemodule; }; @@ -8939,7 +8807,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "ParseUnitTests-iOS-host/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -8996,7 +8864,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "ParseUnitTests-iOS-host/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -9030,7 +8898,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */; buildSettings = { - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -9038,7 +8906,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */; buildSettings = { - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -9090,7 +8958,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -9109,7 +8977,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -9127,7 +8995,7 @@ buildSettings = { CLANG_MODULES_AUTOLINK = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -9139,7 +9007,7 @@ buildSettings = { CLANG_MODULES_AUTOLINK = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -9151,7 +9019,7 @@ buildSettings = { CLANG_MODULES_AUTOLINK = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -9161,7 +9029,7 @@ buildSettings = { CLANG_MODULES_AUTOLINK = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -9304,6 +9172,30 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E22AB52AD0655300D9AE5C /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; + 39E22ABB2AD0657F00D9AE5C /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 39E22AB42AD0655300D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 09D33641139C54930098E916 /* Project object */; } diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist index 0420d38b0..524bb0d30 100644 --- a/Parse/Parse/Resources/Parse-iOS.Info.plist +++ b/Parse/Parse/Resources/Parse-iOS.Info.plist @@ -23,6 +23,6 @@ CFBundleVersion 2.7.3 MinimumOSVersion - 9.0 + 12.0 diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj index 32a89a12c..5ef8d28eb 100644 --- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj +++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj @@ -338,13 +338,6 @@ path = Resources; sourceTree = ""; }; - 7C5F7D25292101370035B219 /* exclude */ = { - isa = PBXGroup; - children = ( - ); - path = exclude; - sourceTree = ""; - }; 7C77CFA629290F4000C4D90E /* Products */ = { isa = PBXGroup; children = ( @@ -408,7 +401,6 @@ 813DFC7E1AB2510300F25A08 /* ParseFacebookUtils */ = { isa = PBXGroup; children = ( - 7C5F7D25292101370035B219 /* exclude */, 7C5F7D21292101370035B219 /* Resources */, 7C5F7D19292101370035B219 /* Source */, ); @@ -875,7 +867,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -889,7 +881,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -938,7 +930,7 @@ CLANG_MODULES_AUTOLINK = YES; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -955,7 +947,7 @@ CLANG_MODULES_AUTOLINK = YES; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -974,7 +966,7 @@ EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -990,7 +982,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = YES; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -1003,7 +995,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1017,7 +1009,7 @@ EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = YES; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist b/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist index 7cadde13e..a189aea67 100644 --- a/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist +++ b/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist @@ -23,6 +23,6 @@ CFBundleVersion 2.7.3 MinimumOSVersion - 9.0 + 12.0 diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj index 40ab4e115..eadf5d058 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 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 */; }; - 7C77D067292916A000C4D90E /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C77D066292916A000C4D90E /* File.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,76 +70,6 @@ remoteGlobalIDString = 4AAEAA77200C022300AA7479; remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic"; }; - 84199A032947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 84199A052947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 84199A072947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 84199A092947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 84199A0B2947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 84199A0D2947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 84199A0F2947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 84199A112947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 84199A132947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 84199A152947592D000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -171,7 +100,6 @@ 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 = ""; }; - 7C77D066292916A000C4D90E /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; 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 = ""; }; @@ -186,9 +114,6 @@ 8121EAAD1D39862400AC0B02 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ParseFacebookUtilsTvOS.xcconfig; sourceTree = ""; }; 81FE7F8B1C17790400E6BD34 /* ParseFacebookUtilsTvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsTvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 841999B829475714000D241B /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 841999F42947592D000D241B /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; - 84B4D990294756A500A065D4 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -233,7 +158,6 @@ 7C5F7FA529212A9F0035B219 /* ParseFacebookUtilsTvOS */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - 841999F42947592D000D241B /* Parse.xcodeproj */, ); indentWidth = 4; name = Breakpad; @@ -242,8 +166,6 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 841999B829475714000D241B /* Parse.framework */, - 84B4D990294756A500A065D4 /* Parse.framework */, 7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */, 7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */, 7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */, @@ -256,7 +178,6 @@ 7C5F7FA529212A9F0035B219 /* ParseFacebookUtilsTvOS */ = { isa = PBXGroup; children = ( - 7C77D068292916A500C4D90E /* exclude */, 7C5F7FA629212A9F0035B219 /* Resources */, 7C5F7FA929212A9F0035B219 /* Source */, 7C5F7FAD29212A9F0035B219 /* Internal */, @@ -311,14 +232,6 @@ name = Products; sourceTree = ""; }; - 7C77D068292916A500C4D90E /* exclude */ = { - isa = PBXGroup; - children = ( - 7C77D066292916A000C4D90E /* File.swift */, - ); - path = exclude; - sourceTree = ""; - }; 8121EA9E1D39862400AC0B02 /* Shared */ = { isa = PBXGroup; children = ( @@ -362,23 +275,6 @@ path = Project; sourceTree = ""; }; - 841999F52947592D000D241B /* Products */ = { - isa = PBXGroup; - children = ( - 84199A042947592D000D241B /* Parse.framework */, - 84199A062947592D000D241B /* Parse.framework */, - 84199A082947592D000D241B /* ParseUnitTests-iOS.xctest */, - 84199A0A2947592D000D241B /* Parse.framework */, - 84199A0C2947592D000D241B /* ParseUnitTests-macOS.xctest */, - 84199A0E2947592D000D241B /* Parse.framework */, - 84199A102947592D000D241B /* Parse.framework */, - 84199A122947592D000D241B /* Parse.framework */, - 84199A142947592D000D241B /* Parse.framework */, - 84199A162947592D000D241B /* ParseUnitTests-iOS-host.app */, - ); - name = Products; - sourceTree = ""; - }; F52CD63A1B58383C0051AB86 /* Configurations */ = { isa = PBXGroup; children = ( @@ -496,10 +392,6 @@ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 841999F52947592D000D241B /* Products */; - ProjectRef = 841999F42947592D000D241B /* Parse.xcodeproj */; - }, { ProductGroup = 7C5F7FBC29212AF10035B219 /* Products */; ProjectRef = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */; @@ -542,76 +434,6 @@ remoteRef = 7C5F7FDA29212AF20035B219 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 84199A042947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A032947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A062947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A052947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A082947592D000D241B /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 84199A072947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A0A2947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A092947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A0C2947592D000D241B /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 84199A0B2947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A0E2947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A0D2947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A102947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A0F2947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A122947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A112947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A142947592D000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 84199A132947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84199A162947592D000D241B /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 84199A152947592D000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -637,7 +459,6 @@ buildActionMask = 2147483647; files = ( 7C5F7FB729212AAE0035B219 /* PFFacebookDeviceAuthenticationProvider.m in Sources */, - 7C77D067292916A000C4D90E /* File.swift in Sources */, 7C5F7FB929212AAE0035B219 /* PFFacebookUtilsDevice.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -716,7 +537,7 @@ SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -737,7 +558,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = appletvos; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -748,7 +569,7 @@ ARCHS = "$(ARCHS_STANDARD)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -759,7 +580,7 @@ ARCHS = "$(ARCHS_STANDARD)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/ParseFacebookUtilsiOS/Configurations/ParseFacebookUtils-UnitTests.xcconfig b/ParseFacebookUtilsiOS/Configurations/ParseFacebookUtils-UnitTests.xcconfig index bb7da544c..eb99bc9d3 100644 --- a/ParseFacebookUtilsiOS/Configurations/ParseFacebookUtils-UnitTests.xcconfig +++ b/ParseFacebookUtilsiOS/Configurations/ParseFacebookUtils-UnitTests.xcconfig @@ -13,7 +13,7 @@ PRODUCT_NAME = ParseFacebookUtilsiOS-UnitTests PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutilsios.unit -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/Info.plist TEST_HOST = $(BUILT_PRODUCTS_DIR)/ParseFacebookTestApplication.app/ParseFacebookTestApplication diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj index 35f7e5e68..7555acc0f 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ + 39E22AC52AD065BA00D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AC42AD065BA00D9AE5C /* OCMock */; }; 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 */; }; @@ -25,7 +26,6 @@ 7C5F7E93292114350035B219 /* PFFacebookMobileAuthenticationProvider_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CACE629291EA75A003359B5 /* PFFacebookMobileAuthenticationProvider_Private.h */; }; 7C5F7E94292114410035B219 /* PFFacebookUtilsDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CACE623291EA75A003359B5 /* PFFacebookUtilsDevice.m */; }; 7C5F7E95292114410035B219 /* PFFacebookMobileAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CACE627291EA75A003359B5 /* PFFacebookMobileAuthenticationProvider.m */; }; - 7C5F7ED729211E120035B219 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EAC292119EA0035B219 /* OCMock.framework */; }; 7C5F7EDA29211E5E0035B219 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7ED929211E5E0035B219 /* libsqlite3.tbd */; }; 7C5F7EDC29211E640035B219 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EDB29211E640035B219 /* libc++.tbd */; }; 7C5F7EDE29211E6A0035B219 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C5F7EDD29211E6A0035B219 /* SystemConfiguration.framework */; }; @@ -87,125 +87,6 @@ remoteGlobalIDString = 4AAEAA5B200C020E00AA7479; remoteInfo = "ParseFacebookUtilsV4-iOS-Dynamic"; }; - 7C5F7EA3292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0A814632FD000B04273; - remoteInfo = OCMock; - }; - 7C5F7EA5292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 03565A3118F0566E003AE91E; - remoteInfo = OCMockTests; - }; - 7C5F7EA7292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0DC14632FF700B04273; - remoteInfo = OCMockLib; - }; - 7C5F7EA9292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D31108AD1828DB8700737925; - remoteInfo = OCMockLibTests; - }; - 7C5F7EAB292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F0B950F11B0080BE00942C38; - remoteInfo = "OCMock iOS"; - }; - 7C5F7EAD292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 817EB1621BD765130047E85A; - remoteInfo = "OCMock tvOS"; - }; - 7C5F7EAF292119EA0035B219 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DE97CA022B43EE60098C63F; - remoteInfo = "OCMock watchOS"; - }; - 841999DE29475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C3821C19CCA89E0066284A; - remoteInfo = "Parse-iOS"; - }; - 841999E029475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5845D1C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 841999E229475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 816F449B1A8E8933009CDB32; - remoteInfo = "ParseUnitTests-iOS"; - }; - 841999E429475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 97010FAC1630B18F00AB761E; - remoteInfo = "Parse-macOS"; - }; - 841999E629475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C09F861AF97A490043B49C; - remoteInfo = "ParseUnitTests-macOS"; - }; - 841999E829475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 815F24151BD04D150054659F; - remoteInfo = "Parse-tvOS"; - }; - 841999EA29475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; - remoteInfo = "Parse-tvOS-Dynamic"; - }; - 841999EC29475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 810156691BB3832700D7C7BD; - remoteInfo = "Parse-watchOS"; - }; - 841999EE29475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; - remoteInfo = "Parse-watchOS-Dynamic"; - }; - 841999F029475911000D241B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 841999CF29475911000D241B /* Parse.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; - remoteInfo = "ParseUnitTests-iOS-host"; - }; B9A7EE7323C49272003E606E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -247,7 +128,6 @@ 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 = ""; }; - 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = ../Carthage/Checkouts/OCMock/Source/OCMock.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; }; @@ -283,9 +163,6 @@ 8121EAAC1D39862400AC0B02 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 8121EAAD1D39862400AC0B02 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 81CB98C61AB7905D00136FA5 /* ParseFacebookUtilsiOS-UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ParseFacebookUtilsiOS-UnitTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 841999BC29475725000D241B /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 841999C729475730000D241B /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 841999CF29475911000D241B /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; D2AAC07E0554694100DB518D /* ParseFacebookUtilsiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F535C73B1B54B4A800A7D81E /* ParseFacebookTestApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseFacebookTestApplication.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -310,11 +187,11 @@ files = ( 7CD81D17292D16DC0074F64D /* ParseFacebookUtilsV4.framework in Frameworks */, 7C5F7EE229211E870035B219 /* Accelerate.framework in Frameworks */, + 39E22AC52AD065BA00D9AE5C /* OCMock in Frameworks */, 7C5F7EE029211E6E0035B219 /* AudioToolbox.framework in Frameworks */, 7C5F7EDE29211E6A0035B219 /* SystemConfiguration.framework in Frameworks */, 7C5F7EDC29211E640035B219 /* libc++.tbd in Frameworks */, 7C5F7EDA29211E5E0035B219 /* libsqlite3.tbd in Frameworks */, - 7C5F7ED729211E120035B219 /* OCMock.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -358,7 +235,6 @@ 7C5F7E1929210C970035B219 /* Tests */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - 841999CF29475911000D241B /* Parse.xcodeproj */, ); indentWidth = 4; name = Breakpad; @@ -367,8 +243,6 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 841999C729475730000D241B /* Parse.framework */, - 841999BC29475725000D241B /* Parse.framework */, 7C77D0522929157600C4D90E /* Accelerate.framework */, 7C77D0502929156900C4D90E /* libc++.tbd */, 7C5F7EE129211E870035B219 /* Accelerate.framework */, @@ -380,7 +254,6 @@ 7C77D03C292913CF00C4D90E /* FBSDKCoreKit_Basics.xcframework */, 7C77D044292913CF00C4D90E /* FBSDKCoreKit.xcframework */, 7C77D046292913CF00C4D90E /* FBSDKLoginKit.xcframework */, - 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */, 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */, ); name = Frameworks; @@ -467,31 +340,9 @@ name = Products; sourceTree = ""; }; - 7C5F7E96292116960035B219 /* exclude */ = { - isa = PBXGroup; - children = ( - ); - path = exclude; - sourceTree = ""; - }; - 7C5F7E9A292119EA0035B219 /* Products */ = { - isa = PBXGroup; - children = ( - 7C5F7EA4292119EA0035B219 /* OCMock.framework */, - 7C5F7EA6292119EA0035B219 /* OCMockTests.xctest */, - 7C5F7EA8292119EA0035B219 /* libOCMock.a */, - 7C5F7EAA292119EA0035B219 /* OCMockLibTests.xctest */, - 7C5F7EAC292119EA0035B219 /* OCMock.framework */, - 7C5F7EAE292119EA0035B219 /* OCMock.framework */, - 7C5F7EB0292119EA0035B219 /* OCMock.framework */, - ); - name = Products; - sourceTree = ""; - }; 7CACE61C291EA75A003359B5 /* ParseFacebookUtilsiOS */ = { isa = PBXGroup; children = ( - 7C5F7E96292116960035B219 /* exclude */, 7CACE61D291EA75A003359B5 /* Resources */, 7CACE620291EA75A003359B5 /* Source */, 7CACE624291EA75A003359B5 /* Internal */, @@ -580,23 +431,6 @@ path = Project; sourceTree = ""; }; - 841999D029475911000D241B /* Products */ = { - isa = PBXGroup; - children = ( - 841999DF29475911000D241B /* Parse.framework */, - 841999E129475911000D241B /* Parse.framework */, - 841999E329475911000D241B /* ParseUnitTests-iOS.xctest */, - 841999E529475911000D241B /* Parse.framework */, - 841999E729475911000D241B /* ParseUnitTests-macOS.xctest */, - 841999E929475911000D241B /* Parse.framework */, - 841999EB29475911000D241B /* Parse.framework */, - 841999ED29475911000D241B /* Parse.framework */, - 841999EF29475911000D241B /* Parse.framework */, - 841999F129475911000D241B /* ParseUnitTests-iOS-host.app */, - ); - name = Products; - sourceTree = ""; - }; F52CD63A1B58383C0051AB86 /* Configurations */ = { isa = PBXGroup; children = ( @@ -676,6 +510,9 @@ B9A7EE7423C49272003E606E /* PBXTargetDependency */, ); name = "ParseFacebookUtils-UnitTests"; + packageProductDependencies = ( + 39E22AC42AD065BA00D9AE5C /* OCMock */, + ); productName = "ParseFacebookUtilsV4-Tests"; productReference = 81CB98C61AB7905D00136FA5 /* ParseFacebookUtilsiOS-UnitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -767,18 +604,11 @@ ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; packageReferences = ( + 39E22AC32AD065BA00D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 7C5F7E9A292119EA0035B219 /* Products */; - ProjectRef = 7C5F7E99292119EA0035B219 /* OCMock.xcodeproj */; - }, - { - ProductGroup = 841999D029475911000D241B /* Products */; - ProjectRef = 841999CF29475911000D241B /* Parse.xcodeproj */; - }, { ProductGroup = 7C5F7E3A29210E580035B219 /* Products */; ProjectRef = 7C5F7E3929210E580035B219 /* ParseFacebookUtils.xcodeproj */; @@ -823,125 +653,6 @@ remoteRef = 7C5F7E6229210E590035B219 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 7C5F7EA4292119EA0035B219 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C5F7EA3292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EA6292119EA0035B219 /* OCMockTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockTests.xctest; - remoteRef = 7C5F7EA5292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EA8292119EA0035B219 /* libOCMock.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libOCMock.a; - remoteRef = 7C5F7EA7292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EAA292119EA0035B219 /* OCMockLibTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockLibTests.xctest; - remoteRef = 7C5F7EA9292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EAC292119EA0035B219 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C5F7EAB292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EAE292119EA0035B219 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C5F7EAD292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C5F7EB0292119EA0035B219 /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C5F7EAF292119EA0035B219 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999DF29475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999DE29475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999E129475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999E029475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999E329475911000D241B /* ParseUnitTests-iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 841999E229475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999E529475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999E429475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999E729475911000D241B /* ParseUnitTests-macOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 841999E629475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999E929475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999E829475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999EB29475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999EA29475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999ED29475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999EC29475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999EF29475911000D241B /* Parse.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 841999EE29475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 841999F129475911000D241B /* ParseUnitTests-iOS-host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "ParseUnitTests-iOS-host.app"; - remoteRef = 841999F029475911000D241B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1046,7 +757,7 @@ DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/ParseFacebookUtilsiOS/Resources/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutilsios; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; @@ -1063,7 +774,7 @@ DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/ParseFacebookUtilsiOS/Resources/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutilsios; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1116,7 +827,7 @@ DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/ParseFacebookUtilsiOS/Resources/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1143,7 +854,7 @@ DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/ParseFacebookUtilsiOS/Resources/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1198,7 +909,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/Tests/TestApplication/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1216,7 +927,7 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/Tests/TestApplication/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1276,6 +987,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 39E22AC32AD065BA00D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E22AC42AD065BA00D9AE5C /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 39E22AC32AD065BA00D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; } diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Resources/Info-iOS.plist b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Resources/Info-iOS.plist index 999351ffc..139ee825b 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Resources/Info-iOS.plist +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS/Resources/Info-iOS.plist @@ -23,6 +23,6 @@ CFBundleVersion 1.19.4 MinimumOSVersion - 9.0 + 12.0 diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index c4d956711..5dd474439 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -654,7 +654,7 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -705,7 +705,7 @@ VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -845,7 +845,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -882,7 +882,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = ""; diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj index 552283547..deba0e919 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj +++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj @@ -290,7 +290,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -325,7 +325,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj index 74fbbe1db..82c56a1a7 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj @@ -533,7 +533,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -581,7 +581,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -598,7 +598,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -616,7 +616,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Resources/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/ParseTwitterUtils/Configurations/ParseTwitterTestApplication.xcconfig b/ParseTwitterUtils/Configurations/ParseTwitterTestApplication.xcconfig index 81ec6d3b5..7d288ec81 100644 --- a/ParseTwitterUtils/Configurations/ParseTwitterTestApplication.xcconfig +++ b/ParseTwitterUtils/Configurations/ParseTwitterTestApplication.xcconfig @@ -13,6 +13,6 @@ PRODUCT_NAME = ParseTwitterTestApplication PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.testapplication -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(SRCROOT)/Tests/TestApplication/Resources/Info.plist diff --git a/ParseTwitterUtils/Configurations/ParseTwitterUtils-Tests.xcconfig b/ParseTwitterUtils/Configurations/ParseTwitterUtils-Tests.xcconfig index 42bf4515d..b32ed55c1 100644 --- a/ParseTwitterUtils/Configurations/ParseTwitterUtils-Tests.xcconfig +++ b/ParseTwitterUtils/Configurations/ParseTwitterUtils-Tests.xcconfig @@ -11,7 +11,7 @@ #include "Shared/Product/LogicTests.xcconfig" PRODUCT_NAME = ParseTwitterUtils-Tests -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(PROJECT_DIR)/Tests/Resources/Info.plist diff --git a/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig b/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig index d436dc8d4..9930dd79e 100644 --- a/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig +++ b/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig @@ -13,7 +13,7 @@ PRODUCT_NAME = ParseTwitterUtils PRODUCT_BUNDLE_IDENTIFIER = com.parse.twitterutils.ios -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 INFOPLIST_FILE = $(SRCROOT)/ParseTwitterUtils/Resources/Info-iOS.plist diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj index 162266eeb..b73e6cf47 100644 --- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj +++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; }; + 39E22AD22AD0661200D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AD12AD0661200D9AE5C /* OCMock */; }; 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 */; }; @@ -35,10 +36,6 @@ 81665C771BBDE27D00AE923F /* TwitterUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C721BBDE27D00AE923F /* TwitterUtilsTests.m */; }; 81665C7C1BBDE2EE00AE923F /* PFTwitterTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C7B1BBDE2EE00AE923F /* PFTwitterTestCase.m */; }; 8166FB921B4F1DC5003841A2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FB8F1B4F1DC5003841A2 /* main.m */; }; - 816832521D1E1A7900315E21 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311C1D1E16DC00315E21 /* Security.framework */; platformFilter = ios; }; - 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */; platformFilter = ios; }; - 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831231D1E16E700315E21 /* libsqlite3.tbd */; platformFilter = ios; }; - 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312E1D1E16F700315E21 /* AudioToolbox.framework */; platformFilter = ios; }; 817A37CB1B4B741A00129AFA /* PF_OAuthCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */; }; 817A37CC1B4B741A00129AFA /* PF_OAuthCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */; }; 819DAAD61BB5EC79002BDE2B /* PFTwitterAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 819DAAD41BB5EC79002BDE2B /* PFTwitterAlertView.h */; }; @@ -56,7 +53,6 @@ 81ECACCB1D1E14E000FA7673 /* PFTwitterPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 813E54A61BB5E52000C727E8 /* PFTwitterPrivateUtilities.m */; }; 81ECACCC1D1E14E000FA7673 /* PF_OAuthCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */; }; 81ECACCD1D1E14E000FA7673 /* PFTwitterAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 819DAAD51BB5EC79002BDE2B /* PFTwitterAlertView.m */; }; - B9783173240D14A50049C02B /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9783172240D14A50049C02B /* OCMock.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -162,8 +158,6 @@ /* Begin PBXFileReference section */ 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTwitterLocalization.h; sourceTree = ""; }; - 4A0ECBDD200D41B600BA84A3 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A13522820282037000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; 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 = ""; }; @@ -203,16 +197,6 @@ 8166FB671B4F1D77003841A2 /* ParseTwitterTestApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseTwitterTestApplication.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8166FB8F1B4F1DC5003841A2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8166FB911B4F1DC5003841A2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 816831121D1E16CC00315E21 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 816831151D1E16D000315E21 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Accounts.framework; sourceTree = DEVELOPER_DIR; }; - 816831181D1E16D500315E21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; - 8168311C1D1E16DC00315E21 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 8168311F1D1E16E200315E21 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 816831231D1E16E700315E21 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 816831261D1E16EB00315E21 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; - 8168312E1D1E16F700315E21 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 816831321D1E16FE00315E21 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Social.framework; sourceTree = DEVELOPER_DIR; }; 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PF_OAuthCore.h; sourceTree = ""; }; 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PF_OAuthCore.m; sourceTree = ""; }; 81930A391BBDE76E00A5E4BB /* PFTwitterTestMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFTwitterTestMacros.h; sourceTree = ""; }; @@ -222,13 +206,7 @@ 81CB98D31AB7906D00136FA5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Resources/Info.plist; sourceTree = ""; }; 81ECACD71D1E14E000FA7673 /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS-Dynamic.xcconfig"; sourceTree = ""; }; - 848E11B22959EF2100BA2457 /* FBAEMKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBAEMKit.xcframework; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/ParseFacebookUtils/../Carthage/Build/FBAEMKit.xcframework"; sourceTree = ""; }; - 848E11B42959EF2100BA2457 /* FBSDKCoreKit_Basics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit_Basics.xcframework; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/ParseFacebookUtils/../Carthage/Build/FBSDKCoreKit_Basics.xcframework"; sourceTree = ""; }; - 848E11B62959EF2100BA2457 /* FBSDKCoreKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKCoreKit.xcframework; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/ParseFacebookUtils/../Carthage/Build/FBSDKCoreKit.xcframework"; sourceTree = ""; }; - 848E11B82959EF2100BA2457 /* FBSDKLoginKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSDKLoginKit.xcframework; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/ParseFacebookUtils/../Carthage/Build/FBSDKLoginKit.xcframework"; sourceTree = ""; }; - B9783172240D14A50049C02B /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B99F4FFE2444B5B00061A6F5 /* ParseTwitterTestApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ParseTwitterTestApplication.entitlements; sourceTree = ""; }; - B9A7EEC123C49D94003E606E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = ""; }; F51535541B57454500C49F56 /* ParseTwitterUtils-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-Tests.xcconfig"; sourceTree = ""; }; @@ -247,11 +225,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B9783173240D14A50049C02B /* OCMock.framework in Frameworks */, - 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */, - 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */, - 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */, - 816832521D1E1A7900315E21 /* Security.framework in Frameworks */, + 39E22AD22AD0661200D9AE5C /* OCMock in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -292,7 +266,6 @@ 81CB98D21AB7906D00136FA5 /* Tests */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - 8EF82AB7049F0059A572B973 /* Pods */, ); indentWidth = 4; name = Breakpad; @@ -301,16 +274,7 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 848E11B22959EF2100BA2457 /* FBAEMKit.xcframework */, - 848E11B42959EF2100BA2457 /* FBSDKCoreKit_Basics.xcframework */, - 848E11B62959EF2100BA2457 /* FBSDKCoreKit.xcframework */, - 848E11B82959EF2100BA2457 /* FBSDKLoginKit.xcframework */, - B9783172240D14A50049C02B /* OCMock.framework */, - B9A7EEC123C49D94003E606E /* CoreGraphics.framework */, - 4A13522820282037000F5FD5 /* Bolts.framework */, 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */, - 4A0ECBDD200D41B600BA84A3 /* Parse.framework */, - 813DFC8E1AB2513300F25A08 /* System Frameworks */, ); name = Frameworks; sourceTree = ""; @@ -382,23 +346,6 @@ path = Internal; sourceTree = ""; }; - 813DFC8E1AB2513300F25A08 /* System Frameworks */ = { - isa = PBXGroup; - children = ( - 816831321D1E16FE00315E21 /* Social.framework */, - 8168312E1D1E16F700315E21 /* AudioToolbox.framework */, - 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */, - 816831261D1E16EB00315E21 /* CoreLocation.framework */, - 816831231D1E16E700315E21 /* libsqlite3.tbd */, - 8168311F1D1E16E200315E21 /* StoreKit.framework */, - 8168311C1D1E16DC00315E21 /* Security.framework */, - 816831181D1E16D500315E21 /* CoreGraphics.framework */, - 816831151D1E16D000315E21 /* Accounts.framework */, - 816831121D1E16CC00315E21 /* UIKit.framework */, - ); - name = "System Frameworks"; - sourceTree = ""; - }; 815462221D37FE6E0069489A /* Shared */ = { isa = PBXGroup; children = ( @@ -534,13 +481,6 @@ name = Resources; sourceTree = ""; }; - 8EF82AB7049F0059A572B973 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - name = Pods; - sourceTree = ""; - }; F51535381B57451200C49F56 /* Configurations */ = { isa = PBXGroup; children = ( @@ -627,6 +567,9 @@ 8166FB951B4F1E9A003841A2 /* PBXTargetDependency */, ); name = "ParseTwitterUtils-Tests"; + packageProductDependencies = ( + 39E22AD12AD0661200D9AE5C /* OCMock */, + ); productName = "ParseFacebookUtilsV4-Tests"; productReference = 81CB98C61AB7905D00136FA5 /* ParseTwitterUtils-Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -699,6 +642,9 @@ Base, ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; + packageReferences = ( + 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; projectReferences = ( @@ -949,7 +895,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"; }; @@ -959,7 +905,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"; @@ -1005,7 +951,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"; }; @@ -1016,7 +962,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"; }; @@ -1043,7 +989,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"; }; @@ -1054,7 +1000,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"; @@ -1110,6 +1056,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E22AD12AD0661200D9AE5C /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; } diff --git a/ParseTwitterUtils/ParseTwitterUtils/Resources/Info-iOS.plist b/ParseTwitterUtils/ParseTwitterUtils/Resources/Info-iOS.plist index 35e0dbe08..47eccb773 100644 --- a/ParseTwitterUtils/ParseTwitterUtils/Resources/Info-iOS.plist +++ b/ParseTwitterUtils/ParseTwitterUtils/Resources/Info-iOS.plist @@ -23,6 +23,6 @@ CFBundleVersion 2.7.3 MinimumOSVersion - 9.0 + 12.0 diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj index ac69130a1..0957101bb 100644 --- a/ParseUI/ParseUI.xcodeproj/project.pbxproj +++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ + 39E22AD72AD0676700D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AD62AD0676700D9AE5C /* OCMock */; }; 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,7 +127,6 @@ 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 */; }; - 7C77D208292A537E00C4D90E /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C77D202292A534D00C4D90E /* OCMock.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 */; }; @@ -331,55 +331,6 @@ remoteGlobalIDString = F535C73B1B54B4A800A7D81E; remoteInfo = ParseFacebookTestApplication; }; - 7C77D1F9292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0A814632FD000B04273; - remoteInfo = OCMock; - }; - 7C77D1FB292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 03565A3118F0566E003AE91E; - remoteInfo = OCMockTests; - }; - 7C77D1FD292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 030EF0DC14632FF700B04273; - remoteInfo = OCMockLib; - }; - 7C77D1FF292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D31108AD1828DB8700737925; - remoteInfo = OCMockLibTests; - }; - 7C77D201292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F0B950F11B0080BE00942C38; - remoteInfo = "OCMock iOS"; - }; - 7C77D203292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 817EB1621BD765130047E85A; - remoteInfo = "OCMock tvOS"; - }; - 7C77D205292A534D00C4D90E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DE97CA022B43EE60098C63F; - remoteInfo = "OCMock watchOS"; - }; 84745C482939EE77002D00B2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */; @@ -550,7 +501,6 @@ 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 = ""; }; - 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OCMock.xcodeproj; path = ../Carthage/Checkouts/OCMock/Source/OCMock.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; }; @@ -660,7 +610,7 @@ buildActionMask = 2147483647; files = ( 7C77D22E292A604700C4D90E /* ParseUI.framework in Frameworks */, - 7C77D208292A537E00C4D90E /* OCMock.framework in Frameworks */, + 39E22AD72AD0676700D9AE5C /* OCMock in Frameworks */, 7C77D207292A537400C4D90E /* ParseUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -689,7 +639,6 @@ isa = PBXGroup; children = ( 7C77D220292A575B00C4D90E /* Social.framework */, - 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */, 7C77D1D5292A522800C4D90E /* ParseFacebookUtilsiOS.xcodeproj */, 7C77D1A8292A51AA00C4D90E /* ParseTwitterUtils.xcodeproj */, 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */, @@ -956,20 +905,6 @@ name = Products; sourceTree = ""; }; - 7C77D1F0292A534D00C4D90E /* Products */ = { - isa = PBXGroup; - children = ( - 7C77D1FA292A534D00C4D90E /* OCMock.framework */, - 7C77D1FC292A534D00C4D90E /* OCMockTests.xctest */, - 7C77D1FE292A534D00C4D90E /* libOCMock.a */, - 7C77D200292A534D00C4D90E /* OCMockLibTests.xctest */, - 7C77D202292A534D00C4D90E /* OCMock.framework */, - 7C77D204292A534D00C4D90E /* OCMock.framework */, - 7C77D206292A534D00C4D90E /* OCMock.framework */, - ); - name = Products; - sourceTree = ""; - }; 7C77D246292A606800C4D90E /* Sign In With Apple */ = { isa = PBXGroup; children = ( @@ -1377,6 +1312,9 @@ BCCBE8D823BFB9EB0044A79C /* PBXTargetDependency */, ); name = SignInWithAppleTests; + packageProductDependencies = ( + 39E22AD62AD0676700D9AE5C /* OCMock */, + ); productName = SignInWithAppleTests; productReference = 7C77D230292A604700C4D90E /* SignInWithAppleTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -1432,13 +1370,12 @@ "pt-BR", ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; + packageReferences = ( + 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + ); productRefGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = 7C77D1F0292A534D00C4D90E /* Products */; - ProjectRef = 7C77D1EF292A534D00C4D90E /* OCMock.xcodeproj */; - }, { ProductGroup = 7C77D12A292A50BF00C4D90E /* Products */; ProjectRef = 7C77D129292A50BF00C4D90E /* Parse.xcodeproj */; @@ -1594,55 +1531,6 @@ remoteRef = 7C77D1E5292A522800C4D90E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 7C77D1FA292A534D00C4D90E /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C77D1F9292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1FC292A534D00C4D90E /* OCMockTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockTests.xctest; - remoteRef = 7C77D1FB292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D1FE292A534D00C4D90E /* libOCMock.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libOCMock.a; - remoteRef = 7C77D1FD292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D200292A534D00C4D90E /* OCMockLibTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = OCMockLibTests.xctest; - remoteRef = 7C77D1FF292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D202292A534D00C4D90E /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C77D201292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D204292A534D00C4D90E /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C77D203292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 7C77D206292A534D00C4D90E /* OCMock.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = OCMock.framework; - remoteRef = 7C77D205292A534D00C4D90E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 84745C492939EE77002D00B2 /* ParseFacebookUtilsV4.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -1997,7 +1885,8 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; }; name = Release; }; @@ -2055,8 +1944,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = YES; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; @@ -2115,8 +2008,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SKIP_INSTALL = YES; @@ -2182,8 +2079,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = YES; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; @@ -2242,8 +2143,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SKIP_INSTALL = YES; @@ -2287,8 +2192,11 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = ParseUIDemo/Other/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ParseUIDemo; SWIFT_INSTALL_OBJC_HEADER = NO; @@ -2324,8 +2232,11 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = ParseUIDemo/Other/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ParseUIDemo; SWIFT_INSTALL_OBJC_HEADER = NO; @@ -2369,8 +2280,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = ParseUIDemo/Other/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) /usr/lib/swift @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + /usr/lib/swift, + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.ParseUIDemo; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2404,8 +2319,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = ParseUIDemo/Other/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) /usr/lib/swift @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + /usr/lib/swift, + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.parse.ParseUIDemo; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2445,7 +2364,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SignInWithAppleTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.parseplatform.SignInWithAppleTests; @@ -2482,7 +2405,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SignInWithAppleTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.parseplatform.SignInWithAppleTests; @@ -2551,6 +2478,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = 67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 39E22AD62AD0676700D9AE5C /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 39E22AD52AD0676700D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; } diff --git a/ParseUI/ParseUI/Resources/Info-iOS.plist b/ParseUI/ParseUI/Resources/Info-iOS.plist index 01e4c5519..d0c7d47fd 100644 --- a/ParseUI/ParseUI/Resources/Info-iOS.plist +++ b/ParseUI/ParseUI/Resources/Info-iOS.plist @@ -23,6 +23,6 @@ CFBundleVersion 2.7.3 MinimumOSVersion - 9.0 + 12.0 diff --git a/README.md b/README.md index 0daa2e82c..9b121f370 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ [![Coverage](https://img.shields.io/codecov/c/github/parse-community/Parse-SDK-iOS-OSX/master.svg)](https://codecov.io/github/parse-community/Parse-SDK-iOS-OSX?branch=master) [![auto-release](https://img.shields.io/badge/%F0%9F%9A%80-auto--release-9e34eb.svg)](https://github.com/parse-community/Parse-SDK-iOS-OSX/releases) +![iOS](https://img.shields.io/badge/iOS-12.0-green?style=flat) +![iPad](https://img.shields.io/badge/ipadOS-12.0-green?style=flat) +![macOS](https://img.shields.io/badge/macOS-10.15-green?style=flat) +![watchOS](https://img.shields.io/badge/watchOS-4.0-green?style=flat) +![tvOS](https://img.shields.io/badge/tvOS-12.0-green?style=flat) + ![SPM](https://img.shields.io/badge/Swift_Package_Manager-compatible-green?style=flat) [![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link] From 0ace39ac9bcbcd905e25701873d319eeba2019f0 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 11:46:21 -0500 Subject: [PATCH 2/6] fix twitter tests --- .github/workflows/ci.yml | 2 +- ParseFacebookUtils/.gitignore | 1 + ParseFacebookUtilsTvOs/.gitignore | 1 + ParseFacebookUtilsiOS/.gitignore | 1 + ParseTwitterUtils/.gitignore | 1 + .../project.pbxproj | 72 +++++++++++++++---- .../contents.xcworkspacedata | 2 +- ParseUI/.gitignore | 1 + 8 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 ParseFacebookUtils/.gitignore create mode 100644 ParseFacebookUtilsTvOs/.gitignore create mode 100644 ParseFacebookUtilsiOS/.gitignore create mode 100644 ParseTwitterUtils/.gitignore create mode 100644 ParseUI/.gitignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42fbe023b..e3ec4c234 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - test:parseui:all - test:parse_live_query:all - build:starters - fail-fast: true + fail-fast: false runs-on: macos-12 steps: - uses: actions/checkout@v3 diff --git a/ParseFacebookUtils/.gitignore b/ParseFacebookUtils/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseFacebookUtils/.gitignore @@ -0,0 +1 @@ +Package.resolved diff --git a/ParseFacebookUtilsTvOs/.gitignore b/ParseFacebookUtilsTvOs/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseFacebookUtilsTvOs/.gitignore @@ -0,0 +1 @@ +Package.resolved diff --git a/ParseFacebookUtilsiOS/.gitignore b/ParseFacebookUtilsiOS/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseFacebookUtilsiOS/.gitignore @@ -0,0 +1 @@ +Package.resolved diff --git a/ParseTwitterUtils/.gitignore b/ParseTwitterUtils/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseTwitterUtils/.gitignore @@ -0,0 +1 @@ +Package.resolved diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj index b73e6cf47..e63f5f608 100644 --- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj +++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; }; - 39E22AD22AD0661200D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AD12AD0661200D9AE5C /* OCMock */; }; + 39E22B102AD070A500D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22B0F2AD070A500D9AE5C /* OCMock */; }; 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 */; }; @@ -36,6 +36,10 @@ 81665C771BBDE27D00AE923F /* TwitterUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C721BBDE27D00AE923F /* TwitterUtilsTests.m */; }; 81665C7C1BBDE2EE00AE923F /* PFTwitterTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C7B1BBDE2EE00AE923F /* PFTwitterTestCase.m */; }; 8166FB921B4F1DC5003841A2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FB8F1B4F1DC5003841A2 /* main.m */; }; + 816832521D1E1A7900315E21 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311C1D1E16DC00315E21 /* Security.framework */; platformFilter = ios; }; + 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */; platformFilter = ios; }; + 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831231D1E16E700315E21 /* libsqlite3.tbd */; platformFilter = ios; }; + 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312E1D1E16F700315E21 /* AudioToolbox.framework */; platformFilter = ios; }; 817A37CB1B4B741A00129AFA /* PF_OAuthCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */; }; 817A37CC1B4B741A00129AFA /* PF_OAuthCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */; }; 819DAAD61BB5EC79002BDE2B /* PFTwitterAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 819DAAD41BB5EC79002BDE2B /* PFTwitterAlertView.h */; }; @@ -197,6 +201,16 @@ 8166FB671B4F1D77003841A2 /* ParseTwitterTestApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseTwitterTestApplication.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8166FB8F1B4F1DC5003841A2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8166FB911B4F1DC5003841A2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 816831121D1E16CC00315E21 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 816831151D1E16D000315E21 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Accounts.framework; sourceTree = DEVELOPER_DIR; }; + 816831181D1E16D500315E21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; + 8168311C1D1E16DC00315E21 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; + 8168311F1D1E16E200315E21 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; + 816831231D1E16E700315E21 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; + 816831261D1E16EB00315E21 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; + 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; + 8168312E1D1E16F700315E21 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; + 816831321D1E16FE00315E21 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Social.framework; sourceTree = DEVELOPER_DIR; }; 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PF_OAuthCore.h; sourceTree = ""; }; 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PF_OAuthCore.m; sourceTree = ""; }; 81930A391BBDE76E00A5E4BB /* PFTwitterTestMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFTwitterTestMacros.h; sourceTree = ""; }; @@ -207,6 +221,7 @@ 81ECACD71D1E14E000FA7673 /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS-Dynamic.xcconfig"; sourceTree = ""; }; B99F4FFE2444B5B00061A6F5 /* ParseTwitterTestApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ParseTwitterTestApplication.entitlements; sourceTree = ""; }; + B9A7EEC123C49D94003E606E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = ""; }; F51535541B57454500C49F56 /* ParseTwitterUtils-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-Tests.xcconfig"; sourceTree = ""; }; @@ -225,7 +240,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 39E22AD22AD0661200D9AE5C /* OCMock in Frameworks */, + 39E22B102AD070A500D9AE5C /* OCMock in Frameworks */, + 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */, + 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */, + 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */, + 816832521D1E1A7900315E21 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -266,6 +285,7 @@ 81CB98D21AB7906D00136FA5 /* Tests */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, + 8EF82AB7049F0059A572B973 /* Pods */, ); indentWidth = 4; name = Breakpad; @@ -274,7 +294,9 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( + B9A7EEC123C49D94003E606E /* CoreGraphics.framework */, 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */, + 813DFC8E1AB2513300F25A08 /* System Frameworks */, ); name = Frameworks; sourceTree = ""; @@ -346,6 +368,23 @@ path = Internal; sourceTree = ""; }; + 813DFC8E1AB2513300F25A08 /* System Frameworks */ = { + isa = PBXGroup; + children = ( + 816831321D1E16FE00315E21 /* Social.framework */, + 8168312E1D1E16F700315E21 /* AudioToolbox.framework */, + 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */, + 816831261D1E16EB00315E21 /* CoreLocation.framework */, + 816831231D1E16E700315E21 /* libsqlite3.tbd */, + 8168311F1D1E16E200315E21 /* StoreKit.framework */, + 8168311C1D1E16DC00315E21 /* Security.framework */, + 816831181D1E16D500315E21 /* CoreGraphics.framework */, + 816831151D1E16D000315E21 /* Accounts.framework */, + 816831121D1E16CC00315E21 /* UIKit.framework */, + ); + name = "System Frameworks"; + sourceTree = ""; + }; 815462221D37FE6E0069489A /* Shared */ = { isa = PBXGroup; children = ( @@ -481,6 +520,13 @@ name = Resources; sourceTree = ""; }; + 8EF82AB7049F0059A572B973 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + name = Pods; + sourceTree = ""; + }; F51535381B57451200C49F56 /* Configurations */ = { isa = PBXGroup; children = ( @@ -568,7 +614,7 @@ ); name = "ParseTwitterUtils-Tests"; packageProductDependencies = ( - 39E22AD12AD0661200D9AE5C /* OCMock */, + 39E22B0F2AD070A500D9AE5C /* OCMock */, ); productName = "ParseFacebookUtilsV4-Tests"; productReference = 81CB98C61AB7905D00136FA5 /* ParseTwitterUtils-Tests.xctest */; @@ -643,7 +689,7 @@ ); mainGroup = 0867D691FE84028FC02AAC07 /* Breakpad */; packageReferences = ( - 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, + 39E22B0E2AD070A500D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */, ); productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; @@ -895,7 +941,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -905,7 +951,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -951,7 +997,7 @@ baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -962,7 +1008,7 @@ baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -989,7 +1035,7 @@ baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1000,7 +1046,7 @@ baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ONLY_ACTIVE_ARCH = YES; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1058,7 +1104,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { + 39E22B0E2AD070A500D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/erikdoe/ocmock"; requirement = { @@ -1069,9 +1115,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 39E22AD12AD0661200D9AE5C /* OCMock */ = { + 39E22B0F2AD070A500D9AE5C /* OCMock */ = { isa = XCSwiftPackageProductDependency; - package = 39E22AD02AD0661200D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; + package = 39E22B0E2AD070A500D9AE5C /* XCRemoteSwiftPackageReference "ocmock" */; productName = OCMock; }; /* End XCSwiftPackageProductDependency section */ diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata index f1755b4ab..919434a62 100644 --- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ParseUI/.gitignore b/ParseUI/.gitignore new file mode 100644 index 000000000..f4096fee4 --- /dev/null +++ b/ParseUI/.gitignore @@ -0,0 +1 @@ +Package.resolved From 72686913415f8b048430cc643eb80f7feb7ff37f Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 13:20:23 -0500 Subject: [PATCH 3/6] test spm cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3ec4c234..42fbe023b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - test:parseui:all - test:parse_live_query:all - build:starters - fail-fast: false + fail-fast: true runs-on: macos-12 steps: - uses: actions/checkout@v3 From 8f65305a083e07f580a12f1896d00bae4c973be2 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 13:46:43 -0500 Subject: [PATCH 4/6] fix parse ui duplicate files on two apps with same name --- ParseUI/ParseUI.xcodeproj/project.pbxproj | 10 +++++----- .../project.xcworkspace/contents.xcworkspacedata | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj index 0957101bb..6e29be35a 100644 --- a/ParseUI/ParseUI.xcodeproj/project.pbxproj +++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj @@ -504,7 +504,7 @@ 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; }; - 7C77D22F292A604700C4D90E /* ParseUIDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ParseUIDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 7C77D22F292A604700C4D90E /* ParseUIDemo-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUIDemo-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 7C77D230292A604700C4D90E /* SignInWithAppleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignInWithAppleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8129E6081A9CB1BE006752BC /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 8129E6391A9CB320006752BC /* UIDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIDemoViewController.swift; sourceTree = ""; }; @@ -628,7 +628,7 @@ 7C77D162292A510400C4D90E /* ParseUI.framework */, 7C77D21F292A56F600C4D90E /* ParseUIDemo.app */, 7C77D22D292A604700C4D90E /* ParseUI.framework */, - 7C77D22F292A604700C4D90E /* ParseUIDemo.app */, + 7C77D22F292A604700C4D90E /* ParseUIDemo-Swift.app */, 7C77D230292A604700C4D90E /* SignInWithAppleTests.xctest */, 84745C3F2939EE77002D00B2 /* ParseFacebookUtils.xcodeproj */, ); @@ -1276,7 +1276,7 @@ ); name = "ParseUIDemo-Swift"; productName = ParseUIDemo; - productReference = 7C77D22F292A604700C4D90E /* ParseUIDemo.app */; + productReference = 7C77D22F292A604700C4D90E /* ParseUIDemo-Swift.app */; productType = "com.apple.product-type.application"; }; 81472F661A1AB33800FD6EED /* ParseUIDemo */ = { @@ -2198,7 +2198,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = ParseUIDemo; + PRODUCT_NAME = "ParseUIDemo-Swift"; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -2238,7 +2238,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = ParseUIDemo; + PRODUCT_NAME = "ParseUIDemo-Swift"; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/ParseUI/ParseUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseUI/ParseUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1b8e778f1..919434a62 100644 --- a/ParseUI/ParseUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseUI/ParseUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> From c1f4587def5172931d8fd87fb7a603acf24953f7 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 20:55:11 -0500 Subject: [PATCH 5/6] WatchOS v4 to v2 --- Package.swift | 2 +- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 113ae6c00..46b62226e 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( .iOS(.v12), .macOS(.v10_15), .tvOS(.v12), - .watchOS(.v4) + .watchOS(.v2) ], products: [ .library(name: "ParseObjC", targets: ["ParseCore"]), diff --git a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 04cd5dae9..919434a62 100644 --- a/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 04cd5dae9..919434a62 100644 --- a/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme b/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme index 94434d58f..0daea4b72 100644 --- a/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme +++ b/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo-Swift.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -54,7 +54,7 @@ @@ -71,7 +71,7 @@ From 137e9a58f6ccdac458d7f6de12119db536445de4 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 21:38:16 -0500 Subject: [PATCH 6/6] Update ReadME --- ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj index 5dd474439..4c96b67e2 100644 --- a/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/ParseLiveQuery/ParseLiveQuery.xcodeproj/project.pbxproj @@ -654,7 +654,7 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; }; @@ -705,7 +705,7 @@ VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; }; diff --git a/README.md b/README.md index 9b121f370..0dde4fa7e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ![iOS](https://img.shields.io/badge/iOS-12.0-green?style=flat) ![iPad](https://img.shields.io/badge/ipadOS-12.0-green?style=flat) ![macOS](https://img.shields.io/badge/macOS-10.15-green?style=flat) -![watchOS](https://img.shields.io/badge/watchOS-4.0-green?style=flat) +![watchOS](https://img.shields.io/badge/watchOS-2.0-green?style=flat) ![tvOS](https://img.shields.io/badge/tvOS-12.0-green?style=flat) ![SPM](https://img.shields.io/badge/Swift_Package_Manager-compatible-green?style=flat)