Merge branch 'master' of github.com:danthorpe/ValueCoding into develo…

…pment

.jazzy.json

@@ -0,0 +1,14 @@
+{
+	"author": "Daniel Thorpe",
+	"author_url": "http://danthorpe.me",
+	"github_url": "https://github.com/danthorpe/ValueCoding",
+	"module": "ValueCoding",
+	"module_version": "1.4.0",
+	"readme": "README.md",
+	"swift_version": "2.2",	
+	"xcodebuild_arguments": [
+		"-project", "ValueCoding.xcodeproj", 
+		"-scheme", "ValueCoding"
+	],
+	"exclude": ["Tests"]
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.4.0
+1. [[VCD-19](https://github.com/danthorpe/ValueCoding/pull/19)]: Recreates the project to use a single multi-platform framework target.
+
 # 1.3.0
 1. [[VCD-13](https://github.com/danthorpe/ValueCoding/pull/13)]: Switches test coverage reporting to Coveralls. Also adds SwiftLint rules into the project and CI.
 2. [[VCD-14](https://github.com/danthorpe/ValueCoding/pull/14)]: Updates to Swift 2.2 syntax. :)

ValueCoding.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "ValueCoding"
-  s.version           = "1.3.0"
+  s.version           = "1.4.0"
   s.summary           = "Swift protocols for encoding/decoding value types."
   s.description       = <<-DESC
   
@@ -19,13 +19,13 @@ 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.3.0/index.html'  
+  s.documentation_url = 'http://docs.danthorpe.me/valuecoding/1.4.0/index.html'
   s.social_media_url  = 'https://twitter.com/danthorpe'
   s.requires_arc      = true
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'  
-  s.source_files      = 'ValueCoding/*.swift' 
+  s.source_files      = 'Sources/*.swift' 
 end