* prepare for 1.0.2 release

jsonmodel · Jan 21, 2015 · e7386f0 · e7386f0
1 parent 6500560
commit e7386f0
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 28 deletions.
diff --git a/AppledocSettings.plist b/AppledocSettings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>--project-name</key>
-	<string>JSONModel 1.0.0</string>
+	<string>JSONModel 1.0.2</string>
 	<key>--print-settings</key>
 	<true/>
 	<key>--project-company</key>

diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,11 @@
 Change-log
 ==========
 
+**Version 1.2** @ 2015-01-21
+
+- merged a number of pull requests that fix compatibility with iOS 8 and other issues
+
+
 **Version 1.0** @ 2014-08-12
 
 - bug fix and merged pull requests

diff --git a/JSONModel/JSONModel/JSONModel.h b/JSONModel/JSONModel/JSONModel.h
@@ -1,7 +1,7 @@
 //
 //  JSONModel.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModel.m b/JSONModel/JSONModel/JSONModel.m
@@ -1,7 +1,7 @@
 //
 //  JSONModel.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModelArray.m b/JSONModel/JSONModel/JSONModelArray.m
@@ -1,7 +1,7 @@
 //
 //  JSONModelArray.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModelClassProperty.h b/JSONModel/JSONModel/JSONModelClassProperty.h
@@ -1,7 +1,7 @@
 //
 //  JSONModelClassProperty.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModelClassProperty.m b/JSONModel/JSONModel/JSONModelClassProperty.m
@@ -1,7 +1,7 @@
 //
 //  JSONModelClassProperty.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModelError.h b/JSONModel/JSONModel/JSONModelError.h
@@ -1,7 +1,7 @@
 //
 //  JSONModelError.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModel/JSONModelError.m b/JSONModel/JSONModel/JSONModelError.m
@@ -1,7 +1,7 @@
 //
 //  JSONModelError.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelCategories/NSArray+JSONModel.h b/JSONModel/JSONModelCategories/NSArray+JSONModel.h
@@ -1,7 +1,7 @@
 //
 //  NSArray+JSONModel.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelCategories/NSArray+JSONModel.m b/JSONModel/JSONModelCategories/NSArray+JSONModel.m
@@ -1,7 +1,7 @@
 //
 //  NSArray+JSONModel.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelLib.h b/JSONModel/JSONModelLib.h
@@ -1,7 +1,7 @@
 //
 //  JSONModelLib.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONAPI.h b/JSONModel/JSONModelNetworking/JSONAPI.h
@@ -1,7 +1,7 @@
 //
 //  JSONAPI.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONAPI.m b/JSONModel/JSONModelNetworking/JSONAPI.m
@@ -1,7 +1,7 @@
 //
 //  JSONAPI.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.h b/JSONModel/JSONModelNetworking/JSONHTTPClient.h
@@ -1,7 +1,7 @@
 //
 //  JSONModelHTTPClient.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.m b/JSONModel/JSONModelNetworking/JSONHTTPClient.m
@@ -1,7 +1,7 @@
 //
 //  JSONModelHTTPClient.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONModel+networking.h b/JSONModel/JSONModelNetworking/JSONModel+networking.h
@@ -1,7 +1,7 @@
 //
 //  JSONModel+networking.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelNetworking/JSONModel+networking.m b/JSONModel/JSONModelNetworking/JSONModel+networking.m
@@ -1,7 +1,7 @@
 //
 //  JSONModel+networking.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelTransformations/JSONKeyMapper.h b/JSONModel/JSONModelTransformations/JSONKeyMapper.h
@@ -1,7 +1,7 @@
 //
 //  JSONKeyMapper.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelTransformations/JSONKeyMapper.m b/JSONModel/JSONModelTransformations/JSONKeyMapper.m
@@ -1,7 +1,7 @@
 //
 //  JSONKeyMapper.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.h b/JSONModel/JSONModelTransformations/JSONValueTransformer.h
@@ -1,7 +1,7 @@
 //
 //  JSONValueTransformer.h
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.m b/JSONModel/JSONModelTransformations/JSONValueTransformer.m
@@ -1,7 +1,7 @@
 //
 //  JSONValueTransformer.m
 //
-//  @version 1.0.0
+//  @version 1.0.2
 //  @author Marin Todorov, http://www.touch-code-magazine.com
 //
 

diff --git a/README.md b/README.md
@@ -1,10 +1,8 @@
 ## Magical Data Modelling Framework for JSON
 
-### Version 1.0.0
+### Version 1.0.2
 
-*New*: After 1.5 years of development JSONModel is now in version 1.0.0! 
-
-#####NB: I haven’t had the time to test JSONModel in Swift projects and do not plan to do that before Swift has reached at least its 1.0 version.
+#####NB: Swift works in a different way under the hood than Objective-C. Therefore I can't find a way to re-create JSONModel in Swift. JSONModel in Objective-C works in Swift apps through CocoaPods or as an imported Objective-C library.
 
 ---
 If you like JSONModel and use it, could you please:
@@ -527,5 +525,3 @@ This code is distributed under the terms and conditions of the MIT license.
 
 **NB!** If you are fixing a bug you discovered, please add also a unit test so I know how exactly to reproduce the bug before merging.
 
--------
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/icanzilb/jsonmodel/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
diff --git a/gendoc b/gendoc
@@ -1 +1 @@
-appledoc --project-name "JSONModel 1.0" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel
+appledoc --project-name "JSONModel 1.0.2" --project-company "Marin Todorov, Underplot" --company-id com.underplot --output ~/help --no-create-docset --explicit-crossref JSONModel