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

Commit 4675ae7

Browse files
committed
Merge branch 'release/1.4.2'
2 parents 45da985 + 446ee26 commit 4675ae7

File tree

26 files changed

+463
-299
lines changed

26 files changed

+463
-299
lines changed

.ci/buildkite/pipeline.template.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
steps:
2-
-
3-
name: ":bundler: Update Bundler"
4-
command: .ci/scripts/update-bundler
5-
agents:
6-
name: "$BUILDKITE_AGENT_META_DATA_NAME"
72
-
83
name: ":fastlane: Test Mac OS X"
94
command: .ci/scripts/test-osx

.ci/scripts/send-coverage

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
bash <(curl -s https://codecov.io/bash) -D .ci/xcodebuild-data
2+
bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -D .ci/xcodebuild-data

.jazzy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ github_url: https://github.com/danthorpe/Money
66
readme: README.md
77
podspec: Money.podspec
88

9-
swift_version: 2.1
9+
swift_version: 2.1.1
1010
xcodebuild-arguments: -scheme,Money-iOS
1111

1212
custom_categories:

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.4.2
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!
3+
14
# 1.4.1
25
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/).
36

Cartfile

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

Cartfile.private

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

Cartfile.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "venmo/DVR" "v0.1.4"
2-
github "antitypical/Result" "0.6.0-beta.6"
3-
github "SwiftyJSON/SwiftyJSON" "2.3.1"
4-
github "danthorpe/ValueCoding" "1.1.0"
1+
github "venmo/DVR" "v0.2.0"
2+
github "antitypical/Result" "1.0.1"
3+
github "SwiftyJSON/SwiftyJSON" "2.3.3"
4+
github "danthorpe/ValueCoding" "1.1.1"

Examples/Custom Money/Podfile.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PODS:
2-
- Money (1.3.0):
3-
- Result (= 0.6.0-beta.6)
2+
- Money (1.4.1):
3+
- Result
44
- SwiftyJSON
55
- ValueCoding
6-
- Result (0.6.0-beta.6)
7-
- SwiftyJSON (2.3.1)
8-
- ValueCoding (1.1.0)
6+
- Result (1.0.1)
7+
- SwiftyJSON (2.3.2)
8+
- ValueCoding (1.1.1)
99

1010
DEPENDENCIES:
1111
- Money (from `../../`)
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
1515
:path: "../../"
1616

1717
SPEC CHECKSUMS:
18-
Money: 80739aa547740640fd960128baa40a28a22cc91b
19-
Result: dc390d0b58f9ec43fcd536f1ebdd130803cc6cbc
20-
SwiftyJSON: 592b53bee5ef3dd9b3bebc6b9cb7ee35426ae8c3
21-
ValueCoding: 54486fde2d7b1c2f1eb46de260b95340abed5bde
18+
Money: 5f822a7b435ab6f07af599f0d0e40786732364ad
19+
Result: caef80340451e1f07492fa1e89117f83613bce24
20+
SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
21+
ValueCoding: c693457b32175c1e468b3fd838cb021100a63e71
2222

2323
COCOAPODS: 0.39.0

Examples/Custom Money/Pods/Local Podspecs/Money.podspec.json

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/Manifest.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Money.xcscheme

+60
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/Result/README.md

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/Result/Result/Result.swift

+19-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/Result/Result/ResultType.swift

+23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/Custom Money/Pods/SwiftyJSON/README.md

+21-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)