Merge tag '1.2.0' into development

1.2.0
danthorpe · Jan 2, 2016 · a2623e6 · a2623e6
2 parents e5b9622 + 5d1cc86
commit a2623e6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -1,12 +1,12 @@
 author_name: Daniel Thorpe
 author_url: http://danthorpe.me
 module_name: ValueCoding
-module_version: 1.1.1
+module_version: 1.2.0
 github_url: https://github.com/danthorpe/ValueCoding
 readme: README.md
 podspec: ValueCoding.podspec
 
-swift_version: 2.1
+swift_version: 2.1.1
 xcodebuild-arguments: -scheme,ValueCoding-iOS
 
 custom_categories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.2.0
+1. [[VCD-9, VCD-10](https://github.com/danthorpe/ValueCoding/pull/10)]: Adds support for a single level of nesting inside SequenceType values. For example it is now possible to encode and decode `[[Foo]]` structures where `Foo` conforms to `ValueCoding`.
+
 # 1.1.1
 1. [[VCD-7](https://github.com/danthorpe/ValueCoding/pull/7)]: Updates CI stuff.
 2. [[VCD-8](https://github.com/danthorpe/ValueCoding/pull/8)]: Updates documentation and README. Thanks [@mrackwitz](https://github.com/danthorpe/ValueCoding/commit/489809da1ba70abf09bc519b784d77a3c47b9f41).

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ and likewise, decoding from unarchiving can be done:
 
 ```swift
 if let foo = Foo.decode(NSKeyedUnarchiver.unarchiveObjectWithData(data)) {
-    // etc, unarchive returns optionals when working with a single item.
+    // etc, decode returns optionals when working with a single item.
 }
 ```
 

diff --git a/ValueCoding.podspec b/ValueCoding.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "ValueCoding"
-  s.version           = "1.1.1"
+  s.version           = "1.2.0"
   s.summary           = "Swift protocols for encoding/decoding value types."
   s.description       = <<-DESC
   
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.author            = { "Daniel Thorpe" => "@danthorpe" }
   s.source            = { :git => "https://github.com/danthorpe/ValueCoding.git", :tag => s.version.to_s }
   s.module_name       = 'ValueCoding'
-  s.documentation_url = 'http://docs.danthorpe.me/valuecoding/1.1.1/index.html'  
+  s.documentation_url = 'http://docs.danthorpe.me/valuecoding/1.2.0/index.html'  
   s.social_media_url  = 'https://twitter.com/danthorpe'
   s.requires_arc      = true
   s.ios.deployment_target = '8.0'

diff --git a/ValueCoding.xcodeproj/project.pbxproj b/ValueCoding.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.$(PRODUCT_NAME)";
 				PRODUCT_NAME = ValueCoding;
-				PROJECT_VERSION = 1.1.1;
+				PROJECT_VERSION = 1.2.0;
 			};
 			name = Debug;
 		};
@@ -555,7 +555,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/ValueCoding/Supporting Files/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.$(PRODUCT_NAME)";
 				PRODUCT_NAME = ValueCoding;
-				PROJECT_VERSION = 1.1.1;
+				PROJECT_VERSION = 1.2.0;
 			};
 			name = Release;
 		};