Skip to content

Commit e7044e1

Browse files
cijianzycijianzy
committed
Support all platform
1 parent 508615e commit e7044e1

19 files changed

Lines changed: 1197 additions & 42 deletions

‎.travis.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
language: objective-c
22
osx_image: xcode8
33

4-
env:
5-
- ACTION=test PLATFORM=iOS DESTINATION='platform=iOS Simulator,name=iPhone 6S'
64
script:
7-
- set -o pipefail && xcodebuild -scheme HandyJSONTests -destination "$DESTINATION" $ACTION | xcpretty
5+
- sh scripts/ci.sh
86
after_success:
97
- bash <(curl -s https://codecov.io/bash)

‎HandyJSON.podspec‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
21
Pod::Spec.new do |s|
3-
s.platform = :ios
42
s.ios.deployment_target = '8.0'
3+
s.osx.deployment_target = "10.9"
4+
s.watchos.deployment_target = "2.0"
5+
s.tvos.deployment_target = "9.0"
6+
57
s.author = {'xuyecan' => '[email protected]'}
68
s.license = 'Apache License 2.0'
79
s.requires_arc = true
8-
s.version = '1.0.0'
10+
s.version = '1.1.0'
911
s.homepage = "https://github.com/alibaba/handyjson"
1012
s.name = "HandyJSON"
1113

‎HandyJSON.xcodeproj/project.pbxproj‎

Lines changed: 668 additions & 30 deletions
Large diffs are not rendered by default.

HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSONTests.xcscheme renamed to HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON iOS Tests.xcscheme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<BuildableReference
1919
BuildableIdentifier = "primary"
2020
BlueprintIdentifier = "217B046C1D571B9F0035A8E2"
21-
BuildableName = "HandyJSONTests.xctest"
22-
BlueprintName = "HandyJSONTests"
21+
BuildableName = "HandyJSON iOS Tests.xctest"
22+
BlueprintName = "HandyJSON iOS Tests"
2323
ReferencedContainer = "container:HandyJSON.xcodeproj">
2424
</BuildableReference>
2525
</TestableReference>

HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON.xcscheme renamed to HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON iOS.xcscheme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "21520C431D3341B200F53111"
1818
BuildableName = "HandyJSON.framework"
19-
BlueprintName = "HandyJSON"
19+
BlueprintName = "HandyJSON iOS"
2020
ReferencedContainer = "container:HandyJSON.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -47,7 +47,7 @@
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "21520C431D3341B200F53111"
4949
BuildableName = "HandyJSON.framework"
50-
BlueprintName = "HandyJSON"
50+
BlueprintName = "HandyJSON iOS"
5151
ReferencedContainer = "container:HandyJSON.xcodeproj">
5252
</BuildableReference>
5353
</MacroExpansion>
@@ -65,7 +65,7 @@
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "21520C431D3341B200F53111"
6767
BuildableName = "HandyJSON.framework"
68-
BlueprintName = "HandyJSON"
68+
BlueprintName = "HandyJSON iOS"
6969
ReferencedContainer = "container:HandyJSON.xcodeproj">
7070
</BuildableReference>
7171
</MacroExpansion>

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON macOS Tests.xcscheme‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0800"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "393E0FE81DA2494F00B3BC12"
20+
BuildableName = "HandyJSON macOS Tests.xctest"
21+
BlueprintName = "HandyJSON macOS Tests"
22+
ReferencedContainer = "container:HandyJSON.xcodeproj">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
<AdditionalOptions>
27+
</AdditionalOptions>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
<AdditionalOptions>
40+
</AdditionalOptions>
41+
</LaunchAction>
42+
<ProfileAction
43+
buildConfiguration = "Release"
44+
shouldUseLaunchSchemeArgsEnv = "YES"
45+
savedToolIdentifier = ""
46+
useCustomWorkingDirectory = "NO"
47+
debugDocumentVersioning = "YES">
48+
</ProfileAction>
49+
<AnalyzeAction
50+
buildConfiguration = "Debug">
51+
</AnalyzeAction>
52+
<ArchiveAction
53+
buildConfiguration = "Release"
54+
revealArchiveInOrganizer = "YES">
55+
</ArchiveAction>
56+
</Scheme>

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON macOS.xcscheme‎

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

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON tvOS Tests.xcscheme‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0800"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "393E0FB81DA2441E00B3BC12"
20+
BuildableName = "HandyJSON tvOS Tests.xctest"
21+
BlueprintName = "HandyJSON tvOS Tests"
22+
ReferencedContainer = "container:HandyJSON.xcodeproj">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
<AdditionalOptions>
27+
</AdditionalOptions>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
<AdditionalOptions>
40+
</AdditionalOptions>
41+
</LaunchAction>
42+
<ProfileAction
43+
buildConfiguration = "Release"
44+
shouldUseLaunchSchemeArgsEnv = "YES"
45+
savedToolIdentifier = ""
46+
useCustomWorkingDirectory = "NO"
47+
debugDocumentVersioning = "YES">
48+
</ProfileAction>
49+
<AnalyzeAction
50+
buildConfiguration = "Debug">
51+
</AnalyzeAction>
52+
<ArchiveAction
53+
buildConfiguration = "Release"
54+
revealArchiveInOrganizer = "YES">
55+
</ArchiveAction>
56+
</Scheme>

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON tvOS.xcscheme‎

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

0 commit comments

Comments
 (0)