Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 2.0.0 #39

Merged
merged 38 commits into from
Jun 9, 2016
Merged

[WIP] 2.0.0 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
768dbc0
MOD: Refactor JSONHelper
lancy May 14, 2015
1847cdb
WIP commit of proposed structural changes
isair Jun 1, 2015
e164134
Add license info to files missing it
isair Jun 1, 2015
4df7b81
Comment out tests of unimplemented features
isair Jun 1, 2015
2017434
Minor naming change
isair Jun 1, 2015
94cbfac
Boolean conversion
isair Jun 1, 2015
e09ac42
Convert from Any
isair Jun 1, 2015
ff2d6bb
NSDate conversion
isair Jun 1, 2015
7158ab2
NSURL conversion
isair Jun 1, 2015
241d41b
Update travis configuration
isair Jun 1, 2015
4d5362f
Array conversion
isair Jun 2, 2015
ead4b39
JSON string to instance conversion
isair Jun 14, 2015
5b22380
Better use of generics
isair Jun 14, 2015
92947e2
Instance array conversions
isair Jun 15, 2015
cedc38a
Add missing new line characters to end of files
isair Jun 15, 2015
7b17dcc
[String: Convertible] deserialization
isair Jun 22, 2015
22884bb
Move string tests
isair Jun 22, 2015
46a3ce6
Update test assertion messages
isair Jun 22, 2015
00a6ea1
Move int tests
isair Jun 29, 2015
4851799
Move bool tests and complete them
isair Jun 29, 2015
4149d3f
Better string tests
isair Jun 29, 2015
be4442d
Change NSDate conversion attempt order
isair Jun 29, 2015
e960783
String to UIColor and NSColor conversion
isair Aug 31, 2015
8e65c9e
Merge master into dev-2.0.0
isair Dec 11, 2015
81d43b1
Upgrade to latest version of Swift and add declare all JSON data types
isair Dec 11, 2015
6636da1
A step in the right direction (restructuring & refactoring)
isair Jan 23, 2016
3d0dd8e
[Int] Support conversion from Double, Float, and NSDecimalNuber
isair Jan 23, 2016
bfe748b
[Tests] Test new String to Bool conversions
isair Jan 24, 2016
954ab4b
[Double] Support conversions to Double type
isair Jan 24, 2016
ab786fd
Conversion operations can now throw errors
isair Apr 12, 2016
dea3389
Complete even more tests and functionality
isair Apr 14, 2016
fb75c18
Add enum conversion support and tests
isair Apr 15, 2016
82901fd
Dictionary conversion and deserialization
isair Apr 15, 2016
d647114
Complete the rest of the tests and functionality
isair Apr 15, 2016
087baa0
Merge branch 'master' into dev-2.0.0
isair Apr 18, 2016
e5c537a
Partially complete new README
isair Apr 18, 2016
7a294e1
Backup commit, will be squashed
isair May 14, 2016
800622d
[README] Update for 2.0.0
isair Jun 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions JSONHelper.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'JSONHelper'
s.version = '1.7.0'
s.version = '2.0.0'
s.license = { :type => 'zlib', :file => 'LICENSE' }
s.summary = 'Lightning fast JSON deserialization and value conversion library for iOS & OS X written in Swift.'

Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = '10.9'
s.tvos.deployment_target = '9.0'
s.source = { :git => 'https://github.com/isair/JSONHelper.git', :tag => s.version }
s.source_files = 'JSONHelper'
s.source_files = 'JSONHelper/**/*.swift'
s.frameworks = 'Foundation'
s.requires_arc = true
end
385 changes: 232 additions & 153 deletions JSONHelper.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions JSONHelper.xcodeproj/project.xcworkspace/xcshareddata/JSONHelper.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>9540366943750F418CA1A28462EA7F786EC07683</key>
<string>https://github.com/isair/JSONHelper.git</string>
<string>github.com:isair/JSONHelper.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>JSONHelper.xcodeproj</string>
Expand All @@ -21,7 +21,7 @@
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/isair/JSONHelper.git</string>
<string>github.com:isair/JSONHelper.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
Expand Down
44 changes: 39 additions & 5 deletions JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-Mac.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0620"
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -16,7 +16,21 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76C52001ACD46B100B49735"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper_Mac"
BlueprintName = "JSONHelper-Mac"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
BuildableName = "JSONHelperTests.xctest"
BlueprintName = "JSONHelperTests"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -26,9 +40,29 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
BuildableName = "JSONHelperTests.xctest"
BlueprintName = "JSONHelperTests"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76C52001ACD46B100B49735"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper-Mac"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -47,7 +81,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76C52001ACD46B100B49735"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper_Mac"
BlueprintName = "JSONHelper-Mac"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -65,7 +99,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76C52001ACD46B100B49735"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper_Mac"
BlueprintName = "JSONHelper-Mac"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
20 changes: 12 additions & 8 deletions JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0620"
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper"
BlueprintName = "JSONHelper-iOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -37,10 +37,11 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Release">
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -58,44 +59,47 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper"
BlueprintName = "JSONHelper-iOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper"
BlueprintName = "JSONHelper-iOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD07631A70F2FC00C4D09E"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper"
BlueprintName = "JSONHelper-iOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
48 changes: 41 additions & 7 deletions JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelper-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,22 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
BuildableName = "JSONHelper_tvOS.framework"
BlueprintName = "JSONHelper_tvOS"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper-tvOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
BuildableName = "JSONHelperTests.xctest"
BlueprintName = "JSONHelperTests"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -26,9 +40,29 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5FAD076E1A70F2FC00C4D09E"
BuildableName = "JSONHelperTests.xctest"
BlueprintName = "JSONHelperTests"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper-tvOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -46,8 +80,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
BuildableName = "JSONHelper_tvOS.framework"
BlueprintName = "JSONHelper_tvOS"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper-tvOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -64,8 +98,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5F928D951C0D469F00EF50C4"
BuildableName = "JSONHelper_tvOS.framework"
BlueprintName = "JSONHelper_tvOS"
BuildableName = "JSONHelper.framework"
BlueprintName = "JSONHelper-tvOS"
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
13 changes: 8 additions & 5 deletions JSONHelper.xcodeproj/xcshareddata/xcschemes/JSONHelperExample.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:JSONHelper.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand All @@ -86,10 +89,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
Loading