diff --git a/CHANGELOG.md b/CHANGELOG.md index 0695da16..940299b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v1.4.1 (2016-09-11) + +- restructured custom getter/setter system to resolve crash reported in #436 (thanks @robinzhangx & @hfossli) + ## v1.4.0 (2016-08-18) - deprecated all JSON->Model key mapper methods for consistency's sake - replaced with equivalent Model->JSON methods with clearer naming diff --git a/JSONModel.podspec b/JSONModel.podspec index 6e28394d..d0bfe9d6 100644 --- a/JSONModel.podspec +++ b/JSONModel.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "JSONModel" - s.version = "1.4.0" + s.version = "1.4.1" s.summary = "Magical Data Modelling Framework for JSON. Create rapidly powerful, atomic and smart data model classes." s.homepage = "http://www.jsonmodel.com" diff --git a/JSONModel.xcodeproj/xcshareddata/xcschemes/JSONModel.xcscheme b/JSONModel.xcodeproj/xcshareddata/xcschemes/JSONModel.xcscheme index 333d783f..b218f135 100644 --- a/JSONModel.xcodeproj/xcshareddata/xcschemes/JSONModel.xcscheme +++ b/JSONModel.xcodeproj/xcshareddata/xcschemes/JSONModel.xcscheme @@ -1,7 +1,7 @@ + version = "1.4.1"> diff --git a/JSONModel/Info.plist b/JSONModel/Info.plist index fff908ac..07b3f7e7 100644 --- a/JSONModel/Info.plist +++ b/JSONModel/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.4 + 1.4.1 CFBundleSignature ???? CFBundleVersion diff --git a/JSONModel/JSONModel/JSONModel.h b/JSONModel/JSONModel/JSONModel.h index 086ad664..ce902d98 100644 --- a/JSONModel/JSONModel/JSONModel.h +++ b/JSONModel/JSONModel/JSONModel.h @@ -1,7 +1,7 @@ // // JSONModel.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModel/JSONModel.m b/JSONModel/JSONModel/JSONModel.m index 64154463..060b593a 100644 --- a/JSONModel/JSONModel/JSONModel.m +++ b/JSONModel/JSONModel/JSONModel.m @@ -1,7 +1,7 @@ // // JSONModel.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // @@ -1371,7 +1371,7 @@ -(instancetype)copyWithZone:(NSZone *)zone -(instancetype)initWithCoder:(NSCoder *)decoder { NSString* json; - + if ([decoder respondsToSelector:@selector(decodeObjectOfClass:forKey:)]) { json = [decoder decodeObjectOfClass:[NSString class] forKey:@"json"]; } else { diff --git a/JSONModel/JSONModel/JSONModelClassProperty.h b/JSONModel/JSONModel/JSONModelClassProperty.h index edb685e6..48c4034e 100644 --- a/JSONModel/JSONModel/JSONModelClassProperty.h +++ b/JSONModel/JSONModel/JSONModelClassProperty.h @@ -1,7 +1,7 @@ // // JSONModelClassProperty.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModel/JSONModelClassProperty.m b/JSONModel/JSONModel/JSONModelClassProperty.m index dfb225b2..264d0235 100644 --- a/JSONModel/JSONModel/JSONModelClassProperty.m +++ b/JSONModel/JSONModel/JSONModelClassProperty.m @@ -1,7 +1,7 @@ // // JSONModelClassProperty.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModel/JSONModelError.h b/JSONModel/JSONModel/JSONModelError.h index bb529631..866ae4cd 100644 --- a/JSONModel/JSONModel/JSONModelError.h +++ b/JSONModel/JSONModel/JSONModelError.h @@ -1,7 +1,7 @@ // // JSONModelError.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModel/JSONModelError.m b/JSONModel/JSONModel/JSONModelError.m index b0e64c92..e3d09260 100644 --- a/JSONModel/JSONModel/JSONModelError.m +++ b/JSONModel/JSONModel/JSONModelError.m @@ -1,7 +1,7 @@ // // JSONModelError.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelLib.h b/JSONModel/JSONModelLib.h index 7bb8dee2..61ffe701 100644 --- a/JSONModel/JSONModelLib.h +++ b/JSONModel/JSONModelLib.h @@ -1,7 +1,7 @@ // // JSONModelLib.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONAPI.h b/JSONModel/JSONModelNetworking/JSONAPI.h index 933173af..7acfe34d 100644 --- a/JSONModel/JSONModelNetworking/JSONAPI.h +++ b/JSONModel/JSONModelNetworking/JSONAPI.h @@ -1,7 +1,7 @@ // // JSONAPI.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONAPI.m b/JSONModel/JSONModelNetworking/JSONAPI.m index 9ffe9e9d..ee8245b1 100644 --- a/JSONModel/JSONModelNetworking/JSONAPI.m +++ b/JSONModel/JSONModelNetworking/JSONAPI.m @@ -1,7 +1,7 @@ // // JSONAPI.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.h b/JSONModel/JSONModelNetworking/JSONHTTPClient.h index 7e21b7e2..5f7c018e 100644 --- a/JSONModel/JSONModelNetworking/JSONHTTPClient.h +++ b/JSONModel/JSONModelNetworking/JSONHTTPClient.h @@ -1,7 +1,7 @@ // // JSONModelHTTPClient.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONHTTPClient.m b/JSONModel/JSONModelNetworking/JSONHTTPClient.m index bc5476df..dc249edc 100644 --- a/JSONModel/JSONModelNetworking/JSONHTTPClient.m +++ b/JSONModel/JSONModelNetworking/JSONHTTPClient.m @@ -1,7 +1,7 @@ // // JSONModelHTTPClient.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONModel+networking.h b/JSONModel/JSONModelNetworking/JSONModel+networking.h index c856d1b8..faebae27 100644 --- a/JSONModel/JSONModelNetworking/JSONModel+networking.h +++ b/JSONModel/JSONModelNetworking/JSONModel+networking.h @@ -1,7 +1,7 @@ // // JSONModel+networking.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelNetworking/JSONModel+networking.m b/JSONModel/JSONModelNetworking/JSONModel+networking.m index 0ac4428f..25dd47a7 100644 --- a/JSONModel/JSONModelNetworking/JSONModel+networking.m +++ b/JSONModel/JSONModelNetworking/JSONModel+networking.m @@ -1,7 +1,7 @@ // // JSONModel+networking.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelTransformations/JSONKeyMapper.h b/JSONModel/JSONModelTransformations/JSONKeyMapper.h index 2471fc1c..b98fae0e 100644 --- a/JSONModel/JSONModelTransformations/JSONKeyMapper.h +++ b/JSONModel/JSONModelTransformations/JSONKeyMapper.h @@ -1,7 +1,7 @@ // // JSONKeyMapper.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelTransformations/JSONKeyMapper.m b/JSONModel/JSONModelTransformations/JSONKeyMapper.m index 89579a34..6c96fd5e 100644 --- a/JSONModel/JSONModelTransformations/JSONKeyMapper.m +++ b/JSONModel/JSONModelTransformations/JSONKeyMapper.m @@ -1,7 +1,7 @@ // // JSONKeyMapper.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.h b/JSONModel/JSONModelTransformations/JSONValueTransformer.h index 528908c0..2497680a 100644 --- a/JSONModel/JSONModelTransformations/JSONValueTransformer.h +++ b/JSONModel/JSONModelTransformations/JSONValueTransformer.h @@ -1,7 +1,7 @@ // // JSONValueTransformer.h // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/JSONModel/JSONModelTransformations/JSONValueTransformer.m b/JSONModel/JSONModelTransformations/JSONValueTransformer.m index 5f922cde..e17cbba4 100644 --- a/JSONModel/JSONModelTransformations/JSONValueTransformer.m +++ b/JSONModel/JSONModelTransformations/JSONValueTransformer.m @@ -1,7 +1,7 @@ // // JSONValueTransformer.m // -// @version 1.4 +// @version 1.4.1 // @author Marin Todorov (http://www.underplot.com) and contributors // diff --git a/README.md b/README.md index 390e4b7f..a22c787b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Magical Data Modeling Framework for JSON -### Version 1.4.0 +### Version 1.4.1 --- If you like JSONModel and use it, could you please: