Skip to content
This repository was archived by the owner on Jul 2, 2018. It is now read-only.

Commit bceb21e

Browse files
committed
Merge branch 'release/1.2.1'
2 parents daeba22 + 985c49d commit bceb21e

14 files changed

+214
-434
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.2.1
2+
1. [[MNY-19](https://github.com/danthorpe/Money/pull/19)]: Fixes a bunch of miscellaneous spelling mistakes in the README and code documentation.
3+
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.
4+
15
# 1.2.0
26
1. [[MNY-18](https://github.com/danthorpe/Money/pull/18)]: Adds Bitcoin currency types and support for % commission with FX.
37
* Creates `BTC` and `XBT` types.

Cartfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "danthorpe/ValueCoding"
22
github "antitypical/Result" >= 0.6
33
github "SwiftyJSON/SwiftyJSON"
4-
github "danthorpe/DVR" "DVR_27_restore_print_and_abort"

Cartfile.private

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "venmo/DVR" ~> 0.1.3

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "danthorpe/DVR" "f0195d81d27a7d7633bd8c89ac7baa986fe8a21f"
1+
github "venmo/DVR" "v0.1.4"
22
github "antitypical/Result" "0.6.0-beta.6"
33
github "SwiftyJSON/SwiftyJSON" "2.3.1"
44
github "danthorpe/ValueCoding" "1.1.0"

Money.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Money"
3-
s.version = "1.2.0"
3+
s.version = "1.2.1"
44
s.summary = "Swift types for working with Money."
55
s.description = <<-DESC
66

Money.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@
759759
);
760760
runOnlyForDeploymentPostprocessing = 0;
761761
shellPath = /bin/sh;
762-
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";
762+
shellScript = "\"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n\n\n\n";
763763
};
764764
65D305641BE955AE0032D99F /* Carthage Copy Frameworks */ = {
765765
isa = PBXShellScriptBuildPhase;

0 commit comments

Comments
 (0)