From 0453b6fceea481edf01d6f7a5388e1b725c1d689 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 11:08:58 -0500 Subject: [PATCH 1/8] :zap: Release 2.2.4 - Bumps Parse and Bolts to latest version --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- ParseLiveQuery.podspec | 6 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 280 +++++++++--------- 5 files changed, 147 insertions(+), 145 deletions(-) diff --git a/Cartfile b/Cartfile index b93142b9..23440953 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.15.4 +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0 github "daltoniam/Starscream" == 2.1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1a289a9f..23b62d30 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.3.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.15.4" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0" github "daltoniam/Starscream" "2.1.1" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 2032defa..854dd759 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 2032defa956121c20828b46a4d99a2712474a00a +Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index cd822c52..dd16994b 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.2.3' + s.version = '2.2.4' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.15.0' - s.dependency 'Bolts-Swift', '~> 1.3' + s.dependency 'Parse', '~> 1.16.0' + s.dependency 'Bolts-Swift', '~> 1.9' s.dependency 'Starscream', '2.1.1' end diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 50e93582..5ab38086 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -50,137 +50,137 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 090FFBB31E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B3E79E619D48B7F006071F7; + remoteInfo = "Starscream iOS"; + }; + 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B3E79F119D48B7F006071F7; + remoteInfo = "Starscream iOSTests"; + }; + 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D9C3E35F19E48FF1009FC285; + remoteInfo = "Starscream OSX"; + }; + 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D9C3E36919E48FF1009FC285; + remoteInfo = "Starscream OSXTests"; + }; + 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 091277971BD673A70003036D; + remoteInfo = "Starscream tvOS"; + }; + 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 091277A01BD673A70003036D; + remoteInfo = "Starscream tvOSTests"; + }; + 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6B3E79E519D48B7F006071F7; + remoteInfo = "Starscream iOS"; + }; + 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D9C3E35E19E48FF1009FC285; + remoteInfo = "Starscream OSX"; + }; + 4A6AE2D5200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C3821C19CCA89E0066284A; remoteInfo = "Parse-iOS"; }; - 090FFBB51E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2D7200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C5845D1C3B0A98000063C6; remoteInfo = "Parse-iOS-Dynamic"; }; - 090FFBB71E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2D9200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 816F449B1A8E8933009CDB32; remoteInfo = "ParseUnitTests-iOS"; }; - 090FFBB91E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2DB200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 97010FAC1630B18F00AB761E; remoteInfo = "Parse-macOS"; }; - 090FFBBB1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2DD200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C09F861AF97A490043B49C; remoteInfo = "ParseUnitTests-macOS"; }; - 090FFBBD1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2DF200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 815F24151BD04D150054659F; remoteInfo = "Parse-tvOS"; }; - 090FFBBF1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2E1200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; remoteInfo = "Parse-tvOS-Dynamic"; }; - 090FFBC11E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2E3200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 810156691BB3832700D7C7BD; remoteInfo = "Parse-watchOS"; }; - 090FFBC31E26F14F0010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2E5200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; remoteInfo = "Parse-watchOS-Dynamic"; }; - 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */ = { + 4A6AE2E7200FABEB007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; - 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B3E79E619D48B7F006071F7; - remoteInfo = "Starscream iOS"; - }; - 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B3E79F119D48B7F006071F7; - remoteInfo = "Starscream iOSTests"; - }; - 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D9C3E35F19E48FF1009FC285; - remoteInfo = "Starscream OSX"; - }; - 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D9C3E36919E48FF1009FC285; - remoteInfo = "Starscream OSXTests"; - }; - 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 091277971BD673A70003036D; - remoteInfo = "Starscream tvOS"; - }; - 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 091277A01BD673A70003036D; - remoteInfo = "Starscream tvOSTests"; - }; - 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 6B3E79E519D48B7F006071F7; - remoteInfo = "Starscream iOS"; - }; - 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D9C3E35E19E48FF1009FC285; - remoteInfo = "Starscream OSX"; + remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; + remoteInfo = "ParseUnitTests-iOS-host"; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; - 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse.xcodeproj"; sourceTree = ""; }; + 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; 094AE8EF1E25ADF300F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libicucore.tbd; sourceTree = DEVELOPER_DIR; }; 094AE8F11E25AE0500F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; 094AE8F31E25AE1100F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; @@ -254,22 +254,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 090FFBA81E26F14F0010EC2E /* Products */ = { - isa = PBXGroup; - children = ( - 090FFBB41E26F14F0010EC2E /* Parse.framework */, - 090FFBB61E26F14F0010EC2E /* Parse.framework */, - 090FFBB81E26F14F0010EC2E /* ParseUnitTests-iOS.xctest */, - 090FFBBA1E26F14F0010EC2E /* Parse.framework */, - 090FFBBC1E26F14F0010EC2E /* ParseUnitTests-macOS.xctest */, - 090FFBBE1E26F14F0010EC2E /* Parse.framework */, - 090FFBC01E26F14F0010EC2E /* Parse.framework */, - 090FFBC21E26F14F0010EC2E /* Parse.framework */, - 090FFBC41E26F14F0010EC2E /* Parse.framework */, - ); - name = Products; - sourceTree = ""; - }; 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -310,6 +294,23 @@ name = Products; sourceTree = ""; }; + 4A6AE2C9200FABEB007CA404 /* Products */ = { + isa = PBXGroup; + children = ( + 4A6AE2D6200FABEB007CA404 /* Parse.framework */, + 4A6AE2D8200FABEB007CA404 /* Parse.framework */, + 4A6AE2DA200FABEB007CA404 /* ParseUnitTests-iOS.xctest */, + 4A6AE2DC200FABEB007CA404 /* Parse.framework */, + 4A6AE2DE200FABEB007CA404 /* ParseUnitTests-macOS.xctest */, + 4A6AE2E0200FABEB007CA404 /* Parse.framework */, + 4A6AE2E2200FABEB007CA404 /* Parse.framework */, + 4A6AE2E4200FABEB007CA404 /* Parse.framework */, + 4A6AE2E6200FABEB007CA404 /* Parse.framework */, + 4A6AE2E8200FABEB007CA404 /* ParseUnitTests-iOS-host.app */, + ); + name = Products; + sourceTree = ""; + }; 81464FC51CA31DA0000235E7 /* Resources */ = { isa = PBXGroup; children = ( @@ -418,7 +419,6 @@ ); dependencies = ( 4A1A99771E5E8E040047B84B /* PBXTargetDependency */, - 090FFBC61E26F1730010EC2E /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; productName = ParseLiveQuery; @@ -456,7 +456,7 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 090FFBA81E26F14F0010EC2E /* Products */; + ProductGroup = 4A6AE2C9200FABEB007CA404 /* Products */; ProjectRef = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; }, { @@ -473,109 +473,116 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 090FFBB41E26F14F0010EC2E /* Parse.framework */ = { + 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 090FFBB31E26F14F0010EC2E /* PBXContainerItemProxy */; + path = Starscream.framework; + remoteRef = 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBB61E26F14F0010EC2E /* Parse.framework */ = { + 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Starscream iOSTests.xctest"; + remoteRef = 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 090FFBB51E26F14F0010EC2E /* PBXContainerItemProxy */; + path = Starscream.framework; + remoteRef = 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBB81E26F14F0010EC2E /* ParseUnitTests-iOS.xctest */ = { + 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "ParseUnitTests-iOS.xctest"; - remoteRef = 090FFBB71E26F14F0010EC2E /* PBXContainerItemProxy */; + path = "Starscream OSXTests.xctest"; + remoteRef = 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBBA1E26F14F0010EC2E /* Parse.framework */ = { + 4A1A99731E5E8DBB0047B84B /* Starscream.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 090FFBB91E26F14F0010EC2E /* PBXContainerItemProxy */; + path = Starscream.framework; + remoteRef = 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBBC1E26F14F0010EC2E /* ParseUnitTests-macOS.xctest */ = { + 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "ParseUnitTests-macOS.xctest"; - remoteRef = 090FFBBB1E26F14F0010EC2E /* PBXContainerItemProxy */; + path = "Starscream tvOSTests.xctest"; + remoteRef = 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBBE1E26F14F0010EC2E /* Parse.framework */ = { + 4A6AE2D6200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 090FFBBD1E26F14F0010EC2E /* PBXContainerItemProxy */; + remoteRef = 4A6AE2D5200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBC01E26F14F0010EC2E /* Parse.framework */ = { + 4A6AE2D8200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 090FFBBF1E26F14F0010EC2E /* PBXContainerItemProxy */; + remoteRef = 4A6AE2D7200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBC21E26F14F0010EC2E /* Parse.framework */ = { + 4A6AE2DA200FABEB007CA404 /* ParseUnitTests-iOS.xctest */ = { isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Parse.framework; - remoteRef = 090FFBC11E26F14F0010EC2E /* PBXContainerItemProxy */; + fileType = wrapper.cfbundle; + path = "ParseUnitTests-iOS.xctest"; + remoteRef = 4A6AE2D9200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 090FFBC41E26F14F0010EC2E /* Parse.framework */ = { + 4A6AE2DC200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 090FFBC31E26F14F0010EC2E /* PBXContainerItemProxy */; + remoteRef = 4A6AE2DB200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */ = { + 4A6AE2DE200FABEB007CA404 /* ParseUnitTests-macOS.xctest */ = { isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */; + fileType = wrapper.cfbundle; + path = "ParseUnitTests-macOS.xctest"; + remoteRef = 4A6AE2DD200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */ = { + 4A6AE2E0200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream iOSTests.xctest"; - remoteRef = 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 4A6AE2DF200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */ = { + 4A6AE2E2200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */; + path = Parse.framework; + remoteRef = 4A6AE2E1200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */ = { + 4A6AE2E4200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream OSXTests.xctest"; - remoteRef = 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 4A6AE2E3200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A99731E5E8DBB0047B84B /* Starscream.framework */ = { + 4A6AE2E6200FABEB007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */; + path = Parse.framework; + remoteRef = 4A6AE2E5200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */ = { + 4A6AE2E8200FABEB007CA404 /* ParseUnitTests-iOS-host.app */ = { isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream tvOSTests.xctest"; - remoteRef = 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */; + fileType = wrapper.application; + path = "ParseUnitTests-iOS-host.app"; + remoteRef = 4A6AE2E7200FABEB007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -635,11 +642,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 090FFBC61E26F1730010EC2E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */; - }; 4A1A99771E5E8E040047B84B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Starscream iOS"; From c43f22b8209b5a0783f3f6688d07d856b945f36a Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 11:34:00 -0500 Subject: [PATCH 2/8] Update Project Settings --- .../project.pbxproj | 14 +- .../xcschemes/LiveQueryDemo-ObjC.xcscheme | 4 +- .../xcschemes/LiveQueryDemo.xcscheme | 4 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 124 ++++++++++-------- .../xcschemes/ParseLiveQuery-OSX.xcscheme | 4 +- .../xcschemes/ParseLiveQuery-iOS.xcscheme | 4 +- Sources/ParseLiveQuery/Client.swift | 2 +- .../Internal/QueryEncoder.swift | 2 +- Sources/ParseLiveQuery/Subscription.swift | 4 +- 9 files changed, 97 insertions(+), 65 deletions(-) diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 9c78cc06..7de139fd 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -153,7 +153,7 @@ F519CBA91CA9CA04005295C0 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = parse; TargetAttributes = { F509D5311CA9E597007B15B0 = { @@ -270,14 +270,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -316,14 +322,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme index f6701f97..cb88d9f6 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme @@ -1,6 +1,6 @@ @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme b/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme index cdef9fe5..b0dae1e5 100644 --- a/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme +++ b/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme @@ -1,6 +1,6 @@ @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 5ab38086..5cbdca49 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -106,72 +106,72 @@ remoteGlobalIDString = D9C3E35E19E48FF1009FC285; remoteInfo = "Starscream OSX"; }; - 4A6AE2D5200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE318200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C3821C19CCA89E0066284A; remoteInfo = "Parse-iOS"; }; - 4A6AE2D7200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE31A200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C5845D1C3B0A98000063C6; remoteInfo = "Parse-iOS-Dynamic"; }; - 4A6AE2D9200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE31C200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 816F449B1A8E8933009CDB32; remoteInfo = "ParseUnitTests-iOS"; }; - 4A6AE2DB200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE31E200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 97010FAC1630B18F00AB761E; remoteInfo = "Parse-macOS"; }; - 4A6AE2DD200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE320200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C09F861AF97A490043B49C; remoteInfo = "ParseUnitTests-macOS"; }; - 4A6AE2DF200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE322200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 815F24151BD04D150054659F; remoteInfo = "Parse-tvOS"; }; - 4A6AE2E1200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE324200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; remoteInfo = "Parse-tvOS-Dynamic"; }; - 4A6AE2E3200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE326200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 810156691BB3832700D7C7BD; remoteInfo = "Parse-watchOS"; }; - 4A6AE2E5200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE328200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; remoteInfo = "Parse-watchOS-Dynamic"; }; - 4A6AE2E7200FABEB007CA404 /* PBXContainerItemProxy */ = { + 4A6AE32A200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; proxyType = 2; remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; remoteInfo = "ParseUnitTests-iOS-host"; @@ -180,7 +180,6 @@ /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; - 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; 094AE8EF1E25ADF300F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libicucore.tbd; sourceTree = DEVELOPER_DIR; }; 094AE8F11E25AE0500F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; 094AE8F31E25AE1100F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; @@ -202,6 +201,7 @@ 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; + 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -294,19 +294,19 @@ name = Products; sourceTree = ""; }; - 4A6AE2C9200FABEB007CA404 /* Products */ = { + 4A6AE30C200FB23E007CA404 /* Products */ = { isa = PBXGroup; children = ( - 4A6AE2D6200FABEB007CA404 /* Parse.framework */, - 4A6AE2D8200FABEB007CA404 /* Parse.framework */, - 4A6AE2DA200FABEB007CA404 /* ParseUnitTests-iOS.xctest */, - 4A6AE2DC200FABEB007CA404 /* Parse.framework */, - 4A6AE2DE200FABEB007CA404 /* ParseUnitTests-macOS.xctest */, - 4A6AE2E0200FABEB007CA404 /* Parse.framework */, - 4A6AE2E2200FABEB007CA404 /* Parse.framework */, - 4A6AE2E4200FABEB007CA404 /* Parse.framework */, - 4A6AE2E6200FABEB007CA404 /* Parse.framework */, - 4A6AE2E8200FABEB007CA404 /* ParseUnitTests-iOS-host.app */, + 4A6AE319200FB23E007CA404 /* Parse.framework */, + 4A6AE31B200FB23E007CA404 /* Parse.framework */, + 4A6AE31D200FB23E007CA404 /* ParseUnitTests-iOS.xctest */, + 4A6AE31F200FB23E007CA404 /* Parse.framework */, + 4A6AE321200FB23E007CA404 /* ParseUnitTests-macOS.xctest */, + 4A6AE323200FB23E007CA404 /* Parse.framework */, + 4A6AE325200FB23E007CA404 /* Parse.framework */, + 4A6AE327200FB23E007CA404 /* Parse.framework */, + 4A6AE329200FB23E007CA404 /* Parse.framework */, + 4A6AE32B200FB23E007CA404 /* ParseUnitTests-iOS-host.app */, ); name = Products; sourceTree = ""; @@ -324,8 +324,8 @@ children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, + 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */, 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */, - 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, ); indentWidth = 4; @@ -431,7 +431,7 @@ F5256FC51BD71F9A0052FB8A /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = Parse; TargetAttributes = { F5903CE91BD999C500C3EFFE = { @@ -456,8 +456,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 4A6AE2C9200FABEB007CA404 /* Products */; - ProjectRef = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + ProductGroup = 4A6AE30C200FB23E007CA404 /* Products */; + ProjectRef = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; }, { ProductGroup = 4A1A99621E5E8DBB0047B84B /* Products */; @@ -515,74 +515,74 @@ remoteRef = 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2D6200FABEB007CA404 /* Parse.framework */ = { + 4A6AE319200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2D5200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE318200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2D8200FABEB007CA404 /* Parse.framework */ = { + 4A6AE31B200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2D7200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE31A200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2DA200FABEB007CA404 /* ParseUnitTests-iOS.xctest */ = { + 4A6AE31D200FB23E007CA404 /* ParseUnitTests-iOS.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "ParseUnitTests-iOS.xctest"; - remoteRef = 4A6AE2D9200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE31C200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2DC200FABEB007CA404 /* Parse.framework */ = { + 4A6AE31F200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2DB200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE31E200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2DE200FABEB007CA404 /* ParseUnitTests-macOS.xctest */ = { + 4A6AE321200FB23E007CA404 /* ParseUnitTests-macOS.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "ParseUnitTests-macOS.xctest"; - remoteRef = 4A6AE2DD200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE320200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2E0200FABEB007CA404 /* Parse.framework */ = { + 4A6AE323200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2DF200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE322200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2E2200FABEB007CA404 /* Parse.framework */ = { + 4A6AE325200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2E1200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE324200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2E4200FABEB007CA404 /* Parse.framework */ = { + 4A6AE327200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2E3200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE326200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2E6200FABEB007CA404 /* Parse.framework */ = { + 4A6AE329200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = Parse.framework; - remoteRef = 4A6AE2E5200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE328200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A6AE2E8200FABEB007CA404 /* ParseUnitTests-iOS-host.app */ = { + 4A6AE32B200FB23E007CA404 /* ParseUnitTests-iOS-host.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = "ParseUnitTests-iOS-host.app"; - remoteRef = 4A6AE2E7200FABEB007CA404 /* PBXContainerItemProxy */; + remoteRef = 4A6AE32A200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -659,12 +659,18 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -688,12 +694,18 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme index 14f6d441..95b96b43 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme index 3521e2d1..b0e56c09 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index a8d9cf96..fff4bbe1 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -130,7 +130,7 @@ extension Client { public func subscribe( _ query: PFQuery, subclassType: T.Type = T.self - ) -> Subscription where T: PFObject { + ) -> Subscription { return subscribe(query, handler: Subscription()) } diff --git a/Sources/ParseLiveQuery/Internal/QueryEncoder.swift b/Sources/ParseLiveQuery/Internal/QueryEncoder.swift index e15f691e..2a061035 100644 --- a/Sources/ParseLiveQuery/Internal/QueryEncoder.swift +++ b/Sources/ParseLiveQuery/Internal/QueryEncoder.swift @@ -14,7 +14,7 @@ import Parse NOTE: This is super hacky, and we need a better answer for this. */ extension Dictionary where Key: ExpressibleByStringLiteral, Value: AnyObject { - init(query: PFQuery) where T: PFObject { + init(query: PFQuery) { self.init() let queryState = query.value(forKey: "state") as AnyObject? if let className = queryState?.value(forKey: "parseClassName") { diff --git a/Sources/ParseLiveQuery/Subscription.swift b/Sources/ParseLiveQuery/Subscription.swift index 5e048279..15b487e7 100644 --- a/Sources/ParseLiveQuery/Subscription.swift +++ b/Sources/ParseLiveQuery/Subscription.swift @@ -84,7 +84,7 @@ public enum Event where T: PFObject { /// The object has been deleted, and is no longer included in the query case deleted(T) - init(event: Event) where V: PFObject { + init(event: Event) { switch event { case .entered(let value as T): self = .entered(value) case .left(let value as T): self = .left(value) @@ -96,7 +96,7 @@ public enum Event where T: PFObject { } } -private func == (lhs: Event, rhs: Event) -> Bool { +private func == (lhs: Event, rhs: Event) -> Bool { switch (lhs, rhs) { case (.entered(let obj1), .entered(let obj2)): return obj1 == obj2 case (.left(let obj1), .left(let obj2)): return obj1 == obj2 From 47dbd36b3c3233bc3c43a16c90635b68d3a4ad8c Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 11:37:14 -0500 Subject: [PATCH 3/8] Proper target dependencies --- .../ParseLiveQuery.xcodeproj/project.pbxproj | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 5cbdca49..c4106be2 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -20,15 +20,14 @@ 09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C841E25C5100037C3BC /* Parse.framework */; }; 09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */; }; 09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */; }; - 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7A1E25C18E0037C3BC /* Parse.framework */; }; - 09D80FD51E26BD7900AC7A2D /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCDF1E25C99400369AA6 /* Bolts.framework */; }; - 09D80FD61E26BD9100AC7A2D /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */; }; 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */; }; 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */; }; 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */; }; 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; + 4A6AE330200FB32B007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */; }; + 4A6AE332200FB32B007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE31B200FB23E007CA404 /* Parse.framework */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; @@ -176,6 +175,20 @@ remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; remoteInfo = "ParseUnitTests-iOS-host"; }; + 4A6AE32C200FB2FE007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 81C582E11C3B0A98000063C6; + remoteInfo = "Parse-iOS-Dynamic"; + }; + 4A6AE32E200FB304007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 97010FAB1630B18F00AB761E; + remoteInfo = "Parse-macOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -202,6 +215,7 @@ 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; + 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -238,6 +252,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4A6AE330200FB32B007CA404 /* BoltsSwift.framework in Frameworks */, + 4A6AE332200FB32B007CA404 /* Parse.framework in Frameworks */, 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */, 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */, 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */, @@ -245,9 +261,6 @@ 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */, 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */, 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */, - 09D80FD51E26BD7900AC7A2D /* Bolts.framework in Frameworks */, - 09D80FD61E26BD9100AC7A2D /* BoltsSwift.framework in Frameworks */, - 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -257,6 +270,7 @@ 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( + 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */, 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */, 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */, @@ -399,6 +413,7 @@ buildRules = ( ); dependencies = ( + 4A6AE32F200FB304007CA404 /* PBXTargetDependency */, 4A1A99791E5E8E0C0047B84B /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; @@ -418,6 +433,7 @@ buildRules = ( ); dependencies = ( + 4A6AE32D200FB2FE007CA404 /* PBXTargetDependency */, 4A1A99771E5E8E040047B84B /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; @@ -652,6 +668,16 @@ name = "Starscream OSX"; targetProxy = 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */; }; + 4A6AE32D200FB2FE007CA404 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Parse-iOS-Dynamic"; + targetProxy = 4A6AE32C200FB2FE007CA404 /* PBXContainerItemProxy */; + }; + 4A6AE32F200FB304007CA404 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Parse-macOS"; + targetProxy = 4A6AE32E200FB304007CA404 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ From 59b64ae99dd2f0310f3a7588989c341d2374df77 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 11:47:12 -0500 Subject: [PATCH 4/8] Adds Bolts to linked libraries --- .../ParseLiveQuery.xcodeproj/project.pbxproj | 235 ++++++++++++++---- 1 file changed, 180 insertions(+), 55 deletions(-) diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index c4106be2..f2affb44 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -26,8 +26,9 @@ 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; - 4A6AE330200FB32B007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */; }; - 4A6AE332200FB32B007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE31B200FB23E007CA404 /* Parse.framework */; }; + 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE319200FB23E007CA404 /* Parse.framework */; }; + 4A6AE336200FB554007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */; }; + 4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE348200FB569007CA404 /* Bolts.framework */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; @@ -91,20 +92,6 @@ remoteGlobalIDString = 091277A01BD673A70003036D; remoteInfo = "Starscream tvOSTests"; }; - 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 6B3E79E519D48B7F006071F7; - remoteInfo = "Starscream iOS"; - }; - 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = D9C3E35E19E48FF1009FC285; - remoteInfo = "Starscream OSX"; - }; 4A6AE318200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; @@ -175,19 +162,82 @@ remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; remoteInfo = "ParseUnitTests-iOS-host"; }; - 4A6AE32C200FB2FE007CA404 /* PBXContainerItemProxy */ = { + 4A6AE345200FB569007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81ED94291BE147CF00795F05; + remoteInfo = "Bolts-iOS"; }; - 4A6AE32E200FB304007CA404 /* PBXContainerItemProxy */ = { + 4A6AE347200FB569007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 97010FAB1630B18F00AB761E; - remoteInfo = "Parse-macOS"; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1D5D7DD31BE3CE8200FD67C7; + remoteInfo = "Bolts-iOS-Dynamic"; + }; + 4A6AE349200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81ED946E1BE14B5200795F05; + remoteInfo = "Bolts-macOS"; + }; + 4A6AE34B200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F5AFCA021BA752750076E927; + remoteInfo = "Bolts-tvOS"; + }; + 4A6AE34D200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81E94D6A1C2B8BF200A6291E; + remoteInfo = "Bolts-tvOS-Dynamic"; + }; + 4A6AE34F200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8178F99C1BB0F87700AD289D; + remoteInfo = "Bolts-watchOS"; + }; + 4A6AE351200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 819573F11C2B8ECB00BFCA39; + remoteInfo = "Bolts-watchOS-Dynamic"; + }; + 4A6AE353200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8E8C8EE917F23D1D00E3F1C7; + remoteInfo = "BoltsTests-iOS"; + }; + 4A6AE355200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8E8C8F1917F241DA00E3F1C7; + remoteInfo = "BoltsTests-macOS"; + }; + 4A6AE357200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F5AFCA131BA752770076E927; + remoteInfo = "BoltsTests-tvOS"; + }; + 4A6AE359200FB569007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1EC3016018CDAA8400D06D07; + remoteInfo = BoltsTestUI; }; /* End PBXContainerItemProxy section */ @@ -216,6 +266,7 @@ 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -252,8 +303,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A6AE330200FB32B007CA404 /* BoltsSwift.framework in Frameworks */, - 4A6AE332200FB32B007CA404 /* Parse.framework in Frameworks */, + 4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */, + 4A6AE336200FB554007CA404 /* Starscream.framework in Frameworks */, + 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */, 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */, 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */, 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */, @@ -325,6 +377,24 @@ name = Products; sourceTree = ""; }; + 4A6AE338200FB569007CA404 /* Products */ = { + isa = PBXGroup; + children = ( + 4A6AE346200FB569007CA404 /* Bolts.framework */, + 4A6AE348200FB569007CA404 /* Bolts.framework */, + 4A6AE34A200FB569007CA404 /* Bolts.framework */, + 4A6AE34C200FB569007CA404 /* Bolts.framework */, + 4A6AE34E200FB569007CA404 /* Bolts.framework */, + 4A6AE350200FB569007CA404 /* Bolts.framework */, + 4A6AE352200FB569007CA404 /* Bolts.framework */, + 4A6AE354200FB569007CA404 /* BoltsTests-iOS.xctest */, + 4A6AE356200FB569007CA404 /* BoltsTests-OSX.xctest */, + 4A6AE358200FB569007CA404 /* BoltsTests-tvOS.xctest */, + 4A6AE35A200FB569007CA404 /* BoltsTestUI.app */, + ); + name = Products; + sourceTree = ""; + }; 81464FC51CA31DA0000235E7 /* Resources */ = { isa = PBXGroup; children = ( @@ -338,6 +408,7 @@ children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, + 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */, 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */, 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, @@ -413,8 +484,6 @@ buildRules = ( ); dependencies = ( - 4A6AE32F200FB304007CA404 /* PBXTargetDependency */, - 4A1A99791E5E8E0C0047B84B /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; productName = ParseLiveQuery; @@ -433,8 +502,6 @@ buildRules = ( ); dependencies = ( - 4A6AE32D200FB2FE007CA404 /* PBXTargetDependency */, - 4A1A99771E5E8E040047B84B /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; productName = ParseLiveQuery; @@ -471,6 +538,10 @@ productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; projectReferences = ( + { + ProductGroup = 4A6AE338200FB569007CA404 /* Products */; + ProjectRef = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; + }, { ProductGroup = 4A6AE30C200FB23E007CA404 /* Products */; ProjectRef = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; @@ -601,6 +672,83 @@ remoteRef = 4A6AE32A200FB23E007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 4A6AE346200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE345200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE348200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE347200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE34A200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE349200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE34C200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE34B200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE34E200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE34D200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE350200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE34F200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE352200FB569007CA404 /* Bolts.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Bolts.framework; + remoteRef = 4A6AE351200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE354200FB569007CA404 /* BoltsTests-iOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "BoltsTests-iOS.xctest"; + remoteRef = 4A6AE353200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE356200FB569007CA404 /* BoltsTests-OSX.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "BoltsTests-OSX.xctest"; + remoteRef = 4A6AE355200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE358200FB569007CA404 /* BoltsTests-tvOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "BoltsTests-tvOS.xctest"; + remoteRef = 4A6AE357200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE35A200FB569007CA404 /* BoltsTestUI.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = BoltsTestUI.app; + remoteRef = 4A6AE359200FB569007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -657,29 +805,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 4A1A99771E5E8E040047B84B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Starscream iOS"; - targetProxy = 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */; - }; - 4A1A99791E5E8E0C0047B84B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Starscream OSX"; - targetProxy = 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */; - }; - 4A6AE32D200FB2FE007CA404 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 4A6AE32C200FB2FE007CA404 /* PBXContainerItemProxy */; - }; - 4A6AE32F200FB304007CA404 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-macOS"; - targetProxy = 4A6AE32E200FB304007CA404 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ F5256FE01BD71F9A0052FB8A /* Debug */ = { isa = XCBuildConfiguration; From 9cc940b9e963017e0f569d7bc3528c27090c6371 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 11:48:56 -0500 Subject: [PATCH 5/8] Bumps CI xcode version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a14952da..9f09a2e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "8.3.3" + xcode: "9.0" shell: /bin/bash --login -eo pipefail aliases: - &prepare From 846b8041ac41249cf5028f90d72d5763326942c5 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 13:25:54 -0500 Subject: [PATCH 6/8] Bump starscream to latest version --- .gitmodules | 6 + Cartfile | 2 +- Cartfile.resolved | 4 +- Carthage/Checkouts/Starscream | 2 +- Carthage/Checkouts/common-crypto-spm | 1 + Carthage/Checkouts/zlib-spm | 1 + ParseLiveQuery.podspec | 2 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 138 +++++------------- .../Internal/ClientPrivate.swift | 18 +-- 9 files changed, 56 insertions(+), 118 deletions(-) create mode 160000 Carthage/Checkouts/common-crypto-spm create mode 160000 Carthage/Checkouts/zlib-spm diff --git a/.gitmodules b/.gitmodules index df49e544..811647dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "Carthage/Checkouts/Starscream"] path = Carthage/Checkouts/Starscream url = https://github.com/daltoniam/Starscream.git +[submodule "Carthage/Checkouts/zlib-spm"] + path = Carthage/Checkouts/zlib-spm + url = https://github.com/daltoniam/zlib-spm.git +[submodule "Carthage/Checkouts/common-crypto-spm"] + path = Carthage/Checkouts/common-crypto-spm + url = https://github.com/daltoniam/common-crypto-spm.git diff --git a/Cartfile b/Cartfile index 23440953..c08de20d 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0 -github "daltoniam/Starscream" == 2.1.1 +github "daltoniam/Starscream" ~> 3.0.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 23b62d30..4d8ae73d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,6 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.3.0" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0" -github "daltoniam/Starscream" "2.1.1" +github "daltoniam/Starscream" "3.0.4" +github "daltoniam/common-crypto-spm" "1.1.0" +github "daltoniam/zlib-spm" "1.1.0" diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index 21678c94..6e10c04c 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit 21678c9426dde2a77152a0d5982cdb952baf0455 +Subproject commit 6e10c04c8387d00f41a17450fa45b51427971022 diff --git a/Carthage/Checkouts/common-crypto-spm b/Carthage/Checkouts/common-crypto-spm new file mode 160000 index 00000000..2eb3aff0 --- /dev/null +++ b/Carthage/Checkouts/common-crypto-spm @@ -0,0 +1 @@ +Subproject commit 2eb3aff0fb57f92f5722fac5d6d20bf64669ca66 diff --git a/Carthage/Checkouts/zlib-spm b/Carthage/Checkouts/zlib-spm new file mode 160000 index 00000000..83ac8d71 --- /dev/null +++ b/Carthage/Checkouts/zlib-spm @@ -0,0 +1 @@ +Subproject commit 83ac8d719a2f3aa775dbdf116a57f56fb2c49abb diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index dd16994b..a918b716 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -22,5 +22,5 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.16.0' s.dependency 'Bolts-Swift', '~> 1.9' - s.dependency 'Starscream', '2.1.1' + s.dependency 'Starscream', '~> 3.0.4' end diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index f2affb44..148fc1b7 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -27,8 +27,10 @@ 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE319200FB23E007CA404 /* Parse.framework */; }; - 4A6AE336200FB554007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */; }; 4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE348200FB569007CA404 /* Bolts.framework */; }; + 4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */; }; + 4A6AE37E200FC9DF007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; + 4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; @@ -50,48 +52,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B3E79E619D48B7F006071F7; - remoteInfo = "Starscream iOS"; - }; - 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B3E79F119D48B7F006071F7; - remoteInfo = "Starscream iOSTests"; - }; - 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D9C3E35F19E48FF1009FC285; - remoteInfo = "Starscream OSX"; - }; - 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D9C3E36919E48FF1009FC285; - remoteInfo = "Starscream OSXTests"; - }; - 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 091277971BD673A70003036D; - remoteInfo = "Starscream tvOS"; - }; - 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 091277A01BD673A70003036D; - remoteInfo = "Starscream tvOSTests"; - }; 4A6AE318200FB23E007CA404 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; @@ -239,6 +199,20 @@ remoteGlobalIDString = 1EC3016018CDAA8400D06D07; remoteInfo = BoltsTestUI; }; + 4A6AE37A200FC9C5007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 33CCF0921F5DDC030099B092; + remoteInfo = Starscream; + }; + 4A6AE37C200FC9C5007CA404 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC; + remoteInfo = "Starscream Tests"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -251,11 +225,8 @@ 094AE9011E25AF3A00F408BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 094AE9031E25AF4300F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 094AE9051E25AF5A00F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = ../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09A31C7A1E25C18E0037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Parse.framework; path = "../Release-iphoneos/Parse.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BoltsSwift.framework; path = "../Release-iphoneos/BoltsSwift.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 09C9FCDF1E25C99400369AA6 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = "../Release-iphoneos/Bolts.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; @@ -265,8 +236,8 @@ 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; - 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; + 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -286,6 +257,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4A6AE37E200FC9DF007CA404 /* Starscream.framework in Frameworks */, 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */, 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */, 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */, @@ -303,8 +275,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */, + 4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */, 4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */, - 4A6AE336200FB554007CA404 /* Starscream.framework in Frameworks */, 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */, 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */, 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */, @@ -322,18 +295,15 @@ 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( - 4A6AE331200FB32B007CA404 /* BoltsSwift.framework */, + 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */, 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */, 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */, 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */, 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, - 09C9FCDF1E25C99400369AA6 /* Bolts.framework */, 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */, - 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */, 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */, - 09A31C7A1E25C18E0037C3BC /* Parse.framework */, 09A31C841E25C5100037C3BC /* Parse.framework */, 094AE9011E25AF3A00F408BC /* Foundation.framework */, 094AE8F51E25AE1C00F408BC /* Foundation.framework */, @@ -350,12 +320,8 @@ 4A1A99621E5E8DBB0047B84B /* Products */ = { isa = PBXGroup; children = ( - 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */, - 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */, - 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */, - 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */, - 4A1A99731E5E8DBB0047B84B /* Starscream.framework */, - 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */, + 4A6AE37B200FC9C5007CA404 /* Starscream.framework */, + 4A6AE37D200FC9C5007CA404 /* Starscream Tests.xctest */, ); name = Products; sourceTree = ""; @@ -560,48 +526,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream iOSTests.xctest"; - remoteRef = 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream OSXTests.xctest"; - remoteRef = 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A1A99731E5E8DBB0047B84B /* Starscream.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Starscream.framework; - remoteRef = 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "Starscream tvOSTests.xctest"; - remoteRef = 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 4A6AE319200FB23E007CA404 /* Parse.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -749,6 +673,20 @@ remoteRef = 4A6AE359200FB569007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 4A6AE37B200FC9C5007CA404 /* Starscream.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Starscream.framework; + remoteRef = 4A6AE37A200FC9C5007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A6AE37D200FC9C5007CA404 /* Starscream Tests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Starscream Tests.xctest"; + remoteRef = 4A6AE37C200FC9C5007CA404 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift index 1fb84002..e3a0f69a 100644 --- a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift @@ -116,11 +116,11 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { extension Client: WebSocketDelegate { - public func websocketDidReceiveData(socket: WebSocket, data: Data) { + public func websocketDidReceiveData(socket: WebSocketClient, data: Data) { if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: Received binary data but we don't handle it...") } } - public func websocketDidReceiveMessage(socket: WebSocket, text: String) { + public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) { handleOperationAsync(text).continueWith { [weak self] task in if let error = task.error, self?.shouldPrintWebSocketLog == true { NSLog("ParseLiveQuery: Error processing message: \(error)") @@ -128,13 +128,13 @@ extension Client: WebSocketDelegate { } } - public func websocketDidConnect(socket: WebSocket) { + public func websocketDidConnect(socket: WebSocketClient) { isConnecting = false let sessionToken = PFUser.current()?.sessionToken ?? "" _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken, clientKey: clientKey)) } - public func websocketDidDisconnect(socket: WebSocket, error: NSError?) { + public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) { isConnecting = false if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket did disconnect with error: \(String(describing: error))") } @@ -143,16 +143,6 @@ extension Client: WebSocketDelegate { reconnect() } } - - public func webSocket(_ webSocket: WebSocket, didCloseWithCode code: Int, reason: String?, wasClean: Bool) { - isConnecting = false - if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket did close with code: \(code) reason: \(String(describing: reason))") } - - // TODO: Better retry logic, unless `disconnect()` was explicitly called - if !userDisconnected { - reconnect() - } - } } // ------------------- From f8ab5b642c9e887a3f9bb7ca1423984a9bd02010 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 13:55:43 -0500 Subject: [PATCH 7/8] Prepare for Release 2.3.0 --- CHANGELOG.md | 6 ++++++ Cartfile | 4 ++-- ParseLiveQuery.podspec | 4 ++-- publish.sh | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cdca11d..7738b2fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # ParseLiveQuery-iOS-OSX Changelog +# 2.3.0 + +- Bumps Parse SDK to 1.16.0 +- Bumps Starscream to 3.0.4 +- Fixes warnings in Swift 4 + # 2.2.3 - Bumps Parse SDK to 1.15.4 and Bolts to 1.9.0, thanks to [marcgovi](https://github.com/marcgovi) diff --git a/Cartfile b/Cartfile index c08de20d..0a75f200 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0 +github "BoltsFramework/Bolts-Swift" ~> 1.3.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.16.0 github "daltoniam/Starscream" ~> 3.0.4 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index a918b716..9eda6c74 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.2.4' + s.version = '2.3.0' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -21,6 +21,6 @@ Pod::Spec.new do |s| s.module_name = 'ParseLiveQuery' s.dependency 'Parse', '~> 1.16.0' - s.dependency 'Bolts-Swift', '~> 1.9' + s.dependency 'Bolts-Swift', '~> 1.3.0' s.dependency 'Starscream', '~> 3.0.4' end diff --git a/publish.sh b/publish.sh index c5d8394d..f5c2d589 100755 --- a/publish.sh +++ b/publish.sh @@ -2,4 +2,4 @@ rvm use $(< .ruby-version) --install --binary --fuzzy gem install bundler bundle install -bundle exec pod trunk push ParseLiveQuery.podspec +bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings From 9bb30660fd224fd0e8021a503df1fa2bfcb23142 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 17 Jan 2018 14:00:30 -0500 Subject: [PATCH 8/8] bump xcode for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8833dc84..2e18923d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ language: objective-c os: osx -osx_image: xcode8.3 +osx_image: xcode9 cache: - cocoapods install: bundle install