* bump to 1.1.2

jsonmodel · Oct 19, 2015 · e9af29e · e9af29e
1 parent b0c78cd
commit e9af29e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 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.1</string>
+	<string>JSONModel 1.1.2</string>
 	<key>--print-settings</key>
 	<true/>
 	<key>--project-company</key>

diff --git a/Changelog.md b/Changelog.md
@@ -1,7 +1,15 @@
 Change-log
 ==========
 
-**Version 1.2** @ 2015-01-21
+**Version 1.1.2** @2015-10-19
+
+Merging more requests re: iOS9
+
+**Version 1.1** @2015-05
+
+Merging more requests
+
+**Version 1.0.2** @ 2015-01-21
 
 - merged a number of pull requests that fix compatibility with iOS 8 and other issues
 

diff --git a/JSONModel.podspec b/JSONModel.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "JSONModel"
-  s.version      = "1.1"
+  s.version      = "1.1.2"
   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 => "1.1" }
+  s.source       = { :git => "https://github.com/icanzilb/JSONModel.git", :tag => "1.1.2" }
 
   s.ios.deployment_target = '5.0'
   s.osx.deployment_target = '10.7'

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## Magical Data Modelling Framework for JSON
 
-### Version 1.1
+### Version 1.1.2
 
 #####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.