Skip to content

Commit

Permalink
fix: Compilation errors in ParseLiveQuery using Starscream 4.0.6 (#…
Browse files Browse the repository at this point in the history 
…1749)
  • Loading branch information
@dplewis
dplewis authored Oct 6, 2023
1 parent 79a92ac commit 3da5bde
Show file tree
Hide file tree
Showing 14 changed files with 186 additions and 913 deletions.
3 changes: 0 additions & 3 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
github "BoltsFramework/Bolts-Swift" >= 1.5.0
github "facebook/facebook-ios-sdk" == 15.1.0
github "daltoniam/Starscream" >= 4.0.4

2 changes: 0 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
github "BoltsFramework/Bolts-ObjC" "1.9.1"
github "BoltsFramework/Bolts-Swift" "1.5.0"
github "daltoniam/Starscream" "4.0.4"
github "facebook/facebook-ios-sdk" "v15.1.0"
4 changes: 2 additions & 2 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
"state": {
"branch": null,
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version": "4.0.4"
"revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
"version": "4.0.6"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"),
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0")
],
targets: [
Expand Down
161 changes: 0 additions & 161 deletions Parse/Parse.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2962,69 +2962,6 @@
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
remoteInfo = "Parse-iOS";
};
9575FF1E299136C60057B4CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 33CCF0921F5DDC030099B092;
remoteInfo = Starscream;
};
9575FF20299136C60057B4CE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
remoteInfo = "Starscream Tests";
};
95AEEB192991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 87FEF3661A9085FA00C60678;
remoteInfo = "BoltsSwift-iOS";
};
95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 87FEF3711A9085FA00C60678;
remoteInfo = "BoltsSwiftTests-iOS";
};
95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 81CC14EC1A9BE0A100B28F86;
remoteInfo = "BoltsSwift-macOS";
};
95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 81CC14F61A9BE0A100B28F86;
remoteInfo = "BoltsSwiftTests-macOS";
};
95AEEB212991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 065894FF1C9A93B7000FDDA6;
remoteInfo = "BoltsSwift-tvOS";
};
95AEEB232991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0658951B1C9A947B000FDDA6;
remoteInfo = "BoltsSwiftTests-tvOS";
};
95AEEB252991373F00165C0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 065894E71C9A933B000FDDA6;
remoteInfo = "BoltsSwift-watchOS";
};
BC105FC424C5D0C900295EF7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */;
Expand Down Expand Up @@ -3638,8 +3575,6 @@
91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = "<group>"; };
91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = "<group>"; };
91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = "<group>"; };
9575FF10299136C60057B4CE /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = "<group>"; };
95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = "<group>"; };
97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
97AA93B816780B7600445C2D /* Parse-OSX.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Parse-OSX.Info.plist"; sourceTree = "<group>"; };
97E18AE41623835600B17A67 /* PFLocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFLocationManager.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3937,8 +3872,6 @@
7CE6ABDD292074C70054D9D2 /* AudioToolbox.framework */,
7CE6ABD2292074C10054D9D2 /* libsqlite3.tbd */,
BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */,
9575FF10299136C60057B4CE /* Starscream.xcodeproj */,
95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */,
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */,
);
name = Frameworks;
Expand Down Expand Up @@ -5215,29 +5148,6 @@
path = CurrentUserController;
sourceTree = "<group>";
};
9575FF11299136C60057B4CE /* Products */ = {
isa = PBXGroup;
children = (
9575FF1F299136C60057B4CE /* Starscream.framework */,
9575FF21299136C60057B4CE /* Starscream Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
95AEEB102991373F00165C0D /* Products */ = {
isa = PBXGroup;
children = (
95AEEB1A2991373F00165C0D /* BoltsSwift.framework */,
95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */,
95AEEB1E2991373F00165C0D /* BoltsSwift.framework */,
95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */,
95AEEB222991373F00165C0D /* BoltsSwift.framework */,
95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */,
95AEEB262991373F00165C0D /* BoltsSwift.framework */,
);
name = Products;
sourceTree = "<group>";
};
BC105FBB24C5D0C900295EF7 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -7166,18 +7076,10 @@
ProductGroup = 4A13517620281768000F5FD5 /* Products */;
ProjectRef = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */;
},
{
ProductGroup = 95AEEB102991373F00165C0D /* Products */;
ProjectRef = 95AEEB0F2991373F00165C0D /* BoltsSwift.xcodeproj */;
},
{
ProductGroup = BC105FBB24C5D0C900295EF7 /* Products */;
ProjectRef = BC105FBA24C5D0C900295EF7 /* OCMock.xcodeproj */;
},
{
ProductGroup = 9575FF11299136C60057B4CE /* Products */;
ProjectRef = 9575FF10299136C60057B4CE /* Starscream.xcodeproj */;
},
);
projectRoot = "";
targets = (
Expand Down Expand Up @@ -7273,69 +7175,6 @@
remoteRef = 4A13519720281768000F5FD5 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9575FF1F299136C60057B4CE /* Starscream.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Starscream.framework;
remoteRef = 9575FF1E299136C60057B4CE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9575FF21299136C60057B4CE /* Starscream Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Starscream Tests.xctest";
remoteRef = 9575FF20299136C60057B4CE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB1A2991373F00165C0D /* BoltsSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = BoltsSwift.framework;
remoteRef = 95AEEB192991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB1C2991373F00165C0D /* BoltsSwiftTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = BoltsSwiftTests.xctest;
remoteRef = 95AEEB1B2991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB1E2991373F00165C0D /* BoltsSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = BoltsSwift.framework;
remoteRef = 95AEEB1D2991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB202991373F00165C0D /* BoltsSwiftTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = BoltsSwiftTests.xctest;
remoteRef = 95AEEB1F2991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB222991373F00165C0D /* BoltsSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = BoltsSwift.framework;
remoteRef = 95AEEB212991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB242991373F00165C0D /* BoltsSwiftTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = BoltsSwiftTests.xctest;
remoteRef = 95AEEB232991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
95AEEB262991373F00165C0D /* BoltsSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = BoltsSwift.framework;
remoteRef = 95AEEB252991373F00165C0D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC105FC524C5D0C900295EF7 /* OCMock.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down
2 changes: 1 addition & 1 deletion ParseFacebookUtilsiOS/ParseFacebookUtilsiOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down
1 change: 1 addition & 0 deletions ParseLiveQuery/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package.resolved
Loading

0 comments on commit 3da5bde

Please sign in to comment.