diff --git a/.circleci/config.yml b/.circleci/config.yml index a8b7f4a7c..dc91bb2be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "11.0.0" + xcode: "11.2.1" shell: /bin/bash --login -eo pipefail aliases: - &prepare @@ -19,6 +19,7 @@ jobs: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:ios - run: bash <(curl -s https://codecov.io/bash) @@ -28,6 +29,7 @@ jobs: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: name: "Create and set the default keychain" @@ -47,6 +49,7 @@ jobs: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:facebook_utils:ios - run: bash <(curl -s https://codecov.io/bash) @@ -56,6 +59,7 @@ jobs: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:twitter_utils:ios - run: bash <(curl -s https://codecov.io/bash) @@ -65,6 +69,7 @@ jobs: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:parseui:all - run: bash <(curl -s https://codecov.io/bash) @@ -76,24 +81,27 @@ jobs: - checkout - run: *prepare - run: | - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2 + xcrun simctl create "Apple TV 4K" com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-4K com.apple.CoreSimulator.SimRuntime.tvOS-13-2 bundle exec rake package:release jazzy: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: ./Scripts/jazzy.sh carthage: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:carthage cocoapods: <<: *defaults steps: - checkout + - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:cocoapods diff --git a/.gitignore b/.gitignore index dda96baf7..329eeaaf3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ docs/ ## AppCode .idea/ ParseFacebookUtils/Vendor +ParseUI/Vendor diff --git a/.gitmodules b/.gitmodules index f3e97b157..7d774d0ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ -[submodule "Carthage/Checkouts/OCMock"] - path = Carthage/Checkouts/OCMock - url = https://github.com/erikdoe/OCMock.git +[submodule "Vendor/xctoolchain"] + path = Vendor/xctoolchain + url = https://github.com/parse-community/xctoolchain.git [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git + url = https://github.com/parse-community/Bolts-ObjC.git [submodule "Carthage/Checkouts/facebook-objc-sdk"] path = Carthage/Checkouts/facebook-objc-sdk url = https://github.com/facebook/facebook-objc-sdk.git -[submodule "Vendor/xctoolchain"] - path = Vendor/xctoolchain - url = https://github.com/parse-community/xctoolchain.git diff --git a/.ruby-version b/.ruby-version index 4560fb912..7872401a4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +ruby-2.6 diff --git a/.travis.yml b/.travis.yml index 676a96d97..035a40bdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode11 +osx_image: xcode11.2 branches: only: - master @@ -18,7 +18,6 @@ jobs: install: bundle install script: - ./Scripts/jazzy.sh - - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2 - bundle exec rake package:release deploy: - provider: releases diff --git a/Cartfile b/Cartfile index ba9df5460..765c8cc85 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "BoltsFramework/Bolts-ObjC" ~> 1.9 -github "facebook/facebook-objc-sdk" ~> 5.2 +github "parse-community/Bolts-ObjC" ~> 1.9.1 +github "facebook/facebook-objc-sdk" ~> 5.12.0 diff --git a/Cartfile.private b/Cartfile.private deleted file mode 100644 index f29344205..000000000 --- a/Cartfile.private +++ /dev/null @@ -1 +0,0 @@ -github "erikdoe/OCMock" ~> 3.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index f6a7b385a..33cc42956 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,2 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "erikdoe/OCMock" "v3.4.3" -github "facebook/facebook-objc-sdk" "v5.6.0" +github "facebook/facebook-objc-sdk" "v5.13.1" +github "parse-community/Bolts-ObjC" "1.9.1" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC index 4dc65427d..50c09111f 160000 --- a/Carthage/Checkouts/Bolts-ObjC +++ b/Carthage/Checkouts/Bolts-ObjC @@ -1 +1 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 +Subproject commit 50c09111f72662b586f74ca66d4ad2d2541721ea diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock deleted file mode 160000 index 62fd0b23c..000000000 --- a/Carthage/Checkouts/OCMock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk index cf9e0d837..54219ba9f 160000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -1 +1 @@ -Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 +Subproject commit 54219ba9f5c7bdaabdd92aeac10023731e09efc8 diff --git a/Parse.podspec b/Parse.podspec index c3c9e1e2c..df79f546e 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -153,7 +153,7 @@ Pod::Spec.new do |s| s.subspec 'UI' do |s| s.platform = :ios s.requires_arc = true - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '8.0' s.source_files = 'ParseUI/**/*.{h,m}' s.exclude_files = 'ParseUI/ParseUIDemo/**/*', 'ParseUI/Other/ParseUI.h' s.public_header_files = 'ParseUI/Classes/LogInViewController/*.h', diff --git a/Parse.xcworkspace/contents.xcworkspacedata b/Parse.xcworkspace/contents.xcworkspacedata index d415578f5..51ef284ea 100644 --- a/Parse.xcworkspace/contents.xcworkspacedata +++ b/Parse.xcworkspace/contents.xcworkspacedata @@ -4,6 +4,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index a3f43a8b3..dc8d12300 100644 --- a/Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/Parse.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -3,7 +3,7 @@ BuildSystemType - Original + Latest IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index c0db61fb6..aeb81cb15 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -22,11 +22,9 @@ 403093771C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; }; 403093781C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; }; 4A0ECC9A200DA25700BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */; }; - 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */; }; - 4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; }; + 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */; platformFilter = ios; }; 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; }; 4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; - 4A2C10B32152FEF200FA7D0E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; 4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; }; 4ABF398C1F54592100BBA75A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4ABF398B1F54592100BBA75A /* Main.storyboard */; }; 4AE33A0F1F5451AD0088DCA0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AE33A0E1F5451AD0088DCA0 /* AppDelegate.m */; }; @@ -1155,11 +1153,11 @@ 816A648B1C29E5A00029B197 /* PFUser+Synchronous.h in Headers */ = {isa = PBXBuildFile; fileRef = 816A64871C29E5A00029B197 /* PFUser+Synchronous.h */; settings = {ATTRIBUTES = (Public, ); }; }; 816AC9BA1A3F48250031D94C /* PFApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 816AC9B81A3F48250031D94C /* PFApplication.h */; settings = {ATTRIBUTES = (Private, ); }; }; 816AC9BB1A3F48250031D94C /* PFApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 816AC9B91A3F48250031D94C /* PFApplication.m */; }; - 816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C3821C19CCA89E0066284A /* Parse.framework */; }; - 816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 498C29FE1551DC450034BB80 /* StoreKit.framework */; }; - 816F44771A8E8933009CDB32 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6393F38B15D3018400C4F78D /* libsqlite3.dylib */; }; - 816F44781A8E8933009CDB32 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CA84EA1612660F002E09F8 /* Accounts.framework */; }; - 816F44791A8E8933009CDB32 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CBA36B1612829C0062C84A /* Social.framework */; }; + 816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C3821C19CCA89E0066284A /* Parse.framework */; platformFilter = ios; }; + 816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 498C29FE1551DC450034BB80 /* StoreKit.framework */; platformFilter = ios; }; + 816F44771A8E8933009CDB32 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6393F38B15D3018400C4F78D /* libsqlite3.dylib */; platformFilter = ios; }; + 816F44781A8E8933009CDB32 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CA84EA1612660F002E09F8 /* Accounts.framework */; platformFilter = ios; }; + 816F44791A8E8933009CDB32 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CBA36B1612829C0062C84A /* Social.framework */; platformFilter = ios; }; 8171E99F19AE091000EAE6C1 /* PFFileObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DEF07E199C42A300D86A21 /* PFFileObject.m */; }; 8171E9BA19AE37F000EAE6C1 /* PFThreadsafety.h in Headers */ = {isa = PBXBuildFile; fileRef = 818D049919A3B84500BEE20F /* PFThreadsafety.h */; settings = {ATTRIBUTES = (Private, ); }; }; 8171E9BB19AE37F500EAE6C1 /* PFThreadsafety.m in Sources */ = {isa = PBXBuildFile; fileRef = 818D049A19A3B84500BEE20F /* PFThreadsafety.m */; }; @@ -2730,7 +2728,7 @@ F5B0B30C1B449F1D00F3EBC4 /* PFLocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E18AE41623835600B17A67 /* PFLocationManager.h */; settings = {ATTRIBUTES = (Private, ); }; }; F5B0B30D1B449F1D00F3EBC4 /* PFAsyncTaskQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C8F2BE1B1F7E6B00CD98E7 /* PFAsyncTaskQueue.h */; settings = {ATTRIBUTES = (Private, ); }; }; F5B0B30E1B449F1D00F3EBC4 /* PFBaseState.h in Headers */ = {isa = PBXBuildFile; fileRef = F586B34E1B1E3BD70082E3BD /* PFBaseState.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F5B0B3151B44A21100F3EBC4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B0B3141B44A21100F3EBC4 /* SystemConfiguration.framework */; }; + F5B0B3151B44A21100F3EBC4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B0B3141B44A21100F3EBC4 /* SystemConfiguration.framework */; platformFilter = ios; }; F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0942999C139C613700DFA018 /* SystemConfiguration.framework */; }; F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 498C29FE1551DC450034BB80 /* StoreKit.framework */; }; F5B0B3191B44A33100F3EBC4 /* PFCommandCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FDDCA14E1B1BD00A77007 /* PFCommandCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2772,7 +2770,7 @@ F5B64D901BFA646C0038F3CB /* ParseClientConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B64D8A1BFA646C0038F3CB /* ParseClientConfiguration.m */; }; F5B64D911BFA646C0038F3CB /* ParseClientConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B64D8A1BFA646C0038F3CB /* ParseClientConfiguration.m */; }; F5B64D921BFA646C0038F3CB /* ParseClientConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B64D8A1BFA646C0038F3CB /* ParseClientConfiguration.m */; }; - F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 095ACE9913C69BF700566243 /* AudioToolbox.framework */; }; + F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 095ACE9913C69BF700566243 /* AudioToolbox.framework */; platformFilter = ios; }; F5C42CD41B34F68C00C720D8 /* PFObjectSubclassingController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C42CD21B34F68C00C720D8 /* PFObjectSubclassingController.h */; settings = {ATTRIBUTES = (Private, ); }; }; F5C42CD51B34F68C00C720D8 /* PFObjectSubclassingController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C42CD21B34F68C00C720D8 /* PFObjectSubclassingController.h */; settings = {ATTRIBUTES = (Private, ); }; }; F5C42CD61B34F68C00C720D8 /* PFObjectSubclassingController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C42CD31B34F68C00C720D8 /* PFObjectSubclassingController.m */; }; @@ -3605,15 +3603,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */, - 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */, - 816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */, F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */, 816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */, 816F44771A8E8933009CDB32 /* libsqlite3.dylib in Frameworks */, 816F44781A8E8933009CDB32 /* Accounts.framework in Frameworks */, 816F44791A8E8933009CDB32 /* Social.framework in Frameworks */, F5B0B3151B44A21100F3EBC4 /* SystemConfiguration.framework in Frameworks */, + 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */, + 816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3621,7 +3618,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A2C10B32152FEF200FA7D0E /* Bolts.framework in Frameworks */, 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */, 4A0ECC9A200DA25700BA84A3 /* OCMock.framework in Frameworks */, F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */, @@ -8725,6 +8721,7 @@ }; 8111674C1B8402DF003CB026 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = 81C3821B19CCA89E0066284A /* Parse-iOS */; targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */; }; @@ -8754,6 +8751,8 @@ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.9; }; name = Debug; }; @@ -8769,6 +8768,8 @@ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.9; SWIFT_COMPILATION_MODE = wholemodule; }; name = Release; @@ -8823,7 +8824,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "ParseUnitTests-iOS-host/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.ParseUnitTests-iOS-host"; @@ -8877,7 +8881,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "ParseUnitTests-iOS-host/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.ParseUnitTests-iOS-host"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -8930,6 +8937,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = F55ABB591B4F39DA00A0ECD5 /* ParseUnitTests-iOS.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ParseUnitTests-iOS-host.app/ParseUnitTests-iOS-host"; }; @@ -8960,7 +8973,11 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; }; @@ -8973,7 +8990,11 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); SWIFT_VERSION = 3.0; }; name = Release; diff --git a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme index f5dcb9d88..135368792 100644 --- a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme +++ b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme @@ -1,6 +1,6 @@ - - - - + codeCoverageEnabled = "YES"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + codeCoverageEnabled = "YES"> + + + + @@ -69,17 +78,6 @@ - - - - - - - - - - - - - - - - - - - - + + - - + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -68,17 +77,6 @@ - - - - - - - - - - - - - - - - - - - - + + - - - \ No newline at end of file + diff --git a/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo.xcscheme b/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo.xcscheme index 81d9c1374..cd1d1fd31 100644 --- a/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo.xcscheme +++ b/ParseUI/ParseUI.xcodeproj/xcshareddata/xcschemes/ParseUIDemo.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - \ No newline at end of file + diff --git a/Rakefile b/Rakefile index 7bf9f3c82..dbd0a3ab1 100644 --- a/Rakefile +++ b/Rakefile @@ -13,8 +13,10 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_framework_task' script_folder = File.expand_path(File.dirname(__FILE__)) build_folder = File.join(script_folder, 'build') release_folder = File.join(build_folder, 'release') +bolts_build_folder = File.join(script_folder, 'Carthage', 'Build') bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC') -bolts_build_folder = File.join(bolts_folder, 'build') +ios_simulator = "\"platform=iOS Simulator,name=iPhone 11,OS=13.2.2\"" +tvos_simulator = "\"platform=tvOS Simulator,name=Apple TV 4K,OS=13.2.2\"" module Constants require 'plist' @@ -239,7 +241,7 @@ namespace :build do t.scheme = 'ParseUIDemo' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -262,7 +264,7 @@ namespace :build do t.scheme = 'ParseUIDemo-Swift' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -467,7 +469,7 @@ namespace :test do t.scheme = 'Parse-iOS' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -489,7 +491,6 @@ namespace :test do t.scheme = 'Parse-macOS' t.sdk = 'macosx' - t.destinations = ['arch=x86_64'] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -512,7 +513,7 @@ namespace :test do t.scheme = 'ParseFacebookUtilsV4-iOS' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -538,7 +539,7 @@ namespace :test do t.scheme = 'ParseTwitterUtils-iOS' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -568,7 +569,7 @@ namespace :test do t.scheme = 'ParseUI' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] @@ -589,7 +590,7 @@ namespace :test do t.scheme = 'ParseUIDemo' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -612,7 +613,7 @@ namespace :test do t.scheme = 'ParseUIDemo-Swift' t.sdk = 'iphonesimulator' - t.destinations = ["\"platform=iOS Simulator,OS=12.2,name=iPhone X\"",] + t.destinations = [ios_simulator] t.configuration = 'Debug' t.additional_options = { "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS" => "YES", "GCC_GENERATE_TEST_COVERAGE_FILES" => "YES" } @@ -647,7 +648,7 @@ namespace :test do t.scheme = scheme t.configuration = 'Debug' t.sdk = 'iphonesimulator' - t.destinations = ['"platform=iOS Simulator,name=iPhone X"'] + t.destinations = [ios_simulator] t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] t.formatter = XCTask::BuildFormatter::XCPRETTY @@ -675,7 +676,7 @@ namespace :test do t.scheme = scheme t.configuration = 'Debug' - t.destinations = ["\"platform=iOS Simulator,name=iPhone X\"",] + t.destinations = [ios_simulator] t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] t.formatter = XCTask::BuildFormatter::XCPRETTY @@ -689,7 +690,7 @@ namespace :test do t.scheme = scheme t.configuration = 'Debug' - t.destinations = ["\"platform=tvOS Simulator,OS=12.0,name=Apple TV 1080p\"",] + t.destinations = [tvos_simulator] t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD] t.formatter = XCTask::BuildFormatter::XCPRETTY diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index a278a5c05..62845c35f 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit a278a5c0523f116d86afa02fcd6ec989662977d5 +Subproject commit 62845c35f5a65f341fffbbdbcec79cf0c00b7f3b