Skip to content

Commit 10faf26

Browse files
icanzilbicanzilb
committed
* 1.0.0 update
1 parent d931bf5 commit 10faf26

28 files changed

+56
-58
lines changed

‎AppledocSettings.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>--project-name</key>
6-
<string>JSONModel 0.13.0</string>
6+
<string>JSONModel 1.0.0</string>
77
<key>--print-settings</key>
88
<true/>
99
<key>--project-company</key>

‎Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Change-log
22
==========
33

4+
**Version 1.0** @ 2014-08-12
5+
6+
- bug fix and merged pull requests
7+
48
**Version 0.13** @ 2014-04-17
59

610
- methods to merge data into existing model

‎JSONModel.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Pod::Spec.new do |s|
22
s.name = "JSONModel"
3-
s.version = "0.13.0"
3+
s.version = "1.0.0"
44
s.summary = "Magical Data Modelling Framework for JSON. Create rapidly powerful, atomic and smart data model classes."
55
s.homepage = "http://www.jsonmodel.com"
66

77
s.license = { :type => 'MIT', :file => 'LICENSE_jsonmodel.txt' }
88
s.author = { "Marin Todorov" => "touch-code-magazine@underplot.com" }
99

10-
s.source = { :git => "https://github.com/icanzilb/JSONModel.git", :tag => "0.13.0" }
10+
s.source = { :git => "https://github.com/icanzilb/JSONModel.git", :tag => "1.0.0" }
1111

1212
s.ios.deployment_target = '5.0'
1313
s.osx.deployment_target = '10.7'

‎JSONModel/JSONModel/JSONModel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModel.h
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModel.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModel.m
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModelArray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModelArray.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModelArray.m
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModelClassProperty.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModelClassProperty.h
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModelClassProperty.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModelClassProperty.m
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

‎JSONModel/JSONModel/JSONModelError.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// JSONModelError.h
33
//
4-
// @version 0.13.0
4+
// @version 1.0.0
55
// @author Marin Todorov, http://www.touch-code-magazine.com
66
//
77

8-
// Copyright (c) 2012-2013 Marin Todorov, Underplot ltd.
8+
// Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
99
// This code is distributed under the terms and conditions of the MIT license.
1010
//
1111
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

0 commit comments

Comments
 (0)