From 0e9d2c2f0153367af907b55a30b345577a1c0d64 Mon Sep 17 00:00:00 2001 From: Rico Becker Date: Fri, 9 Aug 2019 15:32:44 +0200 Subject: [PATCH 1/5] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f38ed56..2acab65 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.1 import PackageDescription let package = Package( From 7c95fe32029a4b339389b96deca5cca0bda22011 Mon Sep 17 00:00:00 2001 From: Rico Becker Date: Mon, 12 Aug 2019 20:33:09 +0200 Subject: [PATCH 2/5] Adds macOS compatibility --- .../contents.xcworkspacedata | 7 ++++++ Package.resolved | 16 ++++++++++++ Package.swift | 2 +- iOS/Source/Bagel.h | 20 +++++---------- iOS/Source/BagelUtility.h | 1 - iOS/Source/BagelUtility.m | 25 +++++++++++-------- 6 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Package.resolved diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..956c338 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "CocoaAsyncSocket", + "repositoryURL": "https://github.com/ricobeck/CocoaAsyncSocket.git", + "state": { + "branch": null, + "revision": "9b2cfedabfa421523e5edd9f2409999ba567a427", + "version": null + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index 2acab65..49b4c0e 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( .library(name: "Bagel", targets: ["Bagel"]) ], dependencies: [ - .package(url: "https://github.com/AccioSupport/CocoaAsyncSocket.git", .branch("master")), + .package(url: "https://github.com/ricobeck/CocoaAsyncSocket.git", .revision("9b2cfedabfa421523e5edd9f2409999ba567a427")), ], targets: [ .target( diff --git a/iOS/Source/Bagel.h b/iOS/Source/Bagel.h index 21d2263..61ba2fd 100644 --- a/iOS/Source/Bagel.h +++ b/iOS/Source/Bagel.h @@ -19,22 +19,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import - -//! Project version number for Bagel. -FOUNDATION_EXPORT double BagelVersionNumber; - -//! Project version string for Bagel. -FOUNDATION_EXPORT const unsigned char BagelVersionString[]; - #import -#import -#import -#import -#import -#import -#import +#import "BagelBaseModel.h" +#import "BagelCarrierDelegate.h" +#import "BagelConfiguration.h" +#import "BagelDeviceModel.h" +#import "BagelProjectModel.h" +#import "BagelUtility.h" @interface Bagel : NSObject diff --git a/iOS/Source/BagelUtility.h b/iOS/Source/BagelUtility.h index 74950c8..7f04a40 100644 --- a/iOS/Source/BagelUtility.h +++ b/iOS/Source/BagelUtility.h @@ -20,7 +20,6 @@ // THE SOFTWARE. #import -#import @interface BagelUtility : NSObject diff --git a/iOS/Source/BagelUtility.m b/iOS/Source/BagelUtility.m index 83a18f1..65d50a3 100644 --- a/iOS/Source/BagelUtility.m +++ b/iOS/Source/BagelUtility.m @@ -21,6 +21,10 @@ #import "BagelUtility.h" +#if TARGET_OS_IPHONE +@import UIKit; +#endif + @implementation BagelUtility + (NSString*)UUID @@ -40,20 +44,21 @@ + (NSString*)deviceId + (NSString*)deviceName { - return [UIDevice currentDevice].name; + #if TARGET_OS_IPHONE + return [[UIDevice currentDevice] name]; + #elif TARGET_OS_MAC + return [[NSHost currentHost] localizedName]; + #endif } + (NSString*)deviceDescription { - NSString* information = @""; - - information = [UIDevice currentDevice].model; - information = [NSString stringWithFormat:@"%@ %@", information, [UIDevice currentDevice].systemName]; - information = [NSString stringWithFormat:@"%@ %@", information, [UIDevice currentDevice].systemVersion]; - - return information; + #if TARGET_OS_IPHONE + return [NSString stringWithFormat: @"%@ %@ %@", [UIDevice currentDevice].systemName, [UIDevice currentDevice].systemName, [UIDevice currentDevice].systemVersion]; + #elif TARGET_OS_MAC + NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; + return [NSString stringWithFormat: @"%@ %ld.%ld.%ld", [[NSHost currentHost] localizedName], version.majorVersion, version.minorVersion, version.patchVersion]; + #endif } @end - - From 47106142ba71913831ec8d634c800f291db642e6 Mon Sep 17 00:00:00 2001 From: Rico Becker Date: Mon, 12 Aug 2019 20:41:25 +0200 Subject: [PATCH 3/5] Makes header public --- iOS/Source/{ => include}/Bagel.h | 0 iOS/Source/{ => include}/BagelBaseModel.h | 0 iOS/Source/{ => include}/BagelCarrierDelegate.h | 0 iOS/Source/{ => include}/BagelConfiguration.h | 0 iOS/Source/{ => include}/BagelDeviceModel.h | 0 iOS/Source/{ => include}/BagelProjectModel.h | 0 iOS/Source/{ => include}/BagelRequestInfo.h | 0 iOS/Source/{ => include}/BagelRequestPacket.h | 0 iOS/Source/{ => include}/BagelUtility.h | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename iOS/Source/{ => include}/Bagel.h (100%) rename iOS/Source/{ => include}/BagelBaseModel.h (100%) rename iOS/Source/{ => include}/BagelCarrierDelegate.h (100%) rename iOS/Source/{ => include}/BagelConfiguration.h (100%) rename iOS/Source/{ => include}/BagelDeviceModel.h (100%) rename iOS/Source/{ => include}/BagelProjectModel.h (100%) rename iOS/Source/{ => include}/BagelRequestInfo.h (100%) rename iOS/Source/{ => include}/BagelRequestPacket.h (100%) rename iOS/Source/{ => include}/BagelUtility.h (100%) diff --git a/iOS/Source/Bagel.h b/iOS/Source/include/Bagel.h similarity index 100% rename from iOS/Source/Bagel.h rename to iOS/Source/include/Bagel.h diff --git a/iOS/Source/BagelBaseModel.h b/iOS/Source/include/BagelBaseModel.h similarity index 100% rename from iOS/Source/BagelBaseModel.h rename to iOS/Source/include/BagelBaseModel.h diff --git a/iOS/Source/BagelCarrierDelegate.h b/iOS/Source/include/BagelCarrierDelegate.h similarity index 100% rename from iOS/Source/BagelCarrierDelegate.h rename to iOS/Source/include/BagelCarrierDelegate.h diff --git a/iOS/Source/BagelConfiguration.h b/iOS/Source/include/BagelConfiguration.h similarity index 100% rename from iOS/Source/BagelConfiguration.h rename to iOS/Source/include/BagelConfiguration.h diff --git a/iOS/Source/BagelDeviceModel.h b/iOS/Source/include/BagelDeviceModel.h similarity index 100% rename from iOS/Source/BagelDeviceModel.h rename to iOS/Source/include/BagelDeviceModel.h diff --git a/iOS/Source/BagelProjectModel.h b/iOS/Source/include/BagelProjectModel.h similarity index 100% rename from iOS/Source/BagelProjectModel.h rename to iOS/Source/include/BagelProjectModel.h diff --git a/iOS/Source/BagelRequestInfo.h b/iOS/Source/include/BagelRequestInfo.h similarity index 100% rename from iOS/Source/BagelRequestInfo.h rename to iOS/Source/include/BagelRequestInfo.h diff --git a/iOS/Source/BagelRequestPacket.h b/iOS/Source/include/BagelRequestPacket.h similarity index 100% rename from iOS/Source/BagelRequestPacket.h rename to iOS/Source/include/BagelRequestPacket.h diff --git a/iOS/Source/BagelUtility.h b/iOS/Source/include/BagelUtility.h similarity index 100% rename from iOS/Source/BagelUtility.h rename to iOS/Source/include/BagelUtility.h From 01ae0d573e63d5f4e368df5625ebb9741906dcc6 Mon Sep 17 00:00:00 2001 From: Rico Becker Date: Mon, 12 Aug 2019 21:57:02 +0200 Subject: [PATCH 4/5] Update didReceiveResponse method for macOS 10.15 --- iOS/Source/BagelURLSessionInjector.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/Source/BagelURLSessionInjector.m b/iOS/Source/BagelURLSessionInjector.m index 6fa07f6..9f09110 100644 --- a/iOS/Source/BagelURLSessionInjector.m +++ b/iOS/Source/BagelURLSessionInjector.m @@ -109,7 +109,7 @@ - (void)swizzleSessionTaskResume:(Class) class - (void)swizzleSessionDidReceiveResponse : (Class) class { - SEL selector = NSSelectorFromString(@"_didReceiveResponse:sniff:"); + SEL selector = NSSelectorFromString(@"_didReceiveResponse:sniff:rewrite:"); Method m = class_getInstanceMethod(class, selector); if (m && [class instancesRespondToSelector:selector]) { From 807c6fa45d3815bcf6710a24e8bc059916c23289 Mon Sep 17 00:00:00 2001 From: Yahia El-Dow Date: Sat, 2 Jul 2022 13:18:52 +0200 Subject: [PATCH 5/5] [fix] fix SPM import File --- iOS/.DS_Store | Bin 0 -> 6148 bytes iOS/Bagel.xcodeproj/project.pbxproj | 111 +++++++++++------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/swiftpm/Package.resolved | 14 +++ mac/.DS_Store | Bin 0 -> 6148 bytes mac/Bagel.xcodeproj/project.pbxproj | 4 - mac/Podfile.lock | 4 +- 7 files changed, 84 insertions(+), 51 deletions(-) create mode 100644 iOS/.DS_Store create mode 100644 iOS/Bagel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 mac/.DS_Store diff --git a/iOS/.DS_Store b/iOS/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5935f6b79a9e9e2daca61cdf7889b752fe50e793 GIT binary patch literal 6148 zcmeHKF;2uV5S)c8B2jQ9rC)%!jxt2y1@{5C%jpoxDG>sR(qG{Rlstfr&rt9HX1xYo zL=cDqA+#%bXKn8~>ycu60Z4Vz%z!C?f=yA>7!e&Fo!ZIH6QZOwS{&jQOLS;P7W#`r zn)^N~oMVj@w)0=1#}#*S*{)~vWw+@q{fGOnBQ{-KFWPQF&*JXs<@)IO@#H&E%@3mb zi|y>5ElJnTfHU9>I0MeW=M3=9Rw?!jT{{ELfHUyUfSwP5O|i@v4b#y=YiLdG&UmvpQ~7TFusywN1KSy!iuy%0D6|KU0Cw~o fIY^T>AJnE_nK2sbDmtFRiT)5sgt&4Beu05klpH%* literal 0 HcmV?d00001 diff --git a/iOS/Bagel.xcodeproj/project.pbxproj b/iOS/Bagel.xcodeproj/project.pbxproj index 07d2503..994054e 100644 --- a/iOS/Bagel.xcodeproj/project.pbxproj +++ b/iOS/Bagel.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -11,30 +11,30 @@ 3760A45C21F1383F004D1E07 /* BagelRequestCarrier.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44221F1383F004D1E07 /* BagelRequestCarrier.m */; }; 3760A45D21F1383F004D1E07 /* BagelController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44321F1383F004D1E07 /* BagelController.h */; }; 3760A45E21F1383F004D1E07 /* BagelUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44421F1383F004D1E07 /* BagelUtility.m */; }; - 3760A45F21F1383F004D1E07 /* BagelProjectModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44521F1383F004D1E07 /* BagelProjectModel.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3760A46021F1383F004D1E07 /* BagelConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44621F1383F004D1E07 /* BagelConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3760A46121F1383F004D1E07 /* Bagel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44721F1383F004D1E07 /* Bagel.m */; }; 3760A46221F1383F004D1E07 /* BagelRequestInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44821F1383F004D1E07 /* BagelRequestInfo.m */; }; 3760A46321F1383F004D1E07 /* BagelURLSessionInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44921F1383F004D1E07 /* BagelURLSessionInjector.m */; }; 3760A46421F1383F004D1E07 /* BagelBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44A21F1383F004D1E07 /* BagelBaseModel.m */; }; 3760A46521F1383F004D1E07 /* BagelURLConnectionInjector.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44B21F1383F004D1E07 /* BagelURLConnectionInjector.h */; }; 3760A46621F1383F004D1E07 /* BagelBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44C21F1383F004D1E07 /* BagelBrowser.m */; }; - 3760A46721F1383F004D1E07 /* BagelRequestPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44D21F1383F004D1E07 /* BagelRequestPacket.h */; }; 3760A46821F1383F004D1E07 /* BagelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A44E21F1383F004D1E07 /* BagelController.m */; }; 3760A46921F1383F004D1E07 /* BagelRequestCarrier.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A44F21F1383F004D1E07 /* BagelRequestCarrier.h */; }; - 3760A46A21F1383F004D1E07 /* BagelDeviceModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45021F1383F004D1E07 /* BagelDeviceModel.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3760A46B21F1383F004D1E07 /* BagelProjectModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A45121F1383F004D1E07 /* BagelProjectModel.m */; }; - 3760A46C21F1383F004D1E07 /* BagelUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45221F1383F004D1E07 /* BagelUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3760A46D21F1383F004D1E07 /* BagelURLSessionInjector.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45321F1383F004D1E07 /* BagelURLSessionInjector.h */; }; - 3760A46E21F1383F004D1E07 /* BagelRequestInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45421F1383F004D1E07 /* BagelRequestInfo.h */; }; - 3760A46F21F1383F004D1E07 /* Bagel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45521F1383F004D1E07 /* Bagel.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3760A47021F1383F004D1E07 /* BagelConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A45621F1383F004D1E07 /* BagelConfiguration.m */; }; 3760A47121F1383F004D1E07 /* BagelRequestPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A45721F1383F004D1E07 /* BagelRequestPacket.m */; }; 3760A47221F1383F004D1E07 /* BagelBrowser.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45821F1383F004D1E07 /* BagelBrowser.h */; }; 3760A47321F1383F004D1E07 /* BagelURLConnectionInjector.m in Sources */ = {isa = PBXBuildFile; fileRef = 3760A45921F1383F004D1E07 /* BagelURLConnectionInjector.m */; }; - 3760A47421F1383F004D1E07 /* BagelBaseModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 3760A45A21F1383F004D1E07 /* BagelBaseModel.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3760A47B21F13A47004D1E07 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3760A47A21F13A47004D1E07 /* CocoaAsyncSocket.framework */; }; - 51102CE2220B87290067EB63 /* BagelCarrierDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51102CE1220B857E0067EB63 /* BagelCarrierDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A813214228705FF70061A3DC /* BagelProjectModel.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213928705FF70061A3DC /* BagelProjectModel.h */; }; + A813214328705FF70061A3DC /* BagelConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213A28705FF70061A3DC /* BagelConfiguration.h */; }; + A813214428705FF70061A3DC /* BagelRequestPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213B28705FF70061A3DC /* BagelRequestPacket.h */; }; + A813214528705FF70061A3DC /* BagelCarrierDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213C28705FF70061A3DC /* BagelCarrierDelegate.h */; }; + A813214628705FF70061A3DC /* BagelDeviceModel.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213D28705FF70061A3DC /* BagelDeviceModel.h */; }; + A813214728705FF70061A3DC /* BagelUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213E28705FF70061A3DC /* BagelUtility.h */; }; + A813214828705FF70061A3DC /* BagelRequestInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = A813213F28705FF70061A3DC /* BagelRequestInfo.h */; }; + A813214928705FF70061A3DC /* Bagel.h in Headers */ = {isa = PBXBuildFile; fileRef = A813214028705FF70061A3DC /* Bagel.h */; }; + A813214A28705FF70061A3DC /* BagelBaseModel.h in Headers */ = {isa = PBXBuildFile; fileRef = A813214128705FF70061A3DC /* BagelBaseModel.h */; }; + A813214D287060E00061A3DC /* CocoaAsyncSocket in Frameworks */ = {isa = PBXBuildFile; productRef = A813214C287060E00061A3DC /* CocoaAsyncSocket */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -43,31 +43,30 @@ 3760A44221F1383F004D1E07 /* BagelRequestCarrier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelRequestCarrier.m; sourceTree = ""; }; 3760A44321F1383F004D1E07 /* BagelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelController.h; sourceTree = ""; }; 3760A44421F1383F004D1E07 /* BagelUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelUtility.m; sourceTree = ""; }; - 3760A44521F1383F004D1E07 /* BagelProjectModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelProjectModel.h; sourceTree = ""; }; - 3760A44621F1383F004D1E07 /* BagelConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelConfiguration.h; sourceTree = ""; }; 3760A44721F1383F004D1E07 /* Bagel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bagel.m; sourceTree = ""; }; 3760A44821F1383F004D1E07 /* BagelRequestInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelRequestInfo.m; sourceTree = ""; }; 3760A44921F1383F004D1E07 /* BagelURLSessionInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelURLSessionInjector.m; sourceTree = ""; }; 3760A44A21F1383F004D1E07 /* BagelBaseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelBaseModel.m; sourceTree = ""; }; 3760A44B21F1383F004D1E07 /* BagelURLConnectionInjector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelURLConnectionInjector.h; sourceTree = ""; }; 3760A44C21F1383F004D1E07 /* BagelBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelBrowser.m; sourceTree = ""; }; - 3760A44D21F1383F004D1E07 /* BagelRequestPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelRequestPacket.h; sourceTree = ""; }; 3760A44E21F1383F004D1E07 /* BagelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelController.m; sourceTree = ""; }; 3760A44F21F1383F004D1E07 /* BagelRequestCarrier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelRequestCarrier.h; sourceTree = ""; }; - 3760A45021F1383F004D1E07 /* BagelDeviceModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelDeviceModel.h; sourceTree = ""; }; 3760A45121F1383F004D1E07 /* BagelProjectModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelProjectModel.m; sourceTree = ""; }; - 3760A45221F1383F004D1E07 /* BagelUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelUtility.h; sourceTree = ""; }; 3760A45321F1383F004D1E07 /* BagelURLSessionInjector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelURLSessionInjector.h; sourceTree = ""; }; - 3760A45421F1383F004D1E07 /* BagelRequestInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelRequestInfo.h; sourceTree = ""; }; - 3760A45521F1383F004D1E07 /* Bagel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bagel.h; sourceTree = ""; }; 3760A45621F1383F004D1E07 /* BagelConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelConfiguration.m; sourceTree = ""; }; 3760A45721F1383F004D1E07 /* BagelRequestPacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelRequestPacket.m; sourceTree = ""; }; 3760A45821F1383F004D1E07 /* BagelBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelBrowser.h; sourceTree = ""; }; 3760A45921F1383F004D1E07 /* BagelURLConnectionInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BagelURLConnectionInjector.m; sourceTree = ""; }; - 3760A45A21F1383F004D1E07 /* BagelBaseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelBaseModel.h; sourceTree = ""; }; 3760A47521F13872004D1E07 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; - 3760A47A21F13A47004D1E07 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/iOS/CocoaAsyncSocket.framework; sourceTree = SOURCE_ROOT; }; - 51102CE1220B857E0067EB63 /* BagelCarrierDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BagelCarrierDelegate.h; sourceTree = ""; }; + A813213928705FF70061A3DC /* BagelProjectModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelProjectModel.h; sourceTree = ""; }; + A813213A28705FF70061A3DC /* BagelConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelConfiguration.h; sourceTree = ""; }; + A813213B28705FF70061A3DC /* BagelRequestPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelRequestPacket.h; sourceTree = ""; }; + A813213C28705FF70061A3DC /* BagelCarrierDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelCarrierDelegate.h; sourceTree = ""; }; + A813213D28705FF70061A3DC /* BagelDeviceModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelDeviceModel.h; sourceTree = ""; }; + A813213E28705FF70061A3DC /* BagelUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelUtility.h; sourceTree = ""; }; + A813213F28705FF70061A3DC /* BagelRequestInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelRequestInfo.h; sourceTree = ""; }; + A813214028705FF70061A3DC /* Bagel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bagel.h; sourceTree = ""; }; + A813214128705FF70061A3DC /* BagelBaseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BagelBaseModel.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -75,7 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3760A47B21F13A47004D1E07 /* CocoaAsyncSocket.framework in Frameworks */, + A813214D287060E00061A3DC /* CocoaAsyncSocket in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -87,7 +86,6 @@ children = ( 3760A47521F13872004D1E07 /* Info.plist */, 3760A44021F1383F004D1E07 /* Source */, - 3760A47921F13A35004D1E07 /* Frameworks */, 3760A3F321F137B8004D1E07 /* Products */, ); sourceTree = ""; @@ -103,43 +101,43 @@ 3760A44021F1383F004D1E07 /* Source */ = { isa = PBXGroup; children = ( - 3760A45521F1383F004D1E07 /* Bagel.h */, + A813213828705FF70061A3DC /* include */, 3760A44721F1383F004D1E07 /* Bagel.m */, - 3760A45A21F1383F004D1E07 /* BagelBaseModel.h */, 3760A44A21F1383F004D1E07 /* BagelBaseModel.m */, 3760A45821F1383F004D1E07 /* BagelBrowser.h */, 3760A44C21F1383F004D1E07 /* BagelBrowser.m */, - 51102CE1220B857E0067EB63 /* BagelCarrierDelegate.h */, - 3760A44621F1383F004D1E07 /* BagelConfiguration.h */, 3760A45621F1383F004D1E07 /* BagelConfiguration.m */, 3760A44321F1383F004D1E07 /* BagelController.h */, 3760A44E21F1383F004D1E07 /* BagelController.m */, - 3760A45021F1383F004D1E07 /* BagelDeviceModel.h */, 3760A44121F1383F004D1E07 /* BagelDeviceModel.m */, - 3760A44521F1383F004D1E07 /* BagelProjectModel.h */, 3760A45121F1383F004D1E07 /* BagelProjectModel.m */, 3760A44F21F1383F004D1E07 /* BagelRequestCarrier.h */, 3760A44221F1383F004D1E07 /* BagelRequestCarrier.m */, - 3760A45421F1383F004D1E07 /* BagelRequestInfo.h */, 3760A44821F1383F004D1E07 /* BagelRequestInfo.m */, - 3760A44D21F1383F004D1E07 /* BagelRequestPacket.h */, 3760A45721F1383F004D1E07 /* BagelRequestPacket.m */, 3760A44B21F1383F004D1E07 /* BagelURLConnectionInjector.h */, 3760A45921F1383F004D1E07 /* BagelURLConnectionInjector.m */, 3760A45321F1383F004D1E07 /* BagelURLSessionInjector.h */, 3760A44921F1383F004D1E07 /* BagelURLSessionInjector.m */, - 3760A45221F1383F004D1E07 /* BagelUtility.h */, 3760A44421F1383F004D1E07 /* BagelUtility.m */, ); path = Source; sourceTree = SOURCE_ROOT; }; - 3760A47921F13A35004D1E07 /* Frameworks */ = { + A813213828705FF70061A3DC /* include */ = { isa = PBXGroup; children = ( - 3760A47A21F13A47004D1E07 /* CocoaAsyncSocket.framework */, + A813213928705FF70061A3DC /* BagelProjectModel.h */, + A813213A28705FF70061A3DC /* BagelConfiguration.h */, + A813213B28705FF70061A3DC /* BagelRequestPacket.h */, + A813213C28705FF70061A3DC /* BagelCarrierDelegate.h */, + A813213D28705FF70061A3DC /* BagelDeviceModel.h */, + A813213E28705FF70061A3DC /* BagelUtility.h */, + A813213F28705FF70061A3DC /* BagelRequestInfo.h */, + A813214028705FF70061A3DC /* Bagel.h */, + A813214128705FF70061A3DC /* BagelBaseModel.h */, ); - path = Frameworks; + path = include; sourceTree = ""; }; /* End PBXGroup section */ @@ -149,19 +147,19 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3760A46F21F1383F004D1E07 /* Bagel.h in Headers */, - 51102CE2220B87290067EB63 /* BagelCarrierDelegate.h in Headers */, 3760A45D21F1383F004D1E07 /* BagelController.h in Headers */, 3760A47221F1383F004D1E07 /* BagelBrowser.h in Headers */, - 3760A46021F1383F004D1E07 /* BagelConfiguration.h in Headers */, - 3760A46E21F1383F004D1E07 /* BagelRequestInfo.h in Headers */, + A813214628705FF70061A3DC /* BagelDeviceModel.h in Headers */, + A813214528705FF70061A3DC /* BagelCarrierDelegate.h in Headers */, + A813214828705FF70061A3DC /* BagelRequestInfo.h in Headers */, + A813214328705FF70061A3DC /* BagelConfiguration.h in Headers */, + A813214228705FF70061A3DC /* BagelProjectModel.h in Headers */, 3760A46921F1383F004D1E07 /* BagelRequestCarrier.h in Headers */, - 3760A46721F1383F004D1E07 /* BagelRequestPacket.h in Headers */, - 3760A46A21F1383F004D1E07 /* BagelDeviceModel.h in Headers */, - 3760A46C21F1383F004D1E07 /* BagelUtility.h in Headers */, 3760A46D21F1383F004D1E07 /* BagelURLSessionInjector.h in Headers */, - 3760A47421F1383F004D1E07 /* BagelBaseModel.h in Headers */, - 3760A45F21F1383F004D1E07 /* BagelProjectModel.h in Headers */, + A813214928705FF70061A3DC /* Bagel.h in Headers */, + A813214728705FF70061A3DC /* BagelUtility.h in Headers */, + A813214A28705FF70061A3DC /* BagelBaseModel.h in Headers */, + A813214428705FF70061A3DC /* BagelRequestPacket.h in Headers */, 3760A46521F1383F004D1E07 /* BagelURLConnectionInjector.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -183,6 +181,9 @@ dependencies = ( ); name = Bagel; + packageProductDependencies = ( + A813214C287060E00061A3DC /* CocoaAsyncSocket */, + ); productName = Bagel; productReference = 3760A43821F13817004D1E07 /* Bagel.framework */; productType = "com.apple.product-type.framework"; @@ -210,6 +211,9 @@ Base, ); mainGroup = 3760A3E921F137B8004D1E07; + packageReferences = ( + A813214B287060E00061A3DC /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */, + ); productRefGroup = 3760A3F321F137B8004D1E07 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -449,6 +453,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + A813214B287060E00061A3DC /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/robbiehanson/CocoaAsyncSocket"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 7.6.4; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + A813214C287060E00061A3DC /* CocoaAsyncSocket */ = { + isa = XCSwiftPackageProductDependency; + package = A813214B287060E00061A3DC /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */; + productName = CocoaAsyncSocket; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 3760A3EA21F137B8004D1E07 /* Project object */; } diff --git a/iOS/Bagel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iOS/Bagel.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 21a9188..919434a 100644 --- a/iOS/Bagel.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/iOS/Bagel.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/iOS/Bagel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iOS/Bagel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..69f2bb5 --- /dev/null +++ b/iOS/Bagel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "cocoaasyncsocket", + "kind" : "remoteSourceControl", + "location" : "https://github.com/robbiehanson/CocoaAsyncSocket", + "state" : { + "revision" : "dbdc00669c1ced63b27c3c5f052ee4d28f10150c", + "version" : "7.6.5" + } + } + ], + "version" : 2 +} diff --git a/mac/.DS_Store b/mac/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9f542d2d160ee09f3a06ff7a71ac904976b6e526 GIT binary patch literal 6148 zcmeHKu};G<5PhZ{BC(W>(O&@S23s11FX#_I)2c|MN<@WV%*xJp@Ci)(3je`7-+>yD zp<+O&x|4kG?7MU9C&l&w2*ty43QPcGY=S|I0g>TB*O3K}i6PBV;|x!z@Q7w$qW?G~ zYd=AO8?3Ry?)vX>hb>xqDy-`DbY3-^Hf>>a`LSQtrYXxs-7FZLy}draoL{`p_RU=W zGPAwiU8ycOt=g3{;0!ne&VVzZ4Dikt$&M9WI|I&uGw{uToDY#rFgNTJ)6qedN&uof zqm$5ec8W5KjHh&>KLipXuAG5CVBiypm_3L9 literal 0 HcmV?d00001 diff --git a/mac/Bagel.xcodeproj/project.pbxproj b/mac/Bagel.xcodeproj/project.pbxproj index 641358c..4737c8c 100644 --- a/mac/Bagel.xcodeproj/project.pbxproj +++ b/mac/Bagel.xcodeproj/project.pbxproj @@ -824,8 +824,6 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Bagel/Pods-Bagel-frameworks.sh", "${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework", @@ -833,8 +831,6 @@ "${BUILT_PRODUCTS_DIR}/macOSThemeKit/macOSThemeKit.framework", ); name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Highlightr.framework", diff --git a/mac/Podfile.lock b/mac/Podfile.lock index eeee47b..14f1e43 100644 --- a/mac/Podfile.lock +++ b/mac/Podfile.lock @@ -9,7 +9,7 @@ DEPENDENCIES: - macOSThemeKit (~> 1.2.0) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - CocoaAsyncSocket - Highlightr - macOSThemeKit @@ -21,4 +21,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6e39cacd4a77b09b958e2e6f8b405bbc2340dfc2 -COCOAPODS: 1.6.1 +COCOAPODS: 1.11.3