Skip to content

Commit 9adfd56

Browse files
author
Christos Kasketis
committed
Merge branch 'pr/49'
2 parents ea27252 + 3f172b0 commit 9adfd56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2642
-501
lines changed

‎netfox OS X/Info.plist‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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>$(PRODUCT_BUNDLE_IDENTIFIER)</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>NSHumanReadableCopyright</key>
24+
<string>Copyright © 2016 kasketis. All rights reserved.</string>
25+
<key>NSPrincipalClass</key>
26+
<string></string>
27+
</dict>
28+
</plist>

‎netfox OS X/netfox OS X.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// netfox OS X.h
3+
// netfox OS X
4+
//
5+
// Created by Tom Baranes on 08/02/16.
6+
// Copyright © 2016 kasketis. All rights reserved.
7+
//
8+
9+
#import <Cocoa/Cocoa.h>
10+
11+
//! Project version number for netfox OS X.
12+
FOUNDATION_EXPORT double netfox_OS_XVersionNumber;
13+
14+
//! Project version string for netfox OS X.
15+
FOUNDATION_EXPORT const unsigned char netfox_OS_XVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <netfox_OS_X/PublicHeader.h>
18+
19+

‎netfox-info.plist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.7.2</string>
18+
<string>1.7.3</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>Copyright (human-readable)</key>
24+
<string>Copyright © 2016 netfox. All rights reserved.</string>
2325
<key>NSPrincipalClass</key>
2426
<string></string>
2527
</dict>

‎netfox.podspec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ DESC
1414
s.source = { :git => "https://github.com/kasketis/netfox.git", :tag => '1.7.2' }
1515

1616
s.platform = :ios, '8.0'
17+
s.platform = :osx, '10.0'
1718
s.requires_arc = true
1819

19-
s.source_files = "netfox"
20+
s.source_files = "netfox/*.swift"
21+
s.ios.source_files = "netfox/iOS/*.swift"
22+
s.osx.source_files = "netfox/OS X/*.swift"
2023
end

‎netfox.xcodeproj/project.pbxproj‎

Lines changed: 314 additions & 74 deletions
Large diffs are not rendered by default.

‎netfox.xcodeproj/project.xcworkspace/xcuserdata/kasketis.xcuserdatad/UserInterfaceState.xcuserstate‎

55.8 KB
Binary file not shown.

netfox.xcodeproj/xcshareddata/xcschemes/netfox.xcscheme renamed to netfox.xcodeproj/xcshareddata/xcschemes/netfox_ios.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "B3BC020E1C09CDA000C17F3A"
18-
BuildableName = "netfox.framework"
19-
BlueprintName = "netfox"
18+
BuildableName = "netfox_ios.framework"
19+
BlueprintName = "netfox_ios"
2020
ReferencedContainer = "container:netfox.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -46,8 +46,8 @@
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "B3BC020E1C09CDA000C17F3A"
49-
BuildableName = "netfox.framework"
50-
BlueprintName = "netfox"
49+
BuildableName = "netfox_ios.framework"
50+
BlueprintName = "netfox_ios"
5151
ReferencedContainer = "container:netfox.xcodeproj">
5252
</BuildableReference>
5353
</MacroExpansion>
@@ -64,8 +64,8 @@
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "B3BC020E1C09CDA000C17F3A"
67-
BuildableName = "netfox.framework"
68-
BlueprintName = "netfox"
67+
BuildableName = "netfox_ios.framework"
68+
BlueprintName = "netfox_ios"
6969
ReferencedContainer = "container:netfox.xcodeproj">
7070
</BuildableReference>
7171
</MacroExpansion>

‎netfox.xcodeproj/xcshareddata/xcschemes/netfox_osx.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
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 = "E20FD2E81C6912D400DCFF61"
18+
BuildableName = "netfox_osx.framework"
19+
BlueprintName = "netfox_osx"
20+
ReferencedContainer = "container:netfox.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "E20FD2E81C6912D400DCFF61"
49+
BuildableName = "netfox_osx.framework"
50+
BlueprintName = "netfox_osx"
51+
ReferencedContainer = "container:netfox.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "E20FD2E81C6912D400DCFF61"
67+
BuildableName = "netfox_osx.framework"
68+
BlueprintName = "netfox_osx"
69+
ReferencedContainer = "container:netfox.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

0 commit comments

Comments
 (0)