Skip to content

Commit 3da5bde

Browse files
dplewisdplewis
authored
fix: Compilation errors in ParseLiveQuery using Starscream 4.0.6 (#1749)
1 parent 79a92ac commit 3da5bde

File tree

14 files changed

+186
-913
lines changed

14 files changed

+186
-913
lines changed

‎Cartfile

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
2-
github "BoltsFramework/Bolts-Swift" >= 1.5.0
32
github "facebook/facebook-ios-sdk" == 15.1.0
4-
github "daltoniam/Starscream" >= 4.0.4
5-

‎Cartfile.resolved

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.1"
2-
github "BoltsFramework/Bolts-Swift" "1.5.0"
3-
github "daltoniam/Starscream" "4.0.4"
42
github "facebook/facebook-ios-sdk" "v15.1.0"

‎Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
37-
"version": "4.0.4"
36+
"revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
37+
"version": "4.0.6"
3838
}
3939
}
4040
]

‎Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let package = Package(
2020
dependencies: [
2121
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
2222
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
23-
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"),
23+
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
2424
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0")
2525
],
2626
targets: [

‎Parse/Parse.xcodeproj/project.pbxproj

-161
Original file line numberDiff line numberDiff line change
@@ -2962,69 +2962,6 @@
29622962
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
29632963
remoteInfo = "Parse-iOS";
29642964
};
2965-
9575FF1E299136C60057B4CE /* PBXContainerItemProxy */ = {
2966-
isa = PBXContainerItemProxy;
2967-
containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
2968-
proxyType = 2;
2969-
remoteGlobalIDString = 33CCF0921F5DDC030099B092;
2970-
remoteInfo = Starscream;
2971-
};
2972-
9575FF20299136C60057B4CE /* PBXContainerItemProxy */ = {
2973-
isa = PBXContainerItemProxy;
2974-
containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
2975-
proxyType = 2;
2976-
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
2977-
remoteInfo = "Starscream Tests";
2978-
};
2979-
95AEEB192991373F00165C0D /* PBXContainerItemProxy */ = {
2980-
isa = PBXContainerItemProxy;
2981-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
2982-
proxyType = 2;
2983-
remoteGlobalIDString = 87FEF3661A9085FA00C60678;
2984-
remoteInfo = "BoltsSwift-iOS";
2985-
};
2986-
95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */ = {
2987-
isa = PBXContainerItemProxy;
2988-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
2989-
proxyType = 2;
2990-
remoteGlobalIDString = 87FEF3711A9085FA00C60678;
2991-
remoteInfo = "BoltsSwiftTests-iOS";
2992-
};
2993-
95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */ = {
2994-
isa = PBXContainerItemProxy;
2995-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
2996-
proxyType = 2;
2997-
remoteGlobalIDString = 81CC14EC1A9BE0A100B28F86;
2998-
remoteInfo = "BoltsSwift-macOS";
2999-
};
3000-
95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */ = {
3001-
isa = PBXContainerItemProxy;
3002-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
3003-
proxyType = 2;
3004-
remoteGlobalIDString = 81CC14F61A9BE0A100B28F86;
3005-
remoteInfo = "BoltsSwiftTests-macOS";
3006-
};
3007-
95AEEB212991373F00165C0D /* PBXContainerItemProxy */ = {
3008-
isa = PBXContainerItemProxy;
3009-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
3010-
proxyType = 2;
3011-
remoteGlobalIDString = 065894FF1C9A93B7000FDDA6;
3012-
remoteInfo = "BoltsSwift-tvOS";
3013-
};
3014-
95AEEB232991373F00165C0D /* PBXContainerItemProxy */ = {
3015-
isa = PBXContainerItemProxy;
3016-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
3017-
proxyType = 2;
3018-
remoteGlobalIDString = 0658951B1C9A947B000FDDA6;
3019-
remoteInfo = "BoltsSwiftTests-tvOS";
3020-
};
3021-
95AEEB252991373F00165C0D /* PBXContainerItemProxy */ = {
3022-
isa = PBXContainerItemProxy;
3023-
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
3024-
proxyType = 2;
3025-
remoteGlobalIDString = 065894E71C9A933B000FDDA6;
3026-
remoteInfo = "BoltsSwift-watchOS";
3027-
};
30282965
BC105FC424C5D0C900295EF7 /* PBXContainerItemProxy */ = {
30292966
isa = PBXContainerItemProxy;
30302967
containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */;
@@ -3638,8 +3575,6 @@
36383575
91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = "<group>"; };
36393576
91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = "<group>"; };
36403577
91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = "<group>"; };
3641-
9575FF10299136C60057B4CE /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = "<group>"; };
3642-
95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = "<group>"; };
36433578
97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
36443579
97AA93B816780B7600445C2D /* Parse-OSX.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Parse-OSX.Info.plist"; sourceTree = "<group>"; };
36453580
97E18AE41623835600B17A67 /* PFLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFLocationManager.h; sourceTree = "<group>"; };
@@ -3937,8 +3872,6 @@
39373872
7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */,
39383873
7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */,
39393874
BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */,
3940-
9575FF10299136C60057B4CE /* Starscream.xcodeproj */,
3941-
95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */,
39423875
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */,
39433876
);
39443877
name = Frameworks;
@@ -5215,29 +5148,6 @@
52155148
path = CurrentUserController;
52165149
sourceTree = "<group>";
52175150
};
5218-
9575FF11299136C60057B4CE /* Products */ = {
5219-
isa = PBXGroup;
5220-
children = (
5221-
9575FF1F299136C60057B4CE /* Starscream.framework */,
5222-
9575FF21299136C60057B4CE /* Starscream Tests.xctest */,
5223-
);
5224-
name = Products;
5225-
sourceTree = "<group>";
5226-
};
5227-
95AEEB102991373F00165C0D /* Products */ = {
5228-
isa = PBXGroup;
5229-
children = (
5230-
95AEEB1A2991373F00165C0D /* BoltsSwift.framework */,
5231-
95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */,
5232-
95AEEB1E2991373F00165C0D /* BoltsSwift.framework */,
5233-
95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */,
5234-
95AEEB222991373F00165C0D /* BoltsSwift.framework */,
5235-
95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */,
5236-
95AEEB262991373F00165C0D /* BoltsSwift.framework */,
5237-
);
5238-
name = Products;
5239-
sourceTree = "<group>";
5240-
};
52415151
BC105FBB24C5D0C900295EF7 /* Products */ = {
52425152
isa = PBXGroup;
52435153
children = (
@@ -7166,18 +7076,10 @@
71667076
ProductGroup = 4A13517620281768000F5FD5 /* Products */;
71677077
ProjectRef = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */;
71687078
},
7169-
{
7170-
ProductGroup = 95AEEB102991373F00165C0D /* Products */;
7171-
ProjectRef = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
7172-
},
71737079
{
71747080
ProductGroup = BC105FBB24C5D0C900295EF7 /* Products */;
71757081
ProjectRef = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */;
71767082
},
7177-
{
7178-
ProductGroup = 9575FF11299136C60057B4CE /* Products */;
7179-
ProjectRef = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
7180-
},
71817083
);
71827084
projectRoot = "";
71837085
targets = (
@@ -7273,69 +7175,6 @@
72737175
remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */;
72747176
sourceTree = BUILT_PRODUCTS_DIR;
72757177
};
7276-
9575FF1F299136C60057B4CE /* Starscream.framework */ = {
7277-
isa = PBXReferenceProxy;
7278-
fileType = wrapper.framework;
7279-
path = Starscream.framework;
7280-
remoteRef = 9575FF1E299136C60057B4CE /* PBXContainerItemProxy */;
7281-
sourceTree = BUILT_PRODUCTS_DIR;
7282-
};
7283-
9575FF21299136C60057B4CE /* Starscream Tests.xctest */ = {
7284-
isa = PBXReferenceProxy;
7285-
fileType = wrapper.cfbundle;
7286-
path = "Starscream Tests.xctest";
7287-
remoteRef = 9575FF20299136C60057B4CE /* PBXContainerItemProxy */;
7288-
sourceTree = BUILT_PRODUCTS_DIR;
7289-
};
7290-
95AEEB1A2991373F00165C0D /* BoltsSwift.framework */ = {
7291-
isa = PBXReferenceProxy;
7292-
fileType = wrapper.framework;
7293-
path = BoltsSwift.framework;
7294-
remoteRef = 95AEEB192991373F00165C0D /* PBXContainerItemProxy */;
7295-
sourceTree = BUILT_PRODUCTS_DIR;
7296-
};
7297-
95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */ = {
7298-
isa = PBXReferenceProxy;
7299-
fileType = wrapper.cfbundle;
7300-
path = BoltsSwiftTests.xctest;
7301-
remoteRef = 95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */;
7302-
sourceTree = BUILT_PRODUCTS_DIR;
7303-
};
7304-
95AEEB1E2991373F00165C0D /* BoltsSwift.framework */ = {
7305-
isa = PBXReferenceProxy;
7306-
fileType = wrapper.framework;
7307-
path = BoltsSwift.framework;
7308-
remoteRef = 95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */;
7309-
sourceTree = BUILT_PRODUCTS_DIR;
7310-
};
7311-
95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */ = {
7312-
isa = PBXReferenceProxy;
7313-
fileType = wrapper.cfbundle;
7314-
path = BoltsSwiftTests.xctest;
7315-
remoteRef = 95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */;
7316-
sourceTree = BUILT_PRODUCTS_DIR;
7317-
};
7318-
95AEEB222991373F00165C0D /* BoltsSwift.framework */ = {
7319-
isa = PBXReferenceProxy;
7320-
fileType = wrapper.framework;
7321-
path = BoltsSwift.framework;
7322-
remoteRef = 95AEEB212991373F00165C0D /* PBXContainerItemProxy */;
7323-
sourceTree = BUILT_PRODUCTS_DIR;
7324-
};
7325-
95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */ = {
7326-
isa = PBXReferenceProxy;
7327-
fileType = wrapper.cfbundle;
7328-
path = BoltsSwiftTests.xctest;
7329-
remoteRef = 95AEEB232991373F00165C0D /* PBXContainerItemProxy */;
7330-
sourceTree = BUILT_PRODUCTS_DIR;
7331-
};
7332-
95AEEB262991373F00165C0D /* BoltsSwift.framework */ = {
7333-
isa = PBXReferenceProxy;
7334-
fileType = wrapper.framework;
7335-
path = BoltsSwift.framework;
7336-
remoteRef = 95AEEB252991373F00165C0D /* PBXContainerItemProxy */;
7337-
sourceTree = BUILT_PRODUCTS_DIR;
7338-
};
73397178
BC105FC524C5D0C900295EF7 /* OCMock.framework */ = {
73407179
isa = PBXReferenceProxy;
73417180
fileType = wrapper.framework;

‎ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */

‎ParseLiveQuery/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Package.resolved

0 commit comments

Comments
 (0)