From efe791202e7668bd88f3daf5762b922d07b132e5 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 02:12:17 -0500 Subject: [PATCH 01/22] Updating Dependencies. Fixing Warnings. -Updated podspec for final Swift 4.2 release. -Updated ServerResponse enum to fix warnings for enum value with parentheses but no values. -Removed redundant fileprivate declarations in extensions. -Updated Carthage versions. --- Cartfile.resolved | 8 +++----- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/Starscream | 2 +- Carthage/Checkouts/facebook-ios-sdk | 2 +- ParseLiveQuery.podspec | 6 +++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 1 + Sources/ParseLiveQuery/Info.plist | 2 +- Sources/ParseLiveQuery/Internal/Operation.swift | 4 ++-- Sources/ParseLiveQuery/Internal/QueryEncoder.swift | 4 ++-- 10 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 ParseLiveQuery.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Cartfile.resolved b/Cartfile.resolved index b77bfce0..4153a5c6 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 "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.2" +github "daltoniam/Starscream" "3.1.0" +github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 7c226704..c1e05872 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 7c226704bfd242fc5cec6622c7e78ab79ea8191a +Subproject commit c1e058720162ca1c8691cfee0ecf40409fd6d239 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index 6e10c04c..9c03ef71 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit 6e10c04c8387d00f41a17450fa45b51427971022 +Subproject commit 9c03ef715d1bc9334b446c90df53586dd38cf849 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/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 012170d4..6b91caf4 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.2' s.dependency 'Bolts-Swift', '~> 1.4.0' - s.dependency 'Starscream', '~> 3.0.4' + s.dependency 'Starscream', '~> 3.0.6' 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..909ae6c4 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -501,6 +501,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist index fbfefed7..b2f9bd37 100644 --- a/Sources/ParseLiveQuery/Info.plist +++ b/Sources/ParseLiveQuery/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.6.0 + 2.7.0 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) } } From b867da11829d7b9344fcf19ed15a5863d33ea8da Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 02:26:12 -0500 Subject: [PATCH 02/22] Fixing dependency updates and build version. --- Cartfile | 6 +++--- Cartfile.resolved | 2 +- Carthage/Checkouts/Bolts-Swift | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 3 +-- Sources/ParseLiveQuery/Info.plist | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cartfile b/Cartfile index 0e1bcc87..a05a18c4 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" ~> 1.4.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.2 +github "daltoniam/Starscream" ~> 3.0.6 diff --git a/Cartfile.resolved b/Cartfile.resolved index 4153a5c6..a7c9fc5c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02" +github "BoltsFramework/Bolts-Swift" "1.4.0" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.2" github "daltoniam/Starscream" "3.1.0" 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/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 909ae6c4..7d2ad8d7 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -498,10 +498,9 @@ }; buildConfigurationList = F5256FC81BD71F9A0052FB8A /* Build configuration list for PBXProject "ParseLiveQuery" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist index b2f9bd37..5f55083b 100644 --- a/Sources/ParseLiveQuery/Info.plist +++ b/Sources/ParseLiveQuery/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.7.0 + 2.6.1 CFBundleSignature ???? CFBundleVersion From 5fdc1f6996c114bdfbb002485586e9300802faa1 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 02:36:32 -0500 Subject: [PATCH 03/22] Updating project localization, retain, and warning settings. --- .../project.pbxproj | 9 +++++++- .../xcschemes/LiveQueryDemo-ObjC.xcscheme | 4 +--- .../LiveQueryDemo.xcodeproj/project.pbxproj | 21 ++++++++++++++++++- .../xcschemes/LiveQueryDemo.xcscheme | 4 +--- .../xcschemes/ParseLiveQuery-OSX.xcscheme | 4 +--- .../xcschemes/ParseLiveQuery-iOS.xcscheme | 4 +--- 6 files changed, 32 insertions(+), 14 deletions(-) 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/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" From 6f0302f27b5e995e09ec4a3c3a127c2025bfa552 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 02:52:26 -0500 Subject: [PATCH 04/22] Updating Parse dependency version to last swift 4.2 --- Cartfile | 2 +- ParseLiveQuery.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index a05a18c4..8c7bf6de 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" ~> 1.4.0 -github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.2 +github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.1 github "daltoniam/Starscream" ~> 3.0.6 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 6b91caf4..ee60965c 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.17.2' + s.dependency 'Parse', '~> 1.17.1' s.dependency 'Bolts-Swift', '~> 1.4.0' s.dependency 'Starscream', '~> 3.0.6' s.dependency 'Bolts', '~> 1.9.0' From 19a6dc45f6069555f16b021d3c28325e9b186721 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 03:19:45 -0500 Subject: [PATCH 05/22] Updating cartfile to only use specified version and updating. --- Cartfile | 6 +++--- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/Starscream | 2 +- Carthage/Checkouts/common-crypto-spm | 1 - Carthage/Checkouts/zlib-spm | 1 - 6 files changed, 7 insertions(+), 9 deletions(-) delete mode 160000 Carthage/Checkouts/common-crypto-spm delete mode 160000 Carthage/Checkouts/zlib-spm diff --git a/Cartfile b/Cartfile index 8c7bf6de..717dcd85 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" ~> 1.4.0 -github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.1 -github "daltoniam/Starscream" ~> 3.0.6 +github "BoltsFramework/Bolts-Swift" == 1.4.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 +github "daltoniam/Starscream" == 3.0.6 diff --git a/Cartfile.resolved b/Cartfile.resolved index a7c9fc5c..90ac9624 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.4.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.2" -github "daltoniam/Starscream" "3.1.0" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" +github "daltoniam/Starscream" "3.0.6" github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index c1e05872..b10ccc42 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit c1e058720162ca1c8691cfee0ecf40409fd6d239 +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index 9c03ef71..ebdc260e 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit 9c03ef715d1bc9334b446c90df53586dd38cf849 +Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 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/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 From de98f7d2ea69f394dd7aa587e4f15f569cdcad39 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 03:30:30 -0500 Subject: [PATCH 06/22] Another Dependency Update --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - Carthage/Checkouts/facebook-ios-sdk | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream delete mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/Cartfile b/Cartfile index 717dcd85..20b806b6 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" == 1.4.0 github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 -github "daltoniam/Starscream" == 3.0.6 +github "daltoniam/Starscream" == 3.0.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 90ac9624..e98ea8ad 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.4.0" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" -github "daltoniam/Starscream" "3.0.6" +github "daltoniam/Starscream" "3.0.5" github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index b10ccc42..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index ebdc260e..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index aa2b9ec2..00000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From 873ac053bf7113d2c7154a0d65b0e42b4cfefbbf Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 03:54:42 -0500 Subject: [PATCH 07/22] updating --- .gitmodules | 21 --------------------- Cartfile | 2 +- Cartfile.resolved | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7bcb7bb1..00000000 --- a/.gitmodules +++ /dev/null @@ -1,21 +0,0 @@ -[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 diff --git a/Cartfile b/Cartfile index 20b806b6..717dcd85 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" == 1.4.0 github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 -github "daltoniam/Starscream" == 3.0.5 +github "daltoniam/Starscream" == 3.0.6 diff --git a/Cartfile.resolved b/Cartfile.resolved index e98ea8ad..90ac9624 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.4.0" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" -github "daltoniam/Starscream" "3.0.5" +github "daltoniam/Starscream" "3.0.6" github "facebook/facebook-ios-sdk" "v4.44.1" From 9c698ce727ab6f96839bbb3d40a17a7e71b8a7c4 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:06:52 -0500 Subject: [PATCH 08/22] Fixing Carthage checkouts --- .gitmodules | 21 +++++++++++++++++++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + Carthage/Checkouts/facebook-ios-sdk | 1 + 6 files changed, 26 insertions(+) create mode 100644 .gitmodules create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream create mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..7bcb7bb1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,21 @@ +[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 diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..b10ccc42 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..ebdc260e --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk new file mode 160000 index 00000000..aa2b9ec2 --- /dev/null +++ b/Carthage/Checkouts/facebook-ios-sdk @@ -0,0 +1 @@ +Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From 391e657bf09147660ad6c9c75736b9636dba51aa Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:12:37 -0500 Subject: [PATCH 09/22] removind subcommit --- Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - Carthage/Checkouts/facebook-ios-sdk | 1 - 5 files changed, 5 deletions(-) delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream delete mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index b10ccc42..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index ebdc260e..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index aa2b9ec2..00000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From 48fbaa0199e48802fc5acf66ced77c97107dc335 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:15:13 -0500 Subject: [PATCH 10/22] remove resolved --- Cartfile.resolved | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Cartfile.resolved diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 90ac9624..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,5 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "1.4.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" -github "daltoniam/Starscream" "3.0.6" -github "facebook/facebook-ios-sdk" "v4.44.1" From 4c70b835380f5f0a483321ef03a78bc1d9f805c8 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:19:46 -0500 Subject: [PATCH 11/22] Create Cartfile.resolved --- Cartfile.resolved | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Cartfile.resolved diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 00000000..90ac9624 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,5 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "BoltsFramework/Bolts-Swift" "1.4.0" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" +github "daltoniam/Starscream" "3.0.6" +github "facebook/facebook-ios-sdk" "v4.44.1" From 17105244450d0d5981893457044f042b1b1245aa Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:24:55 -0500 Subject: [PATCH 12/22] trying something different --- Cartfile | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 717dcd85..4be83ae3 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" == 1.4.0 +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 github "daltoniam/Starscream" == 3.0.6 diff --git a/Cartfile.resolved b/Cartfile.resolved index 90ac9624..f463eb9a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "1.4.0" +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" github "daltoniam/Starscream" "3.0.6" github "facebook/facebook-ios-sdk" "v4.44.1" From 240e946ea8179c8ad4dd54a124a55239edf8dcdc Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:27:17 -0500 Subject: [PATCH 13/22] trying --- Cartfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Cartfile b/Cartfile index 4be83ae3..25496fd4 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,4 @@ github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 github "daltoniam/Starscream" == 3.0.6 +github "BoltsFramework/Bolts-ObjC" == 1.9.0 From da0d2493ab83aeffcfe99937474e9ed52372b011 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:28:54 -0500 Subject: [PATCH 14/22] removing submodules --- .gitmodules | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7bcb7bb1..00000000 --- a/.gitmodules +++ /dev/null @@ -1,21 +0,0 @@ -[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 From 11fe4b2552641b27e52578067f8b572253ce97f0 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:30:49 -0500 Subject: [PATCH 15/22] updating --- .gitmodules | 15 +++++++++++++++ Cartfile | 3 +-- Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + Carthage/Checkouts/facebook-ios-sdk | 1 + 7 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream create mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..b22b2d47 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[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/Bolts-Swift"] + path = Carthage/Checkouts/Bolts-Swift + url = https://github.com/BoltsFramework/Bolts-Swift.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-ObjC"] + path = Carthage/Checkouts/Bolts-ObjC + url = https://github.com/BoltsFramework/Bolts-ObjC.git diff --git a/Cartfile b/Cartfile index 25496fd4..237a557a 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,3 @@ github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 -github "daltoniam/Starscream" == 3.0.6 -github "BoltsFramework/Bolts-ObjC" == 1.9.0 +github "daltoniam/Starscream" == 3.0.6 \ No newline at end of file diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..b10ccc42 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..ebdc260e --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk new file mode 160000 index 00000000..aa2b9ec2 --- /dev/null +++ b/Carthage/Checkouts/facebook-ios-sdk @@ -0,0 +1 @@ +Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From eee272bcb62d35f31a4ebea17d339528af1b3d0b Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:40:15 -0500 Subject: [PATCH 16/22] fixing dependencies --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Starscream | 2 +- ParseLiveQuery.podspec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index 237a557a..a6634a09 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 -github "daltoniam/Starscream" == 3.0.6 \ No newline at end of file +github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index f463eb9a..8d173606 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" -github "daltoniam/Starscream" "3.0.6" +github "daltoniam/Starscream" "3.0.5" github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index ebdc260e..114e5df9 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit ebdc260ea64e68f7569c62e8744b5cd15d3a49d6 +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index ee60965c..52869a1e 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -24,6 +24,6 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.17.1' s.dependency 'Bolts-Swift', '~> 1.4.0' - s.dependency 'Starscream', '~> 3.0.6' + s.dependency 'Starscream', '~> 3.0.5' s.dependency 'Bolts', '~> 1.9.0' end From 2780300edb3ae49cad5e16700fc6b0d092771f09 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:41:55 -0500 Subject: [PATCH 17/22] deleting modules --- .gitmodules | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b22b2d47..00000000 --- a/.gitmodules +++ /dev/null @@ -1,15 +0,0 @@ -[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/Bolts-Swift"] - path = Carthage/Checkouts/Bolts-Swift - url = https://github.com/BoltsFramework/Bolts-Swift.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-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git From e0afe1ade71825b290a9692643cf2dc4a9d1ddb3 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 04:42:21 -0500 Subject: [PATCH 18/22] fixing modules --- .gitmodules | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..f2fa6528 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,10 @@ +[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] + url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git +[submodule "Carthage/Checkouts/Bolts-Swift"] + url = https://github.com/BoltsFramework/Bolts-Swift.git +[submodule "Carthage/Checkouts/Starscream"] + url = https://github.com/daltoniam/Starscream.git +[submodule "Carthage/Checkouts/facebook-ios-sdk"] + url = https://github.com/facebook/facebook-ios-sdk.git +[submodule "Carthage/Checkouts/Bolts-ObjC"] + url = https://github.com/BoltsFramework/Bolts-ObjC.git From 5ae9f071a952acff48dadcb348c6e1ddef491462 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 05:02:49 -0500 Subject: [PATCH 19/22] updating submodule --- .gitmodules | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index f2fa6528..df49e544 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,12 @@ -[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] - url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.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/facebook-ios-sdk"] - url = https://github.com/facebook/facebook-ios-sdk.git -[submodule "Carthage/Checkouts/Bolts-ObjC"] - url = https://github.com/BoltsFramework/Bolts-ObjC.git From 053dd55f5694be45b38136b8ddd86e3259c6f9e6 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 05:07:45 -0500 Subject: [PATCH 20/22] updating --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index df49e544..67491bfe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,8 @@ [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 From d9f56eef55a7c4b705d29d52b2908088283e9a5b Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 05:08:19 -0500 Subject: [PATCH 21/22] removing stuff --- .gitmodules | 8 -------- Cartfile.resolved | 5 ----- Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - Carthage/Checkouts/facebook-ios-sdk | 1 - 7 files changed, 18 deletions(-) delete mode 100644 .gitmodules delete mode 100644 Cartfile.resolved delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream delete mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 67491bfe..00000000 --- a/.gitmodules +++ /dev/null @@ -1,8 +0,0 @@ -[submodule "Carthage/Checkouts/Bolts-ObjC"] - url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/Bolts-Swift"] - url = https://github.com/BoltsFramework/Bolts-Swift.git -[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] - url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git -[submodule "Carthage/Checkouts/Starscream"] - url = https://github.com/daltoniam/Starscream.git diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 8d173606..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,5 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -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-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index b10ccc42..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index 114e5df9..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index aa2b9ec2..00000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From 2dc167f15832b88e96311526bf511f11fa5c136e Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 2 Aug 2019 05:10:08 -0500 Subject: [PATCH 22/22] redoing stuff --- .gitmodules | 15 +++++++++++++++ Cartfile.resolved | 5 +++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + Carthage/Checkouts/facebook-ios-sdk | 1 + 7 files changed, 25 insertions(+) create mode 100644 .gitmodules create mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream create mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..273a4ff4 --- /dev/null +++ b/.gitmodules @@ -0,0 +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/Parse-SDK-iOS-OSX"] + path = Carthage/Checkouts/Parse-SDK-iOS-OSX + url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.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.resolved b/Cartfile.resolved new file mode 100644 index 00000000..8d173606 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,5 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +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-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..b10ccc42 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..114e5df9 --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk new file mode 160000 index 00000000..aa2b9ec2 --- /dev/null +++ b/Carthage/Checkouts/facebook-ios-sdk @@ -0,0 +1 @@ +Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336