Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Updates compatibility with latest Parse SDK #125

Merged
merged 3 commits into from
Jul 19, 2017
Merged

Updates compatibility with latest Parse SDK #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b423b3
Updates for compatibility with latest Parse SDK
flovilmart Jul 19, 2017
ff0ecd4
Bumps version
flovilmart Jul 19, 2017
2264174
Smaller logs for cocoapods
flovilmart Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ script:
xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c
xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c
elif [ "$TEST_TYPE" = CocoaPods ]; then
bundle exec pod repo update 2>&1 || exit 1
bundle exec pod repo update 2>&1 > /dev/null || exit 1
pod lib lint ParseLiveQuery.podspec
elif [ "$TEST_TYPE" = Carthage ]; then
carthage build --no-skip-current
Expand Down
7 changes: 3 additions & 4 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "ParsePlatform/Parse-SDK-iOS-OSX" == 1.15.0
github "daltoniam/Starscream" == 2.1.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "ParsePlatform/Parse-SDK-iOS-OSX" "1.15.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Parse-SDK-iOS-OSX
Open in desktop
Submodule Parse-SDK-iOS-OSX updated from 7a820b to ba0afd
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Starscream
Open in desktop
Submodule Starscream updated 14 files
+19 −0 CHANGELOG.md
+8 −1 Package.swift
+82 −8 README.md
+177 −0 Source/Compression.swift
+1 −1 Source/Info-tvOS.plist
+1 −1 Source/Info.plist
+193 −41 Source/WebSocket.swift
+6 −1 Starscream.podspec
+78 −0 Starscream.xcodeproj/project.pbxproj
+65 −0 Tests/CompressionTests.swift
+25 −25 examples/AutobahnTest/Autobahn/ViewController.swift
+ − ...eTest/SimpleTest.xcodeproj/project.xcworkspace/xcuserdata/dalton.xcuserdatad/UserInterfaceState.xcuserstate
+2 −0 zlib/include.h
+9 −0 zlib/module.modulemap
6 changes: 3 additions & 3 deletions ParseLiveQuery.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ParseLiveQuery'
s.version = '2.0.0'
s.version = '2.2.0'
s.license = { :type => 'BSD' }
s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.'
s.homepage = 'https://github.com/ParsePlatform/parse-server'
Expand All @@ -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 'Parse', '~> 1.15.0'
s.dependency 'Bolts-Swift', '~> 1.3'
s.dependency 'Starscream', '2.0.3'
s.dependency 'Starscream', '2.1.0'
end
890 changes: 890 additions & 0 deletions Sources/BoltsSwift.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Sources/BoltsSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 4 additions & 22 deletions Sources/ParseLiveQuery.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */; };
Expand Down Expand Up @@ -186,9 +180,6 @@

/* Begin PBXFileReference section */
0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = "<group>"; };
3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEncoder_internal.h; sourceTree = "<group>"; };
4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFDecoder_internal.h; sourceTree = "<group>"; };
4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ParseLiveQuery-Bridging-Header.h"; sourceTree = "<group>"; };
090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse.xcodeproj"; sourceTree = "<group>"; };
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; };
Expand Down Expand Up @@ -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 = "<group>";
Expand All @@ -385,19 +373,13 @@
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;
};
F5A9BFC31BE0248D00E78326 /* Headers */ = {
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;
};
Expand Down Expand Up @@ -696,7 +678,7 @@
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";
SWIFT_OBJC_BRIDGING_HEADER = "";
};
name = Debug;
};
Expand All @@ -723,7 +705,7 @@
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_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Sources/ParseLiveQuery/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>2.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
28 changes: 0 additions & 28 deletions Sources/ParseLiveQuery/Internal/PFDecoder_internal.h
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions Sources/ParseLiveQuery/Internal/PFEncoder_internal.h
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions Sources/ParseLiveQuery/Internal/ParseLiveQuery-Bridging-Header.h
View file
Open in desktop

This file was deleted.