From e7386f0e56fb3533e4e89334a76e2a88c76bfd4b Mon Sep 17 00:00:00 2001 From: Marin Todorov Date: Wed, 21 Jan 2015 11:51:40 +0100 Subject: [PATCH] * prepare for 1.0.2 release --- AppledocSettings.plist | 2 +- Changelog.md | 5 +++++ JSONModel/JSONModel/JSONModel.h | 2 +- JSONModel/JSONModel/JSONModel.m | 2 +- JSONModel/JSONModel/JSONModelArray.m | 2 +- JSONModel/JSONModel/JSONModelClassProperty.h | 2 +- JSONModel/JSONModel/JSONModelClassProperty.m | 2 +- JSONModel/JSONModel/JSONModelError.h | 2 +- JSONModel/JSONModel/JSONModelError.m | 2 +- JSONModel/JSONModelCategories/NSArray+JSONModel.h | 2 +- JSONModel/JSONModelCategories/NSArray+JSONModel.m | 2 +- JSONModel/JSONModelLib.h | 2 +- JSONModel/JSONModelNetworking/JSONAPI.h | 2 +- JSONModel/JSONModelNetworking/JSONAPI.m | 2 +- JSONModel/JSONModelNetworking/JSONHTTPClient.h | 2 +- JSONModel/JSONModelNetworking/JSONHTTPClient.m | 2 +- JSONModel/JSONModelNetworking/JSONModel+networking.h | 2 +- JSONModel/JSONModelNetworking/JSONModel+networking.m | 2 +- JSONModel/JSONModelTransformations/JSONKeyMapper.h | 2 +- JSONModel/JSONModelTransformations/JSONKeyMapper.m | 2 +- JSONModel/JSONModelTransformations/JSONValueTransformer.h | 2 +- JSONModel/JSONModelTransformations/JSONValueTransformer.m | 2 +- README.md | 8 ++------ gendoc | 2 +- 24 files changed, 29 insertions(+), 28 deletions(-) diff --git a/AppledocSettings.plist b/AppledocSettings.plist index 9856bb40..0c8c8b41 100644 --- a/AppledocSettings.plist +++ b/AppledocSettings.plist @@ -3,7 +3,7 @@ --project-name - JSONModel 1.0.0 + JSONModel 1.0.2 --print-settings --project-company diff --git a/Changelog.md b/Changelog.md index ec442ed6..c74e9259 100644 --- 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 index 42b09abd..0e6dab04 100644 --- 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 index 79b25e07..0354ad01 100644 --- 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 index 6d2ff3dc..88eddc7a 100644 --- 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 index 7d5ca0a6..7e470707 100644 --- 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 index 287e9d76..0fe91582 100644 --- 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 index 0068e699..36f41ef5 100644 --- 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 index dc3c3d71..de80446a 100644 --- 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 index 79ffc456..d4e18dab 100644 --- 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 index e9e608e6..41475a47 100644 --- 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 index 15498220..b8f5a178 100644 --- 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 index 3e8d3553..dd27aa23 100644 --- 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 index bb13623d..212803d7 100644 --- 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 index f18de4e5..f946c788 100644 --- 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 index e0be1fec..b5e5d263 100644 --- 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 index 6ade40f9..88e329ef 100644 --- 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 index b9c09cea..7d4d1ff3 100644 --- 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 index a62d86b7..75822c6e 100644 --- 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 index 8a873dbd..c3007dad 100644 --- 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 index 4bbe8949..8c40ce85 100644 --- 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 index 5158bdf7..2a37f8dd 100644 --- 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 index f3273010..996fe0f9 100644 --- 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 index 51511b3d..ff208d47 100755 --- 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