Merge branch 'release/1.4.2'

danthorpe · Dec 16, 2015 · 4675ae7 · 4675ae7
2 parents 45da985 + 446ee26
commit 4675ae7
Show file tree

Hide file tree

Showing 26 changed files with 463 additions and 299 deletions.
diff --git a/.ci/buildkite/pipeline.template.yml b/.ci/buildkite/pipeline.template.yml
@@ -1,9 +1,4 @@
 steps:
-  -
-    name: ":bundler: Update Bundler"
-    command: .ci/scripts/update-bundler
-    agents:
-      name: "$BUILDKITE_AGENT_META_DATA_NAME"	
   -
     name: ":fastlane: Test Mac OS X"
     command: .ci/scripts/test-osx

diff --git a/.ci/scripts/send-coverage b/.ci/scripts/send-coverage
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-bash <(curl -s https://codecov.io/bash) -D .ci/xcodebuild-data
+bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -D .ci/xcodebuild-data
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -6,7 +6,7 @@ github_url: https://github.com/danthorpe/Money
 readme: README.md
 podspec: Money.podspec
 
-swift_version: 2.1
+swift_version: 2.1.1
 xcodebuild-arguments: -scheme,Money-iOS
 
 custom_categories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.4.2
+1. [[MNY-39](https://github.com/danthorpe/Money/pull/30)]: Updates to the latest version of [Result](https://github.com/antitypical/Result/releases/tag/1.0.1) dependency. Thanks to [@mrdavey](https://github.com/mrdavey) and [@hsoi](https://github.com/hsoi) for spotting this!
+
 # 1.4.1
 1. [[MNY-28](https://github.com/danthorpe/Money/pull/28)]: Documentation is now hosted at [docs.danthorpe.me](http://docs.danthorpe.me/money/1.4.1/).
 

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
 github "danthorpe/ValueCoding"
-github "antitypical/Result" >= 0.6
+github "antitypical/Result" >= 1.0
 github "SwiftyJSON/SwiftyJSON"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1 +1 @@
-github "venmo/DVR" ~> 0.1.3
+github "venmo/DVR"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-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"
+github "venmo/DVR" "v0.2.0"
+github "antitypical/Result" "1.0.1"
+github "SwiftyJSON/SwiftyJSON" "2.3.3"
+github "danthorpe/ValueCoding" "1.1.1"
diff --git a/Examples/Custom Money/Podfile.lock b/Examples/Custom Money/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Money (1.3.0):
-    - Result (= 0.6.0-beta.6)
+  - Money (1.4.1):
+    - Result
     - SwiftyJSON
     - ValueCoding
-  - Result (0.6.0-beta.6)
-  - SwiftyJSON (2.3.1)
-  - ValueCoding (1.1.0)
+  - Result (1.0.1)
+  - SwiftyJSON (2.3.2)
+  - ValueCoding (1.1.1)
 
 DEPENDENCIES:
   - Money (from `../../`)
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Money: 80739aa547740640fd960128baa40a28a22cc91b
-  Result: dc390d0b58f9ec43fcd536f1ebdd130803cc6cbc
-  SwiftyJSON: 592b53bee5ef3dd9b3bebc6b9cb7ee35426ae8c3
-  ValueCoding: 54486fde2d7b1c2f1eb46de260b95340abed5bde
+  Money: 5f822a7b435ab6f07af599f0d0e40786732364ad
+  Result: caef80340451e1f07492fa1e89117f83613bce24
+  SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
+  ValueCoding: c693457b32175c1e468b3fd838cb021100a63e71
 
 COCOAPODS: 0.39.0
diff --git a/Examples/Custom Money/Pods/Local Podspecs/Money.podspec.json b/Examples/Custom Money/Pods/Local Podspecs/Money.podspec.json
diff --git a/Examples/Custom Money/Pods/Manifest.lock b/Examples/Custom Money/Pods/Manifest.lock
diff --git a/Examples/Custom Money/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Money.xcscheme b/Examples/Custom Money/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Money.xcscheme
diff --git a/Examples/Custom Money/Pods/Result/README.md b/Examples/Custom Money/Pods/Result/README.md
diff --git a/Examples/Custom Money/Pods/Result/Result/Result.swift b/Examples/Custom Money/Pods/Result/Result/Result.swift
diff --git a/Examples/Custom Money/Pods/Result/Result/ResultType.swift b/Examples/Custom Money/Pods/Result/Result/ResultType.swift
diff --git a/Examples/Custom Money/Pods/SwiftyJSON/README.md b/Examples/Custom Money/Pods/SwiftyJSON/README.md