Merge branch 'release/1.2.1'

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.1
+1. [[MNY-19](https://github.com/danthorpe/Money/pull/19)]: Fixes a bunch of miscellaneous spelling mistakes in the README and code documentation.
+2. [[MNY-20](https://github.com/danthorpe/Money/pull/20)]: Fixes a mistake where DVR which is only needed for the test suit was not in a private Cartfile. Also switches to the official @venmo DVR after recent merges in their project. Thanks to @dasmer for this.
+
 # 1.2.0
 1. [[MNY-18](https://github.com/danthorpe/Money/pull/18)]: Adds Bitcoin currency types and support for % commission with FX.
 	* Creates `BTC` and `XBT` types.

Cartfile

@@ -1,4 +1,3 @@
 github "danthorpe/ValueCoding"
 github "antitypical/Result" >= 0.6
 github "SwiftyJSON/SwiftyJSON"
-github "danthorpe/DVR" "DVR_27_restore_print_and_abort"

Cartfile.private

@@ -0,0 +1 @@
+github "venmo/DVR" ~> 0.1.3

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "danthorpe/DVR" "f0195d81d27a7d7633bd8c89ac7baa986fe8a21f"
+github "venmo/DVR" "v0.1.4"
 github "antitypical/Result" "0.6.0-beta.6"
 github "SwiftyJSON/SwiftyJSON" "2.3.1"
 github "danthorpe/ValueCoding" "1.1.0"

Money.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "Money"
-  s.version           = "1.2.0"
+  s.version           = "1.2.1"
   s.summary           = "Swift types for working with Money."
   s.description       = <<-DESC
   

Money.xcodeproj/project.pbxproj

@@ -759,7 +759,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"Will generate currency types using: $SCRIPT_INPUT_FILE_0\"\n\"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\necho \"Generate complete\"\n\n\n\n\n";
+			shellScript = "\"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n\n\n\n";
 		};
 		65D305641BE955AE0032D99F /* Carthage Copy Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;