* up to 0.13

icanzilb · icanzilb · commit 3280c5a6ddd9 · 2014-04-17T01:45:08.000+02:00
diff --git a/AppledocSettings.plist b/AppledocSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>--project-name</key>
-	<string>JSONModel 0.12.0</string>
+	<string>JSONModel 0.13.0</string>
 	<key>--print-settings</key>
 	<true/>
 	<key>--project-company</key>
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,18 @@
 Change-log
 ==========
 
+**Version 0.13** @ 2014-04-17
+
+- methods to merge data into existing model
+
+- automatic NSCopying and NSCoding for all JSONModel subclasses
+
+- merged number of fixes for the networking library
+
+- XCTest unit tests, demo app runs only on iOS7+
+
+
+
 **Version 0.12** @ 2014-02-17
 
 - fixes for BOOLs
diff --git a/JSONModel.podspec b/JSONModel.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "JSONModel"
-  s.version      = "0.12.0"
+  s.version      = "0.13.0"
   s.summary      = "Magical Data Modelling Framework for JSON. Create rapidly powerful, atomic and smart data model classes."
   s.homepage     = "http://www.jsonmodel.com"
 
   s.license      = { :type => 'MIT', :file => 'LICENSE_jsonmodel.txt' }
   s.author       = { "Marin Todorov" => "touch-code-magazine@underplot.com" }
 
-  s.source       = { :git => "https://github.com/icanzilb/JSONModel.git", :tag => "0.12.0" }
+  s.source       = { :git => "https://github.com/icanzilb/JSONModel.git", :tag => "0.13.0" }
 
   s.ios.deployment_target = '5.0'
   s.osx.deployment_target = '10.7'
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 ## Magical Data Modelling Framework for JSON
 
+*New*: In version 0.13.0 automatic NSCopying/NSCoding support.
+
 *New*: In version 0.12.0 I added experimental support for exporting **JSON models** to **CoreData**.
 
 Give it a try and let me know, post an issue or just get in touch. Try something like that:
diff --git a/gendoc b/gendoc
@@ -1 +1 @@
-appledoc --project-name "JSONModel 0.12.0" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel
+appledoc --project-name "JSONModel 0.13.0" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-appledoc --project-name "JSONModel 0.12.0" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel`
	`1`	`+appledoc --project-name "JSONModel 0.13.0" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel`