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

Commit eb5d0a8

Browse files
committed
Merge branch 'release/1.5.0'
2 parents 4675ae7 + 12bc978 commit eb5d0a8

26 files changed

+16
-2096
lines changed

.jazzy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
author_name: Daniel Thorpe
22
author_url: http://danthorpe.me
33
module_name: Money
4-
module_version: 1.4.0
4+
module_version: 1.5.0
55
github_url: https://github.com/danthorpe/Money
66
readme: README.md
77
podspec: Money.podspec

Cartfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
github "danthorpe/ValueCoding"
2-
github "antitypical/Result" >= 1.0
3-
github "SwiftyJSON/SwiftyJSON"

Cartfile.private

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cartfile.resolved

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
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"
1+
github "danthorpe/ValueCoding" "1.2.0"

Money.podspec

Lines changed: 2 additions & 3 deletions
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.4.2"
3+
s.version = "1.5.0"
44
s.summary = "Swift types for working with Money."
55
s.description = <<-DESC
66
@@ -34,7 +34,6 @@ Pod::Spec.new do |s|
3434
s.tvos.exclude_files = [ 'Money/iOS' ]
3535

3636
s.dependency 'ValueCoding'
37-
s.dependency 'Result'
38-
s.dependency 'SwiftyJSON'
37+
3938
end
4039

Money.xcodeproj/project.pbxproj

Lines changed: 5 additions & 153 deletions
Large diffs are not rendered by default.

Money.xcodeproj/xcshareddata/xcschemes/Money-OSX.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Money.xcodeproj/xcshareddata/xcschemes/Money-watchOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)