Merge branch 'release/1.5.1'

danthorpe · Feb 6, 2016 · 595600e · 595600e
2 parents eb5d0a8 + 2ec3907
commit 595600e
Show file tree

Hide file tree

Showing 39 changed files with 285 additions and 2,981 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -1,7 +1,7 @@
 author_name: Daniel Thorpe
 author_url: http://danthorpe.me
 module_name: Money
-module_version: 1.5.0
+module_version: 1.5.1
 github_url: https://github.com/danthorpe/Money
 readme: README.md
 podspec: Money.podspec

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.5.1
+Cleans up a few issues related to updating to the latest Carthage, and the example project.
+
+# 1.5.0
+1. [[MNY-38](https://github.com/danthorpe/Money/pull/38)]: Removes the FX functionality from this framework.
+
 # 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!
 

diff --git a/Examples/Custom Money/Custom Money/Currencies.swift b/Examples/Custom Money/Custom Money/Currencies.swift
@@ -51,6 +51,9 @@ extension Currency {
 typealias Hearts = _Money<Currency.Heart>
 typealias Bees = _Money<Currency.Bee>
 
+
+/** - This would require the FX module
+
 class BankRates {
 
     static func quoteForBase(base: String, counter: String) -> FXQuote {
@@ -93,3 +96,5 @@ class Bank<B: MoneyType, C: MoneyType where
     }
 }
 
+
+*/
diff --git a/Examples/Custom Money/Custom Money/ViewController.swift b/Examples/Custom Money/Custom Money/ViewController.swift
@@ -19,9 +19,12 @@ class ViewController: UIViewController {
 
         print("You have \(hearts) and \(bees)")
 
-        let total = Bank<Hearts,Bees>.fx(hearts).counter + bees
+/** - This would require importing MoneyFX instead
 
+        let total = Bank<Hearts,Bees>.fx(hearts).counter + bees
         print("Exchanging your \(hearts) into \(Currency.Bee.symbol) via the bank gives you \(total) in total.")
+
+*/
     }
 }
 
diff --git a/Examples/Custom Money/Podfile.lock b/Examples/Custom Money/Podfile.lock
@@ -1,11 +1,7 @@
 PODS:
-  - Money (1.4.1):
-    - Result
-    - SwiftyJSON
+  - Money (1.5.1):
     - ValueCoding
-  - Result (1.0.1)
-  - SwiftyJSON (2.3.2)
-  - ValueCoding (1.1.1)
+  - ValueCoding (1.2.0)
 
 DEPENDENCIES:
   - Money (from `../../`)
@@ -15,9 +11,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Money: 5f822a7b435ab6f07af599f0d0e40786732364ad
-  Result: caef80340451e1f07492fa1e89117f83613bce24
-  SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
-  ValueCoding: c693457b32175c1e468b3fd838cb021100a63e71
+  Money: b3939e8ec686118a6525fe2ff4bed5e55af4a0e1
+  ValueCoding: e2f7d8fee288debd762b655a8e0ba933985a6b57
 
 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/project.pbxproj b/Examples/Custom Money/Pods/Pods.xcodeproj/project.pbxproj
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/LICENSE b/Examples/Custom Money/Pods/Result/LICENSE
diff --git a/Examples/Custom Money/Pods/Result/README.md b/Examples/Custom Money/Pods/Result/README.md