Skip to content

Commit 4382791

Browse files
nuclearacenuclearace
committed
Merge pull request #117 from NachoSoto/master
Added project with iOS and Mac targets => Carthage support
2 parents 998089d + 22b9a1e commit 4382791

File tree

14 files changed

+1401
-1
lines changed

14 files changed

+1401
-1
lines changed

‎.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,21 @@ Icon
2323
Network Trash Folder
2424
Temporary Items
2525
.apdisk
26+
27+
# Xcode
28+
build/
29+
*.pbxuser
30+
!default.pbxuser
31+
*.mode1v3
32+
!default.mode1v3
33+
*.mode2v3
34+
!default.mode2v3
35+
*.perspectivev3
36+
!default.perspectivev3
37+
xcuserdata
38+
*.xccheckout
39+
*.moved-aside
40+
DerivedData
41+
*.hmap
42+
*.ipa
43+
*.xcuserstate

‎README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:@"localhost:8
5555
Requires Swift 1.2/Xcode 6.3
5656
5757
If you need Swift 1.1/Xcode 6.2 use v1.5.2. (Pre-Swift 1.2 support is no longer maintained)
58+
59+
Carthage
60+
-----------------
61+
Add this line to your `Cartfile`:
62+
```
63+
github "socketio/socket.io-client-swift" ~> 2.3.7 # Or latest version
64+
```
65+
66+
Run `carthage update`.
67+
5868
Manually (iOS 7+)
5969
-----------------
6070
1. Copy the SocketIOClientSwift folder into your Xcode project. (Make sure you add the files to your target(s))
@@ -69,7 +79,7 @@ source 'https://github.com/CocoaPods/Specs.git'
6979
platform :ios, '8.0'
7080
use_frameworks!
7181
72-
pod 'Socket.IO-Client-Swift', '~> 1.3.2' # Or latest version
82+
pod 'Socket.IO-Client-Swift', '~> 2.3.7' # Or latest version
7383
```
7484

7585
Install pods:

‎Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 935 additions & 0 deletions
Large diffs are not rendered by default.

‎Socket.IO-Client-Swift.xcodeproj/project.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.

‎Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-Mac.xcscheme

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0640"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
18+
BuildableName = "SocketIO-Mac.framework"
19+
BlueprintName = "SocketIO-Mac"
20+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "572EF2411B51F18A00EEBB58"
32+
BuildableName = "SocketIO-MacTests.xctest"
33+
BlueprintName = "SocketIO-MacTests"
34+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
41+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
buildConfiguration = "Debug">
44+
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "572EF2411B51F18A00EEBB58"
50+
BuildableName = "SocketIO-MacTests.xctest"
51+
BlueprintName = "SocketIO-MacTests"
52+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
55+
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
60+
BuildableName = "SocketIO-Mac.framework"
61+
BlueprintName = "SocketIO-Mac"
62+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
65+
</TestAction>
66+
<LaunchAction
67+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
68+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
launchStyle = "0"
70+
useCustomWorkingDirectory = "NO"
71+
buildConfiguration = "Debug"
72+
ignoresPersistentStateOnLaunch = "NO"
73+
debugDocumentVersioning = "YES"
74+
allowLocationSimulation = "YES">
75+
<MacroExpansion>
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
79+
BuildableName = "SocketIO-Mac.framework"
80+
BlueprintName = "SocketIO-Mac"
81+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
82+
</BuildableReference>
83+
</MacroExpansion>
84+
<AdditionalOptions>
85+
</AdditionalOptions>
86+
</LaunchAction>
87+
<ProfileAction
88+
shouldUseLaunchSchemeArgsEnv = "YES"
89+
savedToolIdentifier = ""
90+
useCustomWorkingDirectory = "NO"
91+
buildConfiguration = "Release"
92+
debugDocumentVersioning = "YES">
93+
<MacroExpansion>
94+
<BuildableReference
95+
BuildableIdentifier = "primary"
96+
BlueprintIdentifier = "572EF2371B51F18A00EEBB58"
97+
BuildableName = "SocketIO-Mac.framework"
98+
BlueprintName = "SocketIO-Mac"
99+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
100+
</BuildableReference>
101+
</MacroExpansion>
102+
</ProfileAction>
103+
<AnalyzeAction
104+
buildConfiguration = "Debug">
105+
</AnalyzeAction>
106+
<ArchiveAction
107+
buildConfiguration = "Release"
108+
revealArchiveInOrganizer = "YES">
109+
</ArchiveAction>
110+
</Scheme>

‎Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0640"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
18+
BuildableName = "SocketIO-iOS.framework"
19+
BlueprintName = "SocketIO-iOS"
20+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "572EF2231B51F16C00EEBB58"
32+
BuildableName = "SocketIO-iOSTests.xctest"
33+
BlueprintName = "SocketIO-iOSTests"
34+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
</BuildActionEntries>
38+
</BuildAction>
39+
<TestAction
40+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
41+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
buildConfiguration = "Debug">
44+
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "572EF2231B51F16C00EEBB58"
50+
BuildableName = "SocketIO-iOSTests.xctest"
51+
BlueprintName = "SocketIO-iOSTests"
52+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
55+
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
60+
BuildableName = "SocketIO-iOS.framework"
61+
BlueprintName = "SocketIO-iOS"
62+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
65+
</TestAction>
66+
<LaunchAction
67+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
68+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
launchStyle = "0"
70+
useCustomWorkingDirectory = "NO"
71+
buildConfiguration = "Debug"
72+
ignoresPersistentStateOnLaunch = "NO"
73+
debugDocumentVersioning = "YES"
74+
allowLocationSimulation = "YES">
75+
<MacroExpansion>
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
79+
BuildableName = "SocketIO-iOS.framework"
80+
BlueprintName = "SocketIO-iOS"
81+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
82+
</BuildableReference>
83+
</MacroExpansion>
84+
<AdditionalOptions>
85+
</AdditionalOptions>
86+
</LaunchAction>
87+
<ProfileAction
88+
shouldUseLaunchSchemeArgsEnv = "YES"
89+
savedToolIdentifier = ""
90+
useCustomWorkingDirectory = "NO"
91+
buildConfiguration = "Release"
92+
debugDocumentVersioning = "YES">
93+
<MacroExpansion>
94+
<BuildableReference
95+
BuildableIdentifier = "primary"
96+
BlueprintIdentifier = "572EF2181B51F16C00EEBB58"
97+
BuildableName = "SocketIO-iOS.framework"
98+
BlueprintName = "SocketIO-iOS"
99+
ReferencedContainer = "container:Socket.IO-Client-Swift.xcodeproj">
100+
</BuildableReference>
101+
</MacroExpansion>
102+
</ProfileAction>
103+
<AnalyzeAction
104+
buildConfiguration = "Debug">
105+
</AnalyzeAction>
106+
<ArchiveAction
107+
buildConfiguration = "Release"
108+
revealArchiveInOrganizer = "YES">
109+
</ArchiveAction>
110+
</Scheme>

‎SocketIO-Mac/Info.plist

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>io.socket.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎SocketIO-Mac/SocketIO-Mac.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// SocketIO-Mac.h
3+
// SocketIO-Mac
4+
//
5+
// Created by Nacho Soto on 7/11/15.
6+
//
7+
//
8+
9+
#import <Cocoa/Cocoa.h>
10+
11+
//! Project version number for SocketIO-Mac.
12+
FOUNDATION_EXPORT double SocketIO_MacVersionNumber;
13+
14+
//! Project version string for SocketIO-Mac.
15+
FOUNDATION_EXPORT const unsigned char SocketIO_MacVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <SocketIO_Mac/PublicHeader.h>
18+
19+

‎SocketIO-MacTests/Info.plist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>io.socket.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
</dict>
24+
</plist>

‎SocketIO-MacTests/SocketIO_MacTests.swift

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
//
2+
// SocketIO_MacTests.swift
3+
// SocketIO-MacTests
4+
//
5+
// Created by Nacho Soto on 7/11/15.
6+
//
7+
//
8+
9+
import Cocoa
10+
import XCTest
11+
12+
class SocketIO_MacTests: XCTestCase {
13+
14+
override func setUp() {
15+
super.setUp()
16+
// Put setup code here. This method is called before the invocation of each test method in the class.
17+
}
18+
19+
override func tearDown() {
20+
// Put teardown code here. This method is called after the invocation of each test method in the class.
21+
super.tearDown()
22+
}
23+
24+
func testExample() {
25+
// This is an example of a functional test case.
26+
XCTAssert(true, "Pass")
27+
}
28+
29+
func testPerformanceExample() {
30+
// This is an example of a performance test case.
31+
self.measureBlock() {
32+
// Put the code you want to measure the time of here.
33+
}
34+
}
35+
36+
}

0 commit comments

Comments
 (0)