Skip to content

Commit 7f60762

Browse files
rcasularcasula
authored
Merge branch 'master' into master
2 parents 8633fc2 + 0709a7d commit 7f60762

File tree

34 files changed

+183
-537
lines changed

34 files changed

+183
-537
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github "ashleymills/Reachability.swift" ~> 5.0.0
22
github "jedisct1/swift-sodium" == 0.8.0
3+
github "pusher/NWWebSocket" ~> 0.3.0

‎Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github "ashleymills/Reachability.swift" "v5.0.0"
22
github "jedisct1/swift-sodium" "0.8.0"
3+
github "pusher/NWWebSocket" "0.3.0"

‎Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@
463463
inputPaths = (
464464
Reachability,
465465
PusherSwift,
466+
NWWebSocket,
466467
);
467468
name = "Carthage: Copy Platform Specific Frameworks";
468469
outputFileListPaths = (
@@ -484,6 +485,7 @@
484485
Sodium,
485486
Reachability,
486487
PusherSwiftWithEncryption,
488+
NWWebSocket,
487489
);
488490
name = "Carthage: Copy Platform Specific Frameworks";
489491
outputFileListPaths = (
@@ -505,6 +507,7 @@
505507
Sodium,
506508
Reachability,
507509
PusherSwiftWithEncryption,
510+
NWWebSocket,
508511
);
509512
name = "Carthage: Copy Platform Specific Frameworks";
510513
outputFileListPaths = (
@@ -525,6 +528,7 @@
525528
inputPaths = (
526529
Reachability,
527530
PusherSwift,
531+
NWWebSocket,
528532
);
529533
name = "Carthage: Copy Platform Specific Frameworks";
530534
outputFileListPaths = (
@@ -545,6 +549,7 @@
545549
inputPaths = (
546550
Reachability,
547551
PusherSwift,
552+
NWWebSocket,
548553
);
549554
name = "Carthage: Copy Platform Specific Frameworks";
550555
outputFileListPaths = (
@@ -566,6 +571,7 @@
566571
Reachability,
567572
PusherSwiftWithEncryption,
568573
Sodium,
574+
NWWebSocket,
569575
);
570576
name = "Carthage: Copy Platform Specific Frameworks";
571577
outputFileListPaths = (

‎Consumption-Tests/Carthage-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@
487487
inputPaths = (
488488
Reachability,
489489
PusherSwift,
490+
NWWebSocket,
490491
);
491492
name = "Carthage: Copy Platform Specific Frameworks";
492493
outputPaths = (
@@ -505,6 +506,7 @@
505506
inputPaths = (
506507
Reachability,
507508
PusherSwift,
509+
NWWebSocket,
508510
);
509511
name = "Carthage: Copy Platform Specific Frameworks";
510512
outputFileListPaths = (
@@ -524,6 +526,7 @@
524526
Sodium,
525527
Reachability,
526528
PusherSwiftWithEncryption,
529+
NWWebSocket,
527530
);
528531
name = "Carthage: Copy Platform Specific Frameworks";
529532
outputPaths = (
@@ -543,6 +546,7 @@
543546
Sodium,
544547
Reachability,
545548
PusherSwiftWithEncryption,
549+
NWWebSocket,
546550
);
547551
name = "Carthage: Copy Platform Specific Frameworks";
548552
outputFileListPaths = (
@@ -563,6 +567,7 @@
563567
inputPaths = (
564568
Reachability,
565569
PusherSwift,
570+
NWWebSocket,
566571
);
567572
name = "Carthage: Copy Platform Specific Frameworks";
568573
outputFileListPaths = (
@@ -584,6 +589,7 @@
584589
Reachability,
585590
PusherSwiftWithEncryption,
586591
Sodium,
592+
NWWebSocket,
587593
);
588594
name = "Carthage: Copy Platform Specific Frameworks";
589595
outputFileListPaths = (

‎Consumption-Tests/Carthage-Minimum/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@
463463
inputPaths = (
464464
Reachability,
465465
PusherSwift,
466+
NWWebSocket,
466467
);
467468
name = "Carthage: Copy Platform Specific Frameworks";
468469
outputFileListPaths = (
@@ -484,6 +485,7 @@
484485
Sodium,
485486
Reachability,
486487
PusherSwiftWithEncryption,
488+
NWWebSocket,
487489
);
488490
name = "Carthage: Copy Platform Specific Frameworks";
489491
outputFileListPaths = (
@@ -505,6 +507,7 @@
505507
Sodium,
506508
Reachability,
507509
PusherSwiftWithEncryption,
510+
NWWebSocket,
508511
);
509512
name = "Carthage: Copy Platform Specific Frameworks";
510513
outputFileListPaths = (
@@ -525,6 +528,7 @@
525528
inputPaths = (
526529
Reachability,
527530
PusherSwift,
531+
NWWebSocket,
528532
);
529533
name = "Carthage: Copy Platform Specific Frameworks";
530534
outputFileListPaths = (
@@ -545,6 +549,7 @@
545549
inputPaths = (
546550
Reachability,
547551
PusherSwift,
552+
NWWebSocket,
548553
);
549554
name = "Carthage: Copy Platform Specific Frameworks";
550555
outputFileListPaths = (
@@ -566,6 +571,7 @@
566571
Reachability,
567572
PusherSwiftWithEncryption,
568573
Sodium,
574+
NWWebSocket,
569575
);
570576
name = "Carthage: Copy Platform Specific Frameworks";
571577
outputFileListPaths = (

‎Consumption-Tests/Carthage-Minimum/Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@
487487
inputPaths = (
488488
Reachability,
489489
PusherSwift,
490+
NWWebSocket,
490491
);
491492
name = "Carthage: Copy Platform Specific Frameworks";
492493
outputPaths = (
@@ -505,6 +506,7 @@
505506
inputPaths = (
506507
Reachability,
507508
PusherSwift,
509+
NWWebSocket,
508510
);
509511
name = "Carthage: Copy Platform Specific Frameworks";
510512
outputFileListPaths = (
@@ -524,6 +526,7 @@
524526
Sodium,
525527
Reachability,
526528
PusherSwiftWithEncryption,
529+
NWWebSocket,
527530
);
528531
name = "Carthage: Copy Platform Specific Frameworks";
529532
outputPaths = (
@@ -543,6 +546,7 @@
543546
Sodium,
544547
Reachability,
545548
PusherSwiftWithEncryption,
549+
NWWebSocket,
546550
);
547551
name = "Carthage: Copy Platform Specific Frameworks";
548552
outputFileListPaths = (
@@ -563,6 +567,7 @@
563567
inputPaths = (
564568
Reachability,
565569
PusherSwift,
570+
NWWebSocket,
566571
);
567572
name = "Carthage: Copy Platform Specific Frameworks";
568573
outputFileListPaths = (
@@ -584,6 +589,7 @@
584589
Reachability,
585590
PusherSwiftWithEncryption,
586591
Sodium,
592+
NWWebSocket,
587593
);
588594
name = "Carthage: Copy Platform Specific Frameworks";
589595
outputFileListPaths = (

‎Consumption-Tests/Cocoapods-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,13 @@
526526
);
527527
inputPaths = (
528528
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-iOS-WithoutEncryption/Pods-ObjectiveC-iOS-WithoutEncryption-frameworks.sh",
529+
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
529530
"${BUILT_PRODUCTS_DIR}/PusherSwift-iOS/PusherSwift.framework",
530531
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
531532
);
532533
name = "[CP] Embed Pods Frameworks";
533534
outputPaths = (
535+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
534536
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
535537
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
536538
);
@@ -634,11 +636,13 @@
634636
);
635637
inputPaths = (
636638
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-macOS-WithoutEncryption/Pods-ObjectiveC-macOS-WithoutEncryption-frameworks.sh",
639+
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
637640
"${BUILT_PRODUCTS_DIR}/PusherSwift-macOS/PusherSwift.framework",
638641
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
639642
);
640643
name = "[CP] Embed Pods Frameworks";
641644
outputPaths = (
645+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
642646
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
643647
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
644648
);
@@ -657,6 +661,7 @@
657661
inputPaths = (
658662
Reachability,
659663
PusherSwift,
664+
NWWebSocket,
660665
);
661666
name = "Carthage: Copy Platform Specific Frameworks";
662667
outputFileListPaths = (
@@ -678,6 +683,7 @@
678683
Sodium,
679684
Reachability,
680685
PusherSwiftWithEncryption,
686+
NWWebSocket,
681687
);
682688
name = "Carthage: Copy Platform Specific Frameworks";
683689
outputFileListPaths = (
@@ -699,6 +705,7 @@
699705
Sodium,
700706
Reachability,
701707
PusherSwiftWithEncryption,
708+
NWWebSocket,
702709
);
703710
name = "Carthage: Copy Platform Specific Frameworks";
704711
outputFileListPaths = (
@@ -716,12 +723,14 @@
716723
);
717724
inputPaths = (
718725
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-iOS-WithEncryption/Pods-ObjectiveC-iOS-WithEncryption-frameworks.sh",
726+
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
719727
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
720728
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-iOS/PusherSwiftWithEncryption.framework",
721729
"${BUILT_PRODUCTS_DIR}/Sodium-iOS/Sodium.framework",
722730
);
723731
name = "[CP] Embed Pods Frameworks";
724732
outputPaths = (
733+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
725734
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
726735
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
727736
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sodium.framework",
@@ -738,11 +747,13 @@
738747
);
739748
inputPaths = (
740749
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-tvOS-WithoutEncryption/Pods-ObjectiveC-tvOS-WithoutEncryption-frameworks.sh",
750+
"${BUILT_PRODUCTS_DIR}/NWWebSocket-tvOS/NWWebSocket.framework",
741751
"${BUILT_PRODUCTS_DIR}/PusherSwift-tvOS/PusherSwift.framework",
742752
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-tvOS/Reachability.framework",
743753
);
744754
name = "[CP] Embed Pods Frameworks";
745755
outputPaths = (
756+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
746757
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
747758
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
748759
);
@@ -780,12 +791,14 @@
780791
);
781792
inputPaths = (
782793
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-macOS-WithEncryption/Pods-ObjectiveC-macOS-WithEncryption-frameworks.sh",
794+
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
783795
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
784796
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-macOS/PusherSwiftWithEncryption.framework",
785797
"${BUILT_PRODUCTS_DIR}/Sodium-macOS/Sodium.framework",
786798
);
787799
name = "[CP] Embed Pods Frameworks";
788800
outputPaths = (
801+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
789802
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
790803
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
791804
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sodium.framework",
@@ -805,6 +818,7 @@
805818
inputPaths = (
806819
Reachability,
807820
PusherSwift,
821+
NWWebSocket,
808822
);
809823
name = "Carthage: Copy Platform Specific Frameworks";
810824
outputFileListPaths = (
@@ -825,6 +839,7 @@
825839
inputPaths = (
826840
Reachability,
827841
PusherSwift,
842+
NWWebSocket,
828843
);
829844
name = "Carthage: Copy Platform Specific Frameworks";
830845
outputFileListPaths = (
@@ -846,6 +861,7 @@
846861
Reachability,
847862
PusherSwiftWithEncryption,
848863
Sodium,
864+
NWWebSocket,
849865
);
850866
name = "Carthage: Copy Platform Specific Frameworks";
851867
outputFileListPaths = (

0 commit comments

Comments
 (0)