diff --git a/.gitmodules b/.gitmodules index 7bcb7bb1..273a4ff4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,15 @@ +[submodule "Carthage/Checkouts/Starscream"] + path = Carthage/Checkouts/Starscream + url = https://github.com/daltoniam/Starscream.git [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/Bolts-Swift"] - path = Carthage/Checkouts/Bolts-Swift - url = https://github.com/BoltsFramework/Bolts-Swift.git [submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] path = Carthage/Checkouts/Parse-SDK-iOS-OSX url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git -[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 [submodule "Carthage/Checkouts/facebook-ios-sdk"] path = Carthage/Checkouts/facebook-ios-sdk url = https://github.com/facebook/facebook-ios-sdk.git +[submodule "Carthage/Checkouts/Bolts-Swift"] + path = Carthage/Checkouts/Bolts-Swift + url = https://github.com/BoltsFramework/Bolts-Swift.git diff --git a/Cartfile b/Cartfile index 0e1bcc87..a6634a09 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02" -github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.0 -github "daltoniam/Starscream" ~> 3.0.4 +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 +github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index b77bfce0..8d173606 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.0" -github "daltoniam/Starscream" "3.0.4" -github "daltoniam/common-crypto-spm" "1.1.0" -github "daltoniam/zlib-spm" "1.1.0" -github "facebook/facebook-ios-sdk" "sdk-version-4.31.1" +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" +github "daltoniam/Starscream" "3.0.5" +github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift index e9baa72d..e7811181 160000 --- a/Carthage/Checkouts/Bolts-Swift +++ b/Carthage/Checkouts/Bolts-Swift @@ -1 +1 @@ -Subproject commit e9baa72d04521c3b25ef4fa6fef12b340953ee02 +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 7c226704..b10ccc42 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 7c226704bfd242fc5cec6622c7e78ab79ea8191a +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index 6e10c04c..114e5df9 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit 6e10c04c8387d00f41a17450fa45b51427971022 +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/common-crypto-spm b/Carthage/Checkouts/common-crypto-spm deleted file mode 160000 index 2eb3aff0..00000000 --- a/Carthage/Checkouts/common-crypto-spm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2eb3aff0fb57f92f5722fac5d6d20bf64669ca66 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk index 2ef44b3b..aa2b9ec2 160000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ b/Carthage/Checkouts/facebook-ios-sdk @@ -1 +1 @@ -Subproject commit 2ef44b3b1639adcc163f0477b7529b477ff6dbe6 +Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 diff --git a/Carthage/Checkouts/zlib-spm b/Carthage/Checkouts/zlib-spm deleted file mode 160000 index 83ac8d71..00000000 --- a/Carthage/Checkouts/zlib-spm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 83ac8d719a2f3aa775dbdf116a57f56fb2c49abb diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 415bc8b0..53e8f232 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 = 0920; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = parse; TargetAttributes = { F509D5311CA9E597007B15B0 = { @@ -166,6 +166,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -265,6 +266,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -274,12 +276,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -317,6 +321,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -326,12 +331,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme index cb88d9f6..4ada91ca 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 @@ @@ -46,7 +45,6 @@ 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/project.pbxproj b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj index 40c51184..726e83ee 100644 --- a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj @@ -141,7 +141,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = Parse; TargetAttributes = { F509D5161CA9E4AE007B15B0 = { @@ -155,6 +155,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -247,18 +248,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = 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; @@ -293,18 +303,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = 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.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme b/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme index b0dae1e5..13a079c7 100644 --- a/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme +++ b/Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 012170d4..52869a1e 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.6.0' + s.version = '2.7.0' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -22,8 +22,8 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.17.0' + s.dependency 'Parse', '~> 1.17.1' s.dependency 'Bolts-Swift', '~> 1.4.0' - s.dependency 'Starscream', '~> 3.0.4' + s.dependency 'Starscream', '~> 3.0.5' s.dependency 'Bolts', '~> 1.9.0' end diff --git a/ParseLiveQuery.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ParseLiveQuery.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/ParseLiveQuery.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 509e4d28..7d2ad8d7 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -498,7 +498,7 @@ }; buildConfigurationList = F5256FC81BD71F9A0052FB8A /* Build configuration list for PBXProject "ParseLiveQuery" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme index 95b96b43..f4bcc048 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ 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 b0e56c09..6b81958f 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist index fbfefed7..5f55083b 100644 --- a/Sources/ParseLiveQuery/Info.plist +++ b/Sources/ParseLiveQuery/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.6.0 + 2.6.1 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/ParseLiveQuery/Internal/Operation.swift b/Sources/ParseLiveQuery/Internal/Operation.swift index cacd1606..bd8fc919 100644 --- a/Sources/ParseLiveQuery/Internal/Operation.swift +++ b/Sources/ParseLiveQuery/Internal/Operation.swift @@ -43,7 +43,7 @@ enum ClientOperation { enum ServerResponse { case redirect(url: String) - case connected() + case connected case subscribed(requestId: Client.RequestId) case unsubscribed(requestId: Client.RequestId) @@ -80,7 +80,7 @@ enum ServerResponse { let rawOperation: String = try jsonValue(json, "op") switch rawOperation { case "connected": - self = .connected() + self = .connected case "redirect": self = .redirect(url: try jsonValue(json, "url")) diff --git a/Sources/ParseLiveQuery/Internal/QueryEncoder.swift b/Sources/ParseLiveQuery/Internal/QueryEncoder.swift index a59c7b14..7590294b 100644 --- a/Sources/ParseLiveQuery/Internal/QueryEncoder.swift +++ b/Sources/ParseLiveQuery/Internal/QueryEncoder.swift @@ -66,7 +66,7 @@ extension PFGeoPoint { } fileprivate extension Formatter { - fileprivate static let iso8601: DateFormatter = { + static let iso8601: DateFormatter = { let formatter = DateFormatter() formatter.calendar = Calendar(identifier: .iso8601) formatter.locale = Locale(identifier: "en_US_POSIX") @@ -77,7 +77,7 @@ fileprivate extension Formatter { } fileprivate extension Date { - fileprivate var encodedString: String { + var encodedString: String { return Formatter.iso8601.string(from: self) } }