Skip to content

Commit db445cf

Browse files
mythzmythz
authored
Merge pull request #11 from Dimentar/develop
MacOS, watchOS, tvOS support + Formatting
2 parents 9d4992b + a10bcbe commit db445cf

36 files changed

Lines changed: 8315 additions & 8013 deletions

Sources/Info.plist renamed to Configs/ServiceStack.plist

File renamed without changes.

Tests/Info.plist renamed to Configs/ServiceStackTests.plist

File renamed without changes.

‎Package.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
import PackageDescription
55

66
let package = Package(
7-
name: "ServiceStackClient",
7+
name: "ServiceStack",
8+
products: [
9+
// Products define the executables and libraries produced by a package, and make them visible to other packages.
10+
.library(
11+
name: "ServiceStack",
12+
targets: ["ServiceStack"]),
13+
],
814
dependencies: [
915
// Dependencies declare other packages that this package depends on.
1016
// .package(url: /* package url */, from: "1.0.0"),

‎ServiceStack.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "ServiceStack"
4-
s.version = "1.0.1"
4+
s.version = "1.0.2"
55
s.summary = "Swift ServiceStack Service Client"
66
s.description = <<-DESC
77
ServiceStack's Add ServiceStack Reference feature lets iOS developers
@@ -13,10 +13,10 @@ s.author = { "ServiceStack, Inc" => "team@servicestack.com" }
1313
s.source = { :git => "https://github.com/ServiceStack/ServiceStack.Swift.git", :tag => s.version.to_s }
1414

1515
s.swift_version = "4.1"
16-
s.ios.deployment_target = "8.3"
17-
# s.osx.deployment_target = "10.9"
18-
# s.watchos.deployment_target = "2.0"
19-
# s.tvos.deployment_target = "9.0"
16+
s.ios.deployment_target = "8.0"
17+
s.osx.deployment_target = "10.10"
18+
s.watchos.deployment_target = "2.0"
19+
s.tvos.deployment_target = "9.0"
2020
s.requires_arc = true
2121

2222
#s.public_header_files = 'Pod/Classes/**/*.h'

‎ServiceStack.xcodeproj/project.pbxproj‎

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

ServiceStackClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ServiceStack.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-iOS.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0920"
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 = "52D6D97B1BEFF229002C0205"
18+
BuildableName = "ServiceStack.framework"
19+
BlueprintName = "ServiceStack-iOS"
20+
ReferencedContainer = "container:ServiceStack.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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
codeCoverageEnabled = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "52D6D9851BEFF229002C0205"
38+
BuildableName = "ServiceStack-iOS Tests.xctest"
39+
BlueprintName = "ServiceStack-iOS Tests"
40+
ReferencedContainer = "container:ServiceStack.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
48+
BuildableName = "ServiceStack.framework"
49+
BlueprintName = "ServiceStack-iOS"
50+
ReferencedContainer = "container:ServiceStack.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
71+
BuildableName = "ServiceStack.framework"
72+
BlueprintName = "ServiceStack-iOS"
73+
ReferencedContainer = "container:ServiceStack.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
<AdditionalOptions>
77+
</AdditionalOptions>
78+
</LaunchAction>
79+
<ProfileAction
80+
buildConfiguration = "Release"
81+
shouldUseLaunchSchemeArgsEnv = "YES"
82+
savedToolIdentifier = ""
83+
useCustomWorkingDirectory = "NO"
84+
debugDocumentVersioning = "YES">
85+
<MacroExpansion>
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
89+
BuildableName = "ServiceStack.framework"
90+
BlueprintName = "ServiceStack-iOS"
91+
ReferencedContainer = "container:ServiceStack.xcodeproj">
92+
</BuildableReference>
93+
</MacroExpansion>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

‎ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-macOS.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0920"
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 = "52D6DA0E1BF000BD002C0205"
18+
BuildableName = "ServiceStack.framework"
19+
BlueprintName = "ServiceStack-macOS"
20+
ReferencedContainer = "container:ServiceStack.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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
codeCoverageEnabled = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "DD7502791C68FCFC006590AF"
38+
BuildableName = "ServiceStack-macOS Tests.xctest"
39+
BlueprintName = "ServiceStack-macOS Tests"
40+
ReferencedContainer = "container:ServiceStack.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
48+
BuildableName = "ServiceStack.framework"
49+
BlueprintName = "ServiceStack-macOS"
50+
ReferencedContainer = "container:ServiceStack.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
71+
BuildableName = "ServiceStack.framework"
72+
BlueprintName = "ServiceStack-macOS"
73+
ReferencedContainer = "container:ServiceStack.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
<AdditionalOptions>
77+
</AdditionalOptions>
78+
</LaunchAction>
79+
<ProfileAction
80+
buildConfiguration = "Release"
81+
shouldUseLaunchSchemeArgsEnv = "YES"
82+
savedToolIdentifier = ""
83+
useCustomWorkingDirectory = "NO"
84+
debugDocumentVersioning = "YES">
85+
<MacroExpansion>
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
89+
BuildableName = "ServiceStack.framework"
90+
BlueprintName = "ServiceStack-macOS"
91+
ReferencedContainer = "container:ServiceStack.xcodeproj">
92+
</BuildableReference>
93+
</MacroExpansion>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

‎ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-tvOS.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0920"
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 = "52D6D9EF1BEFFFBE002C0205"
18+
BuildableName = "ServiceStack.framework"
19+
BlueprintName = "ServiceStack-tvOS"
20+
ReferencedContainer = "container:ServiceStack.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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
codeCoverageEnabled = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "DD75028C1C690C7A006590AF"
38+
BuildableName = "ServiceStack-tvOS Tests.xctest"
39+
BlueprintName = "ServiceStack-tvOS Tests"
40+
ReferencedContainer = "container:ServiceStack.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
48+
BuildableName = "ServiceStack.framework"
49+
BlueprintName = "ServiceStack-tvOS"
50+
ReferencedContainer = "container:ServiceStack.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<MacroExpansion>
68+
<BuildableReference
69+
BuildableIdentifier = "primary"
70+
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
71+
BuildableName = "ServiceStack.framework"
72+
BlueprintName = "ServiceStack-tvOS"
73+
ReferencedContainer = "container:ServiceStack.xcodeproj">
74+
</BuildableReference>
75+
</MacroExpansion>
76+
<AdditionalOptions>
77+
</AdditionalOptions>
78+
</LaunchAction>
79+
<ProfileAction
80+
buildConfiguration = "Release"
81+
shouldUseLaunchSchemeArgsEnv = "YES"
82+
savedToolIdentifier = ""
83+
useCustomWorkingDirectory = "NO"
84+
debugDocumentVersioning = "YES">
85+
<MacroExpansion>
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
89+
BuildableName = "ServiceStack.framework"
90+
BlueprintName = "ServiceStack-tvOS"
91+
ReferencedContainer = "container:ServiceStack.xcodeproj">
92+
</BuildableReference>
93+
</MacroExpansion>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

0 commit comments

Comments
 (0)