diff --git a/.gitmodules b/.gitmodules index df49e544..c540bca8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ 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 + url = https://github.com/parse-community/Parse-SDK-iOS-OSX.git [submodule "Carthage/Checkouts/Starscream"] path = Carthage/Checkouts/Starscream url = https://github.com/daltoniam/Starscream.git diff --git a/Cartfile b/Cartfile index 880a569d..75094b7b 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,3 @@ -github "BoltsFramework/Bolts-Swift" == 1.3.0 -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2 -github "daltoniam/Starscream" == 2.0.3 - +github "BoltsFramework/Bolts-Swift" +github "parse-community/Parse-SDK-iOS-OSX" +github "daltoniam/Starscream" diff --git a/Cartfile.resolved b/Cartfile.resolved index 059b3b8f..af159b9f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "BoltsFramework/Bolts-ObjC" "1.8.4" github "BoltsFramework/Bolts-Swift" "1.3.0" -github "daltoniam/Starscream" "2.0.3" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2" +github "daltoniam/Starscream" "2.1.0" +github "parse-community/Parse-SDK-iOS-OSX" "1.15.0" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 7a820b75..ba0afd1a 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 7a820b75c6726808475af9ce705053ff0e8cbd11 +Subproject commit ba0afd1a1d8fa2062734c17f0d144819c76beb3e diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index 13859364..86310e7b 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit 13859364e33368687a5ee0c9cc0d5782e4212b66 +Subproject commit 86310e7bbcb595813cb8229a211ba4ee202f9c3c diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index e04e8970..1d3dd891 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.14.2' - s.dependency 'Bolts-Swift', '~> 1.3' - s.dependency 'Starscream', '2.0.3' + s.dependency 'Parse', + s.dependency 'Bolts-Swift', + s.dependency 'Starscream', end diff --git a/README.md b/README.md index 4737c976..cd4d2c4c 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,16 @@ You can install the LiveQuery client via including it in your Podfile: pod 'ParseLiveQuery' +### Carthage + +You can install the LiveQuery client via including it in your Cartfile: + + github "parse-community/ParseLiveQuery-iOS-OSX" "master" + +#### Important + +The latest version of Starscream contains a swiftmodule to export CZLib and CommonCrypto. If you are using another package that redefines this two modules you have to comment out the Starscream's export. + ## Use Client @@ -65,7 +75,7 @@ We want to make contributing to this project as easy and transparent as possible ----- -As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. +As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. [releases]: https://github.com/parse-community/ParseLiveQuery-iOS-OSX/releases [contributing]: https://github.com/parse-community/ParseLiveQuery-iOS-OSX/blob/master/CONTRIBUTING.md @@ -87,4 +97,3 @@ As of April 5, 2017, Parse, LLC has transferred this code to the parse-community [carthage-svg]:https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat [carthage-link]:https://github.com/Carthage/Carthage - diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index eb91fcf9..b7d4288c 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -9,14 +9,6 @@ /* Begin PBXBuildFile section */ 0632EDD41CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; 0632EDD51CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; - 3B68E5B71DECC32300038DDD /* PFEncoder_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 3B68E5B81DECC32300038DDD /* PFEncoder_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; - 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; - 4AEAE5761DAFC808005F9FFB /* PFDecoder_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4AEAE5771DAFC808005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4AEAE5781DAFC809005F9FFB /* PFDecoder_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 4AEAE5791DAFC809005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */; settings = {ATTRIBUTES = (Private, ); }; }; 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8EF1E25ADF300F408BC /* libicucore.tbd */; }; 094AE8F21E25AE0500F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F11E25AE0500F408BC /* CFNetwork.framework */; }; 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F31E25AE1100F408BC /* Security.framework */; }; @@ -37,6 +29,8 @@ 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 */; }; + 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 */; }; F534A5B41BDB09CE00CBD11A /* Operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B31BDB09CE00CBD11A /* Operation.swift */; }; F54D58B81C8E3446009F8D6C /* ClientPrivate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B71C8E3446009F8D6C /* ClientPrivate.swift */; }; @@ -186,9 +180,6 @@ /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; - 3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEncoder_internal.h; sourceTree = ""; }; - 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFDecoder_internal.h; sourceTree = ""; }; - 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ParseLiveQuery-Bridging-Header.h"; sourceTree = ""; }; 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/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; }; @@ -371,9 +362,6 @@ F534A5B31BDB09CE00CBD11A /* Operation.swift */, F54D58B71C8E3446009F8D6C /* ClientPrivate.swift */, F54D58B91C8E345F009F8D6C /* BoltsHelpers.swift */, - 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */, - 3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */, - 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */, ); path = Internal; sourceTree = ""; @@ -385,9 +373,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4AEAE5791DAFC809005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */, - 4AEAE5781DAFC809005F9FFB /* PFDecoder_internal.h in Headers */, - 3B68E5B81DECC32300038DDD /* PFEncoder_internal.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -395,9 +380,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4AEAE5771DAFC808005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */, - 4AEAE5761DAFC808005F9FFB /* PFDecoder_internal.h in Headers */, - 3B68E5B71DECC32300038DDD /* PFEncoder_internal.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -696,7 +678,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; - SWIFT_OBJC_BRIDGING_HEADER = "${SWIFT_MODULE_NAME}/Internal/${SWIFT_MODULE_NAME}-Bridging-Header.h"; }; name = Debug; }; @@ -723,7 +704,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; - SWIFT_OBJC_BRIDGING_HEADER = "${SWIFT_MODULE_NAME}/Internal/${SWIFT_MODULE_NAME}-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; @@ -744,6 +724,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -769,6 +750,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -793,6 +775,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -820,6 +803,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; diff --git a/Sources/ParseLiveQuery/Internal/PFDecoder_internal.h b/Sources/ParseLiveQuery/Internal/PFDecoder_internal.h deleted file mode 100644 index d77e0756..00000000 --- a/Sources/ParseLiveQuery/Internal/PFDecoder_internal.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PFDecoder_internal.h -// ParseLiveQuery -// -// Created by Florent Vilmart on 16-10-13. -// Copyright © 2016 Parse. All rights reserved. -// - -#ifndef PFDecoder_internal_h -#define PFDecoder_internal_h - -#import - -@interface PFDecoder: NSObject -/** - Globally available shared instance of PFDecoder. - */ -+ (nonnull PFDecoder *)objectDecoder; - -/** - Takes a complex object that was deserialized and converts encoded - dictionaries into the proper Parse types. This is the inverse of - encodeObject:allowUnsaved:allowObjects:seenObjects:. - */ -- (nullable id)decodeObject:(nullable id)object; -@end - -#endif /* PFDecoder_internal_h */ diff --git a/Sources/ParseLiveQuery/Internal/PFEncoder_internal.h b/Sources/ParseLiveQuery/Internal/PFEncoder_internal.h deleted file mode 100644 index d53730be..00000000 --- a/Sources/ParseLiveQuery/Internal/PFEncoder_internal.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// PFEncoder_internal.h -// ParseLiveQuery -// -// Created by Joe Szymanski on 11/28/16. -// Copyright © 2016 Parse. All rights reserved. -// - -#ifndef PFEncoder_internal_h -#define PFEncoder_internal_h - -#import -#import - -@interface PFEncoder : NSObject - -+ (nonnull instancetype)objectEncoder; - -- (nullable id)encodeObject:(nullable id)object; -- (nullable id)encodeParseObject:(nullable PFObject *)object; - -@end - -/** - Encoding strategy that rejects PFObject. - */ -@interface PFNoObjectEncoder : PFEncoder - -@end - -/** - Encoding strategy that encodes PFObject to PFPointer with objectId or with localId. - */ -@interface PFPointerOrLocalIdObjectEncoder : PFEncoder - -@end - -/** - Encoding strategy that encodes PFObject to PFPointer with objectId and rejects - unsaved PFObject. - */ -@interface PFPointerObjectEncoder : PFPointerOrLocalIdObjectEncoder - -@end - -#endif /* PFEncoder_internal_h */ diff --git a/Sources/ParseLiveQuery/Internal/ParseLiveQuery-Bridging-Header.h b/Sources/ParseLiveQuery/Internal/ParseLiveQuery-Bridging-Header.h deleted file mode 100644 index c28d23f0..00000000 --- a/Sources/ParseLiveQuery/Internal/ParseLiveQuery-Bridging-Header.h +++ /dev/null @@ -1,10 +0,0 @@ -// -// ParseLiveQuery-Bridging-Header.h -// ParseLiveQuery -// -// Created by Florent Vilmart on 16-10-13. -// Copyright © 2016 Parse. All rights reserved. -// - -#import "PFDecoder_internal.h" -#import "PFEncoder_internal.h"