From 3f1563ac8492cb56c8649c67e0cac613fa1adb23 Mon Sep 17 00:00:00 2001 From: Daniel Thorpe Date: Sun, 16 Oct 2016 19:34:21 +0100 Subject: [PATCH] 1.8.0 (#62) * Makes formattedWithStyle forLocale public (#56) Fixes #53. * [development]: Removes Slather step Generating coverage in CI just seems so unstable. * Swift 2.3 (#61) * [MNY-60]: Recreates Swift 2.3 framework * [MNY-60]: Refactors CI pipeline * [MNY-60]: Fixes upload script * [MNY-60]: Updates build dependencies * [MNY-60]: Shares Money scheme Every time I forget to do this. * [MNY-60]: Fixes deployment targets for iOS * [MNY-60]: Fixes tvOS platform tests * [MNY-60]: Restores minimum version of OSX to 10.11 This is to match ValueCoding * [1.8.0]: Fixes issues raised by podspec linter * [1.8.0]: Bumps the version to 1.8.0 --- .ci/buildkite/pipeline.template.yml | 22 +- .ci/buildkite/upload | 2 +- .fastlane/Fastfile | 43 +- .jazzy.yml | 8 +- .swift-version | 1 + CHANGELOG.md | 3 + Cartfile | 2 +- Cartfile.resolved | 2 +- Gemfile.lock | 245 ++- Money.podspec | 17 +- Money.xcodeproj/project.pbxproj | 1555 +++-------------- ...0D32C110-9E81-4857-87B2-283B1C66329A.plist | 32 - .../Info.plist | 40 - .../xcshareddata/xcschemes/Money-iOS.xcscheme | 100 -- .../xcschemes/Money-tvOS.xcscheme | 100 -- .../xcschemes/Money-watchOS.xcscheme | 81 - .../{Money-OSX.xcscheme => Money.xcscheme} | 27 +- Money/Shared/Locale.swift | 86 - {Money/iOS => Sources}/ApplePay.swift | 7 +- {Money/Shared => Sources}/Autogenerated.swift | 155 +- {Money/Shared => Sources}/Bitcoin.swift | 6 +- {Money/Shared => Sources}/Currency.swift | 19 +- .../Shared/Decimal => Sources}/Decimal.swift | 5 +- .../DecimalNumberType.swift | 5 +- Sources/Locale.swift | 112 ++ {Money/Shared => Sources}/Money.swift | 5 +- .../NSDecimalExtensions.swift | 4 +- .../NSDecimalNumberExtensions.swift | 4 +- {Money/Shared => Sources}/Support.swift | 5 +- Supporting Files/Carthage.xcconfig | 10 + Supporting Files/Money.h | 6 +- Supporting Files/Money.xcconfig | 50 +- Supporting Files/Version.xcconfig | 1 + Tests/{iOS => }/ApplePayTests.swift | 29 +- Tests/{Shared => }/AutogeneratedTests.swift | 233 ++- Tests/BitcoinTests.swift | 49 + .../{Shared => }/DecimalNumberTypeTests.swift | 24 +- Tests/{Shared => }/DecimalTests.swift | 24 +- Tests/LocaleTests.swift | 67 + Tests/{Shared => }/MoneyTests.swift | 24 +- Tests/{Shared => }/NSDecimalNumberTests.swift | 24 +- Tests/{Shared => }/NSDecimalTests.swift | 24 +- Tests/Shared/BitcoinTests.swift | 31 - Tests/Shared/LocaleTests.swift | 49 - 44 files changed, 1174 insertions(+), 2164 deletions(-) create mode 100644 .swift-version delete mode 100644 Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/0D32C110-9E81-4857-87B2-283B1C66329A.plist delete mode 100644 Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/Info.plist delete mode 100644 Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme delete mode 100644 Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme delete mode 100644 Money.xcodeproj/xcshareddata/xcschemes/Money-watchOS.xcscheme rename Money.xcodeproj/xcshareddata/xcschemes/{Money-OSX.xcscheme => Money.xcscheme} (81%) delete mode 100644 Money/Shared/Locale.swift rename {Money/iOS => Sources}/ApplePay.swift (98%) rename {Money/Shared => Sources}/Autogenerated.swift (96%) rename {Money/Shared => Sources}/Bitcoin.swift (97%) rename {Money/Shared => Sources}/Currency.swift (95%) rename {Money/Shared/Decimal => Sources}/Decimal.swift (97%) rename {Money/Shared/Decimal => Sources}/DecimalNumberType.swift (99%) create mode 100644 Sources/Locale.swift rename {Money/Shared => Sources}/Money.swift (99%) rename {Money/Shared/Decimal => Sources}/NSDecimalExtensions.swift (98%) rename {Money/Shared/Decimal => Sources}/NSDecimalNumberExtensions.swift (98%) rename {Money/Shared => Sources}/Support.swift (94%) create mode 100644 Supporting Files/Carthage.xcconfig create mode 100644 Supporting Files/Version.xcconfig rename Tests/{iOS => }/ApplePayTests.swift (75%) rename Tests/{Shared => }/AutogeneratedTests.swift (96%) create mode 100644 Tests/BitcoinTests.swift rename Tests/{Shared => }/DecimalNumberTypeTests.swift (69%) rename Tests/{Shared => }/DecimalTests.swift (63%) create mode 100644 Tests/LocaleTests.swift rename Tests/{Shared => }/MoneyTests.swift (89%) rename Tests/{Shared => }/NSDecimalNumberTests.swift (66%) rename Tests/{Shared => }/NSDecimalTests.swift (70%) delete mode 100644 Tests/Shared/BitcoinTests.swift delete mode 100644 Tests/Shared/LocaleTests.swift diff --git a/.ci/buildkite/pipeline.template.yml b/.ci/buildkite/pipeline.template.yml index 5ca5f0b..3e1d81a 100755 --- a/.ci/buildkite/pipeline.template.yml +++ b/.ci/buildkite/pipeline.template.yml @@ -1,18 +1,18 @@ steps: - - name: ":fastlane: Test Mac OS X" - command: .ci/scripts/test-osx + name: "macOS" + command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_mac" agents: - name: "$BUILDKITE_AGENT_META_DATA_NAME" + xcode: "$XCODE" - - name: ":fastlane: Test iOS" - command: .ci/scripts/test-ios + name: "iOS" + command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_ios" agents: - name: "$BUILDKITE_AGENT_META_DATA_NAME" + iOS-Simulator: true + xcode: "$XCODE" - - type: "waiter" - - - name: ":muscle: Send Coverage" - command: .ci/scripts/send-coverage + name: "tvOS" + command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_tvos" agents: - name: "$BUILDKITE_AGENT_META_DATA_NAME" + iOS-Simulator: true + xcode: "$XCODE" diff --git a/.ci/buildkite/upload b/.ci/buildkite/upload index 508329a..d9d2148 100755 --- a/.ci/buildkite/upload +++ b/.ci/buildkite/upload @@ -3,4 +3,4 @@ set -eu # Makes sure all the steps run on this same agent -sed "s/\$BUILDKITE_AGENT_META_DATA_NAME/$BUILDKITE_AGENT_META_DATA_NAME/" .ci/buildkite/pipeline.template.yml +sed "s/\$XCODE/$BUILDKITE_AGENT_META_DATA_XCODE/;s/\$COMMIT/$BUILDKITE_COMMIT/" .ci/buildkite/pipeline.template.yml diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile index a3c642f..4d3d55b 100644 --- a/.fastlane/Fastfile +++ b/.fastlane/Fastfile @@ -1,37 +1,14 @@ -platform :ios do - - desc "Runs all the tests" - lane :test do - - carthage( - platform: "iOS" - ) - - scan( - scheme: "Money-iOS", - output_directory: ".ci/xcodebuild-data/", - xcargs: "-derivedDataPath .ci/xcodebuild-data/" - ) - - end - +lane :test_ios do + carthage(platform: "iOS") + scan(scheme: "Money", destination: "platform=iOS Simulator,OS=10.0,name=iPhone 6s") end -platform :mac do - - desc "Runs all the tests" - lane :test do - - carthage( - platform: "Mac" - ) +lane :test_mac do + carthage(platform: "Mac") + scan(scheme: "Money", destination: "platform=macOS") +end - scan( - scheme: "Money-OSX", - output_directory: ".ci/xcodebuild-data/", - xcargs: "-derivedDataPath .ci/xcodebuild-data/" - ) - - end - +lane :test_tvos do + carthage(platform: "tvOS") + scan(scheme: "Money", destination: "platform=tvOS Simulator,OS=10.0,name=Apple TV 1080p") end diff --git a/.jazzy.yml b/.jazzy.yml index 3be3956..f96cac6 100644 --- a/.jazzy.yml +++ b/.jazzy.yml @@ -1,12 +1,12 @@ -author_name: Daniel Thorpe +author: Daniel Thorpe author_url: http://danthorpe.me -module_name: Money -module_version: 1.7.0 +module: Money +module_version: 1.8.0 github_url: https://github.com/danthorpe/Money readme: README.md podspec: Money.podspec -swift_version: 2.2 +swift_version: 2.3 xcodebuild-arguments: -scheme,Money-iOS custom_categories: diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..bb576db --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +2.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1578ffb..5fb813f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.8.0 +1. [[MNY-61](https://github.com/danthorpe/Money/pull/61)]: Updates to Swift 2.3. + # 1.7.0 1. [[MNY-47](https://github.com/danthorpe/Money/pull/47)]: Updates to Swift 2.2. diff --git a/Cartfile b/Cartfile index 372cfc1..3bafc3a 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "danthorpe/ValueCoding" +github "danthorpe/ValueCoding" "1.5.0" diff --git a/Cartfile.resolved b/Cartfile.resolved index dd94510..3bafc3a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "danthorpe/ValueCoding" "1.3.0" +github "danthorpe/ValueCoding" "1.5.0" diff --git a/Gemfile.lock b/Gemfile.lock index 25c4838..6436003 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.5.2) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) babosa (1.0.2) - cert (1.4.0) - fastlane_core (>= 0.29.1, < 1.0.0) - spaceship (>= 0.22.0, < 1.0.0) - claide (0.9.1) + cert (1.4.3) + fastlane_core (>= 0.52.1, < 1.0.0) + spaceship (>= 0.34.2, < 1.0.0) + claide (1.0.1) clamp (0.6.5) - coderay (1.1.1) colored (1.2) - commander (4.3.5) + commander (4.4.0) highline (~> 1.7.2) - credentials_manager (0.15.0) + credentials_manager (0.16.2) colored commander (>= 4.3.5) highline (>= 1.7.1) security - deliver (1.10.3) - credentials_manager (>= 0.12.0, < 1.0.0) + deliver (1.14.2) + credentials_manager (>= 0.16.1, < 1.0.0) fastimage (~> 1.6) - fastlane_core (>= 0.36.4, < 1.0.0) - plist (~> 3.1.0) - spaceship (>= 0.19.0, <= 1.0.0) - domain_name (0.5.20160216) + fastlane_core (>= 0.52.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + spaceship (>= 0.35.0, < 1.0.0) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) - dotenv (2.1.0) - excon (0.45.4) + dotenv (2.1.1) + excon (0.53.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -42,50 +41,56 @@ GEM faraday (>= 0.7.4, < 0.10) fastimage (1.6.8) addressable (~> 2.3, >= 2.3.5) - fastlane (1.66.0) - addressable (~> 2.3.8) - cert (>= 1.3.0, < 2.0.0) - credentials_manager (>= 0.15.0, < 1.0.0) - deliver (>= 1.10.1, < 2.0.0) - fastlane_core (>= 0.36.8, < 1.0.0) - frameit (>= 2.4.1, < 3.0.0) - gym (>= 1.6.1, < 2.0.0) - krausefx-shenzhen (>= 0.14.7) - match (>= 0.3.0, < 1.0.0) - pem (>= 1.2.0, < 2.0.0) - pilot (>= 1.3.0, < 2.0.0) - plist (~> 3.1.0) - produce (>= 1.1.0, < 2.0.0) - scan (>= 0.5.0, < 1.0.0) - screengrab (>= 0.2.1, < 1.0.0) - sigh (>= 1.3.1, < 2.0.0) - slack-notifier (~> 1.3) - snapshot (>= 1.7.0, < 2.0.0) - spaceship (>= 0.22.0, < 1.0.0) - supply (>= 0.4.0, < 1.0.0) - terminal-notifier (~> 1.6.2) - terminal-table (~> 1.4.5) + fastlane (1.105.2) + activesupport (< 5) + addressable (>= 2.3, < 3.0.0) + bundler (~> 1.12) + cert (>= 1.4.3, < 2.0.0) + credentials_manager (>= 0.16.1, < 1.0.0) + deliver (>= 1.14.2, < 2.0.0) + fastlane_core (>= 0.52.1, < 1.0.0) + frameit (>= 2.8.0, < 3.0.0) + gym (>= 1.11.0, < 2.0.0) + krausefx-shenzhen (>= 0.14.10, < 1.0.0) + match (>= 0.8.1, < 1.0.0) + multipart-post (~> 2.0.0) + pem (>= 1.3.2, < 2.0.0) + pilot (>= 1.10.1, < 2.0.0) + plist (>= 3.1.0, < 4.0.0) + produce (>= 1.2.1, < 2.0.0) + scan (>= 0.13.1, < 1.0.0) + screengrab (>= 0.5.2, < 1.0.0) + sigh (>= 1.11.2, < 2.0.0) + slack-notifier (>= 1.3, < 2.0.0) + snapshot (>= 1.16.2, < 2.0.0) + spaceship (>= 0.35.0, < 1.0.0) + supply (>= 0.7.1, < 1.0.0) + terminal-notifier (>= 1.6.2, < 2.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + word_wrap (~> 1.0.0) + xcode-install (~> 2.0.0) xcodeproj (>= 0.20, < 2.0.0) - xcpretty (>= 0.2.1) - fastlane_core (0.37.0) + xcpretty (>= 0.2.3) + fastlane_core (0.52.1) babosa colored - commander (= 4.3.5) - credentials_manager (>= 0.11.0, < 1.0.0) - excon (~> 0.45.0) + commander (>= 4.4.0, <= 5.0.0) + credentials_manager (>= 0.16.1, < 1.0.0) + excon (>= 0.45.0, < 1.0) + gh_inspector (>= 1.0.1, < 2.0.0) highline (>= 1.7.2) json multi_json plist (~> 3.1) rubyzip (~> 1.1.6) - sentry-raven (~> 0.15) terminal-table (~> 1.4.5) - frameit (2.5.1) + frameit (2.8.0) deliver (> 0.3) fastimage (~> 1.6.3) - fastlane_core (>= 0.36.1, < 1.0.0) - mini_magick (~> 4.0.2) - google-api-client (0.9.3) + fastlane_core (>= 0.52.1, < 1.0.0) + mini_magick (~> 4.5.1) + gh_inspector (1.0.2) + google-api-client (0.9.15) addressable (~> 2.3) googleauth (~> 0.5) httpclient (~> 2.7) @@ -94,7 +99,6 @@ GEM mime-types (>= 1.6) representable (~> 2.3.0) retriable (~> 2.0) - thor (~> 0.19) googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) @@ -103,22 +107,22 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - gym (1.6.1) - fastlane_core (>= 0.36.1, < 1.0.0) - plist + gym (1.11.2) + fastlane_core (>= 0.52.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) rubyzip (>= 1.1.7) - terminal-table - xcpretty (>= 0.2.1) + terminal-table (>= 1.4.5, < 2.0.0) + xcpretty (>= 0.2.4, < 1.0.0) highline (1.7.8) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - httpclient (2.7.1) + httpclient (2.8.2.4) hurley (0.2) i18n (0.7.0) json (1.8.3) - jwt (1.5.3) - krausefx-shenzhen (0.14.7) - commander (~> 4.3) + jwt (1.5.6) + krausefx-shenzhen (0.14.10) + commander (>= 4.3, < 5.0) dotenv (>= 0.7) faraday (~> 0.9) faraday_middleware (~> 0.9) @@ -130,102 +134,93 @@ GEM security (~> 0.1.3) terminal-table (~> 1.4.5) little-plugger (1.1.4) - logging (2.0.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) - match (0.3.0) - cert (>= 1.2.8, < 2.0.0) - credentials_manager (>= 0.13.0, < 1.0.0) - fastlane_core (>= 0.36.1, < 1.0.0) + match (0.8.1) + cert (>= 1.4.3, < 2.0.0) + credentials_manager (>= 0.16.1, < 1.0.0) + fastlane_core (>= 0.52.1, < 1.0.0) security - sigh (>= 1.2.2, < 2.0.0) - spaceship (>= 0.18.1, < 1.0.0) - memoist (0.14.0) - method_source (0.8.2) - mime-types (3.0) + sigh (>= 1.11.2, < 2.0.0) + spaceship (>= 0.34.2, < 1.0.0) + memoist (0.15.0) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_magick (4.0.4) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mime-types-data (3.2016.0521) + mini_magick (4.5.1) + mini_portile2 (2.1.0) + minitest (5.9.1) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (3.0.2) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + net-ssh (3.2.0) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) os (0.9.6) - pem (1.3.0) - fastlane_core (>= 0.36.1, < 1.0.0) - spaceship (>= 0.22.0, < 1.0.0) - pilot (1.4.1) - credentials_manager (>= 0.3.0) - fastlane_core (>= 0.36.5, < 1.0.0) - spaceship (>= 0.20.0, < 1.0.0) + pem (1.3.2) + fastlane_core (>= 0.43.1, < 1.0.0) + spaceship (>= 0.26.2, < 1.0.0) + pilot (1.10.1) + credentials_manager (>= 0.16.0) + fastlane_core (>= 0.52.1, < 1.0.0) + spaceship (>= 0.34.2, < 1.0.0) terminal-table (~> 1.4.5) plist (3.1.0) - produce (1.1.1) - fastlane_core (>= 0.30.0, < 1.0.0) - spaceship (>= 0.16.0) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) + produce (1.2.1) + fastlane_core (>= 0.52.1, < 1.0.0) + spaceship (>= 0.34.2, < 1.0.0) representable (2.3.0) uber (~> 0.0.7) retriable (2.1.0) - rouge (1.10.1) + rouge (1.11.1) rubyzip (1.1.7) - scan (0.5.2) - fastlane_core (>= 0.36.1, < 1.0.0) + scan (0.13.1) + fastlane_core (>= 0.52.1, < 1.0.0) slack-notifier (~> 1.3) terminal-table - xcpretty (>= 0.2.1) + xcpretty (>= 0.2.2) xcpretty-travis-formatter (>= 0.0.3) - screengrab (0.3.0) - fastlane_core (>= 0.36.8, < 1.0.0) + screengrab (0.5.5) + fastlane_core (>= 0.52.1, < 1.0.0) security (0.1.3) - sentry-raven (0.15.6) - faraday (>= 0.7.6) - sigh (1.4.0) - fastlane_core (>= 0.36.1, < 1.0.0) + sigh (1.11.2) + fastlane_core (>= 0.52.1, < 1.0.0) plist (~> 3.1) - spaceship (>= 0.22.0, < 1.0.0) - signet (0.7.2) + spaceship (>= 0.34.2, < 1.0.0) + signet (0.7.3) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) slack-notifier (1.5.1) - slather (2.0.1) + slather (2.3.0) + activesupport (>= 4.0.2, < 5) clamp (~> 0.6) nokogiri (~> 1.6.3) - xcodeproj (>= 0.28.2, < 1.1.0) - slop (3.6.0) - snapshot (1.11.0) + xcodeproj (>= 0.20, < 2.0.0) + snapshot (1.16.2) fastimage (~> 1.6.3) - fastlane_core (>= 0.36.1, < 1.0.0) + fastlane_core (>= 0.52.1, < 1.0.0) plist (~> 3.1.0) - xcpretty (>= 0.2.1) - spaceship (0.22.0) + xcpretty (>= 0.2.3) + spaceship (0.36.0) colored - credentials_manager (>= 0.9.0) + credentials_manager (>= 0.16.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 0.9) fastimage (~> 1.6) multi_xml (~> 0.5) - plist (~> 3.1) - pry - supply (0.5.2) + plist (>= 3.1.0, < 4.0.0) + supply (0.7.1) credentials_manager (>= 0.15.0) - fastlane_core (>= 0.35.0) + fastlane_core (>= 0.43.4) google-api-client (~> 0.9.1) - terminal-notifier (1.6.3) + terminal-notifier (1.7.1) terminal-table (1.4.5) - thor (0.19.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -233,11 +228,15 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - xcodeproj (0.28.2) + word_wrap (1.0.0) + xcode-install (2.0.7) + claide (>= 0.9.1, < 1.1.0) + spaceship (>= 0.25.1, < 1.0.0) + xcodeproj (1.3.2) activesupport (>= 3) - claide (~> 0.9.1) + claide (>= 1.0.1, < 2.0) colored (~> 1.2) - xcpretty (0.2.2) + xcpretty (0.2.4) rouge (~> 1.8) xcpretty-travis-formatter (0.0.4) xcpretty (~> 0.2, >= 0.0.7) @@ -252,4 +251,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.11.2 + 1.13.3 diff --git a/Money.podspec b/Money.podspec index 6ab1863..c457cd5 100644 --- a/Money.podspec +++ b/Money.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Money" - s.version = "1.7.0" + s.version = "1.8.0" s.summary = "Swift types for working with Money." s.description = <<-DESC @@ -15,25 +15,22 @@ Pod::Spec.new do |s| s.author = { "Daniel Thorpe" => "@danthorpe" } s.source = { :git => "https://github.com/danthorpe/Money.git", :tag => s.version.to_s } s.module_name = 'Money' - s.documentation_url = 'http://docs.danthorpe.me/money/1.7.0/index.html' s.social_media_url = 'https://twitter.com/danthorpe' s.requires_arc = true s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.10' + s.osx.deployment_target = '10.11' s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' s.source_files = [ - 'Money/Shared/*.swift', - 'Money/Shared/**/*.swift', - 'Money/iOS' + 'Sources/*.swift' ] - s.osx.exclude_files = [ 'Money/iOS' ] - s.watchos.exclude_files = [ 'Money/iOS' ] - s.tvos.exclude_files = [ 'Money/iOS' ] + s.osx.exclude_files = [ 'Sources/ApplePay.swift' ] + s.watchos.exclude_files = [ 'Sources/ApplePay.swift' ] + s.tvos.exclude_files = [ 'Sources/ApplePay.swift' ] - s.dependency 'ValueCoding' + s.dependency 'ValueCoding', '1.5.0' end diff --git a/Money.xcodeproj/project.pbxproj b/Money.xcodeproj/project.pbxproj index d11e236..3736e76 100644 --- a/Money.xcodeproj/project.pbxproj +++ b/Money.xcodeproj/project.pbxproj @@ -7,11 +7,11 @@ objects = { /* Begin PBXAggregateTarget section */ - 65A876D81BE65FAF00E26F22 /* Generate Swift */ = { + 65687D5B1DB3D8B70016FB31 /* Generate Swift */ = { isa = PBXAggregateTarget; - buildConfigurationList = 65A876D91BE65FAF00E26F22 /* Build configuration list for PBXAggregateTarget "Generate Swift" */; + buildConfigurationList = 65687D5E1DB3D8B70016FB31 /* Build configuration list for PBXAggregateTarget "Generate Swift" */; buildPhases = ( - 65A876DC1BE65FDA00E26F22 /* Generate Currency Type */, + 65687D5F1DB3D8C30016FB31 /* Generate Swift */, ); dependencies = ( ); @@ -21,633 +21,274 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 6553909D1C037A1A00610C6F /* LocaleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6553909C1C037A1A00610C6F /* LocaleTests.swift */; }; - 6553909E1C037A1A00610C6F /* LocaleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6553909C1C037A1A00610C6F /* LocaleTests.swift */; }; - 6553909F1C037A1A00610C6F /* LocaleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6553909C1C037A1A00610C6F /* LocaleTests.swift */; }; - 65579F8C1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579F8B1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift */; }; - 65579F8D1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579F8B1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift */; }; - 65579F8E1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579F8B1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift */; }; - 65579FB61C0228EB00C3F8C7 /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FB51C0228EB00C3F8C7 /* Locale.swift */; }; - 65579FB71C0228EB00C3F8C7 /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FB51C0228EB00C3F8C7 /* Locale.swift */; }; - 65579FB81C0228EB00C3F8C7 /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FB51C0228EB00C3F8C7 /* Locale.swift */; }; - 65579FB91C0228EB00C3F8C7 /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FB51C0228EB00C3F8C7 /* Locale.swift */; }; - 65579FC61C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FC51C0288A300C3F8C7 /* AutogeneratedTests.swift */; }; - 65579FC71C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FC51C0288A300C3F8C7 /* AutogeneratedTests.swift */; }; - 65579FC81C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65579FC51C0288A300C3F8C7 /* AutogeneratedTests.swift */; }; - 6557F4C71BEB7F32003CD2BF /* ValueCoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6557F4C61BEB7F32003CD2BF /* ValueCoding.framework */; }; - 6557F4C91BEB7F3D003CD2BF /* ValueCoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6557F4C81BEB7F3D003CD2BF /* ValueCoding.framework */; }; - 6557F4CB1BEB7F46003CD2BF /* ValueCoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6557F4CA1BEB7F46003CD2BF /* ValueCoding.framework */; }; - 6557F4CD1BEB7F51003CD2BF /* ValueCoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6557F4CC1BEB7F51003CD2BF /* ValueCoding.framework */; }; - 65882AFB1C6CB02C0056E00B /* Bitcoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */; }; - 65882AFC1C6CB02D0056E00B /* Bitcoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */; }; - 65882AFD1C6CB02D0056E00B /* Bitcoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */; }; - 65882AFE1C6CB02E0056E00B /* Bitcoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */; }; - 65B92ADE1BE0E4A700F82024 /* Money.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65B92AD31BE0E4A700F82024 /* Money.framework */; }; - 65B92B071BE0E4D800F82024 /* Money.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65B92AFD1BE0E4D800F82024 /* Money.framework */; }; - 65B92B231BE0E4E700F82024 /* Money.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65B92B191BE0E4E700F82024 /* Money.framework */; }; - 65B92B351BE0E51E00F82024 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B92B331BE0E51E00F82024 /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 65B92B3C1BE0E70500F82024 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B92B331BE0E51E00F82024 /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 65B92B3D1BE0E70500F82024 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B92B331BE0E51E00F82024 /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 65B92B3E1BE0E70600F82024 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B92B331BE0E51E00F82024 /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 65DD22AE1BFA10F10054F62D /* BitcoinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A01BFA10DF0054F62D /* BitcoinTests.swift */; }; - 65DD22AF1BFA10F10054F62D /* DecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A11BFA10DF0054F62D /* DecimalTests.swift */; }; - 65DD22B31BFA10F10054F62D /* MoneyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AA1BFA10DF0054F62D /* MoneyTests.swift */; }; - 65DD22B41BFA10F10054F62D /* NSDecimalNumberTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AB1BFA10DF0054F62D /* NSDecimalNumberTests.swift */; }; - 65DD22B51BFA10F10054F62D /* NSDecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AC1BFA10DF0054F62D /* NSDecimalTests.swift */; }; - 65DD22B61BFA10F20054F62D /* BitcoinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A01BFA10DF0054F62D /* BitcoinTests.swift */; }; - 65DD22B71BFA10F20054F62D /* DecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A11BFA10DF0054F62D /* DecimalTests.swift */; }; - 65DD22BB1BFA10F20054F62D /* MoneyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AA1BFA10DF0054F62D /* MoneyTests.swift */; }; - 65DD22BC1BFA10F20054F62D /* NSDecimalNumberTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AB1BFA10DF0054F62D /* NSDecimalNumberTests.swift */; }; - 65DD22BD1BFA10F20054F62D /* NSDecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AC1BFA10DF0054F62D /* NSDecimalTests.swift */; }; - 65DD22BE1BFA10F30054F62D /* BitcoinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A01BFA10DF0054F62D /* BitcoinTests.swift */; }; - 65DD22BF1BFA10F30054F62D /* DecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22A11BFA10DF0054F62D /* DecimalTests.swift */; }; - 65DD22C31BFA10F30054F62D /* MoneyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AA1BFA10DF0054F62D /* MoneyTests.swift */; }; - 65DD22C41BFA10F30054F62D /* NSDecimalNumberTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AB1BFA10DF0054F62D /* NSDecimalNumberTests.swift */; }; - 65DD22C51BFA10F30054F62D /* NSDecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD22AC1BFA10DF0054F62D /* NSDecimalTests.swift */; }; - 65DD22C61BFA10F60054F62D /* ApplePayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DD229E1BFA10DF0054F62D /* ApplePayTests.swift */; }; - 65DEE3351BFA0F370043A718 /* ApplePay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3251BFA0F370043A718 /* ApplePay.swift */; }; - 65DEE3391BFA0F370043A718 /* Autogenerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3271BFA0F370043A718 /* Autogenerated.swift */; }; - 65DEE33A1BFA0F370043A718 /* Autogenerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3271BFA0F370043A718 /* Autogenerated.swift */; }; - 65DEE33B1BFA0F370043A718 /* Autogenerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3271BFA0F370043A718 /* Autogenerated.swift */; }; - 65DEE33C1BFA0F370043A718 /* Autogenerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3271BFA0F370043A718 /* Autogenerated.swift */; }; - 65DEE33D1BFA0F370043A718 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3281BFA0F370043A718 /* Currency.swift */; }; - 65DEE33E1BFA0F370043A718 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3281BFA0F370043A718 /* Currency.swift */; }; - 65DEE33F1BFA0F370043A718 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3281BFA0F370043A718 /* Currency.swift */; }; - 65DEE3401BFA0F370043A718 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3281BFA0F370043A718 /* Currency.swift */; }; - 65DEE3411BFA0F370043A718 /* Decimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32A1BFA0F370043A718 /* Decimal.swift */; }; - 65DEE3421BFA0F370043A718 /* Decimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32A1BFA0F370043A718 /* Decimal.swift */; }; - 65DEE3431BFA0F370043A718 /* Decimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32A1BFA0F370043A718 /* Decimal.swift */; }; - 65DEE3441BFA0F370043A718 /* Decimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32A1BFA0F370043A718 /* Decimal.swift */; }; - 65DEE3451BFA0F370043A718 /* DecimalNumberType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */; }; - 65DEE3461BFA0F370043A718 /* DecimalNumberType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */; }; - 65DEE3471BFA0F370043A718 /* DecimalNumberType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */; }; - 65DEE3481BFA0F370043A718 /* DecimalNumberType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */; }; - 65DEE3491BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */; }; - 65DEE34A1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */; }; - 65DEE34B1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */; }; - 65DEE34C1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */; }; - 65DEE34D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */; }; - 65DEE34E1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */; }; - 65DEE34F1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */; }; - 65DEE3501BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */; }; - 65DEE3611BFA0F370043A718 /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3331BFA0F370043A718 /* Money.swift */; }; - 65DEE3621BFA0F370043A718 /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3331BFA0F370043A718 /* Money.swift */; }; - 65DEE3631BFA0F370043A718 /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3331BFA0F370043A718 /* Money.swift */; }; - 65DEE3641BFA0F370043A718 /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3331BFA0F370043A718 /* Money.swift */; }; - 65DEE3651BFA0F370043A718 /* Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3341BFA0F370043A718 /* Support.swift */; }; - 65DEE3661BFA0F370043A718 /* Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3341BFA0F370043A718 /* Support.swift */; }; - 65DEE3671BFA0F370043A718 /* Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3341BFA0F370043A718 /* Support.swift */; }; - 65DEE3681BFA0F370043A718 /* Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DEE3341BFA0F370043A718 /* Support.swift */; }; + 655155121DB3D50700368D35 /* ApplePay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155111DB3D50700368D35 /* ApplePay.swift */; }; + 6551551F1DB3D59900368D35 /* ApplePayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155151DB3D59900368D35 /* ApplePayTests.swift */; }; + 655155201DB3D59900368D35 /* AutogeneratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155161DB3D59900368D35 /* AutogeneratedTests.swift */; }; + 655155211DB3D59900368D35 /* BitcoinTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155171DB3D59900368D35 /* BitcoinTests.swift */; }; + 655155221DB3D59900368D35 /* DecimalNumberTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155181DB3D59900368D35 /* DecimalNumberTypeTests.swift */; }; + 655155231DB3D59900368D35 /* DecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 655155191DB3D59900368D35 /* DecimalTests.swift */; }; + 655155251DB3D59900368D35 /* LocaleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6551551B1DB3D59900368D35 /* LocaleTests.swift */; }; + 655155261DB3D59900368D35 /* MoneyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6551551C1DB3D59900368D35 /* MoneyTests.swift */; }; + 655155271DB3D59900368D35 /* NSDecimalNumberTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6551551D1DB3D59900368D35 /* NSDecimalNumberTests.swift */; }; + 655155281DB3D59900368D35 /* NSDecimalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6551551E1DB3D59900368D35 /* NSDecimalTests.swift */; }; + 65599E7D1DB3D17F00EC123C /* Money.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65599E721DB3D17E00EC123C /* Money.framework */; }; + 65599E951DB3D2D500EC123C /* Autogenerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E8B1DB3D2D500EC123C /* Autogenerated.swift */; }; + 65599E961DB3D2D500EC123C /* Bitcoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E8C1DB3D2D500EC123C /* Bitcoin.swift */; }; + 65599E971DB3D2D500EC123C /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E8D1DB3D2D500EC123C /* Currency.swift */; }; + 65599E981DB3D2D500EC123C /* Decimal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E8E1DB3D2D500EC123C /* Decimal.swift */; }; + 65599E991DB3D2D500EC123C /* DecimalNumberType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E8F1DB3D2D500EC123C /* DecimalNumberType.swift */; }; + 65599E9A1DB3D2D500EC123C /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E901DB3D2D500EC123C /* Locale.swift */; }; + 65599E9B1DB3D2D500EC123C /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E911DB3D2D500EC123C /* Money.swift */; }; + 65599E9C1DB3D2D500EC123C /* NSDecimalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E921DB3D2D500EC123C /* NSDecimalExtensions.swift */; }; + 65599E9D1DB3D2D500EC123C /* NSDecimalNumberExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E931DB3D2D500EC123C /* NSDecimalNumberExtensions.swift */; }; + 65599E9E1DB3D2D500EC123C /* Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65599E941DB3D2D500EC123C /* Support.swift */; }; + 65ECB2B11DB3DC9900F96F46 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65599E6A1DB3CFD300EC123C /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 65A876DD1BE65FF600E26F22 /* PBXContainerItemProxy */ = { + 652899911DB3D96B0099D541 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; + containerPortal = 65599E611DB3CF2E00EC123C /* Project object */; proxyType = 1; - remoteGlobalIDString = 65A876D81BE65FAF00E26F22; + remoteGlobalIDString = 65687D5B1DB3D8B70016FB31; remoteInfo = "Generate Swift"; }; - 65A876DF1BE6600500E26F22 /* PBXContainerItemProxy */ = { + 65599E7E1DB3D17F00EC123C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; + containerPortal = 65599E611DB3CF2E00EC123C /* Project object */; proxyType = 1; - remoteGlobalIDString = 65A876D81BE65FAF00E26F22; - remoteInfo = "Generate Swift"; - }; - 65A876E11BE6602800E26F22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 65A876D81BE65FAF00E26F22; - remoteInfo = "Generate Swift"; - }; - 65A876E31BE6603100E26F22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 65A876D81BE65FAF00E26F22; - remoteInfo = "Generate Swift"; - }; - 65B92ADF1BE0E4A700F82024 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 65B92AD21BE0E4A700F82024; - remoteInfo = "Money-iOS"; - }; - 65B92B081BE0E4D800F82024 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 65B92AFC1BE0E4D800F82024; - remoteInfo = "Money-tvOS"; - }; - 65B92B241BE0E4E700F82024 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 65B92AC81BE0E46C00F82024 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 65B92B181BE0E4E700F82024; - remoteInfo = "Money-OSX"; + remoteGlobalIDString = 65599E711DB3D17E00EC123C; + remoteInfo = Money; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 6553909C1C037A1A00610C6F /* LocaleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocaleTests.swift; sourceTree = ""; }; - 65579F8B1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalNumberTypeTests.swift; sourceTree = ""; }; - 65579FB51C0228EB00C3F8C7 /* Locale.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locale.swift; sourceTree = ""; }; - 65579FC51C0288A300C3F8C7 /* AutogeneratedTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutogeneratedTests.swift; sourceTree = ""; }; - 6557F4C61BEB7F32003CD2BF /* ValueCoding.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValueCoding.framework; path = Carthage/Build/iOS/ValueCoding.framework; sourceTree = ""; }; - 6557F4C81BEB7F3D003CD2BF /* ValueCoding.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValueCoding.framework; path = Carthage/Build/watchOS/ValueCoding.framework; sourceTree = ""; }; - 6557F4CA1BEB7F46003CD2BF /* ValueCoding.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValueCoding.framework; path = Carthage/Build/tvOS/ValueCoding.framework; sourceTree = ""; }; - 6557F4CC1BEB7F51003CD2BF /* ValueCoding.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValueCoding.framework; path = Carthage/Build/Mac/ValueCoding.framework; sourceTree = ""; }; - 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bitcoin.swift; sourceTree = ""; }; - 65A876D61BE6491800E26F22 /* Generate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = "Supporting Files/Generate.swift"; sourceTree = SOURCE_ROOT; }; - 65B92AD31BE0E4A700F82024 /* Money.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Money.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92ADD1BE0E4A700F82024 /* Money-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Money-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92AF01BE0E4C800F82024 /* Money.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Money.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92AFD1BE0E4D800F82024 /* Money.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Money.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92B061BE0E4D800F82024 /* Money-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Money-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92B191BE0E4E700F82024 /* Money.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Money.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92B221BE0E4E700F82024 /* Money-OSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Money-OSXTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 65B92B321BE0E51E00F82024 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Supporting Files/Info.plist"; sourceTree = SOURCE_ROOT; }; - 65B92B331BE0E51E00F82024 /* Money.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Money.h; path = "Supporting Files/Money.h"; sourceTree = SOURCE_ROOT; }; - 65B92B361BE0E57800F82024 /* Money.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Money.xcconfig; path = "Supporting Files/Money.xcconfig"; sourceTree = SOURCE_ROOT; }; - 65B92B381BE0E69500F82024 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 65DD229E1BFA10DF0054F62D /* ApplePayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplePayTests.swift; sourceTree = ""; }; - 65DD22A01BFA10DF0054F62D /* BitcoinTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitcoinTests.swift; sourceTree = ""; }; - 65DD22A11BFA10DF0054F62D /* DecimalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalTests.swift; sourceTree = ""; }; - 65DD22AA1BFA10DF0054F62D /* MoneyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoneyTests.swift; sourceTree = ""; }; - 65DD22AB1BFA10DF0054F62D /* NSDecimalNumberTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalNumberTests.swift; sourceTree = ""; }; - 65DD22AC1BFA10DF0054F62D /* NSDecimalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalTests.swift; sourceTree = ""; }; - 65DEE3251BFA0F370043A718 /* ApplePay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplePay.swift; sourceTree = ""; }; - 65DEE3271BFA0F370043A718 /* Autogenerated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Autogenerated.swift; sourceTree = ""; }; - 65DEE3281BFA0F370043A718 /* Currency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Currency.swift; sourceTree = ""; }; - 65DEE32A1BFA0F370043A718 /* Decimal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Decimal.swift; sourceTree = ""; }; - 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalNumberType.swift; sourceTree = ""; }; - 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalExtensions.swift; sourceTree = ""; }; - 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalNumberExtensions.swift; sourceTree = ""; }; - 65DEE3331BFA0F370043A718 /* Money.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Money.swift; sourceTree = ""; }; - 65DEE3341BFA0F370043A718 /* Support.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Support.swift; sourceTree = ""; }; + 655155101DB3D45100368D35 /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Carthage.xcconfig; sourceTree = ""; }; + 655155111DB3D50700368D35 /* ApplePay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplePay.swift; sourceTree = ""; }; + 655155151DB3D59900368D35 /* ApplePayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplePayTests.swift; sourceTree = ""; }; + 655155161DB3D59900368D35 /* AutogeneratedTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutogeneratedTests.swift; sourceTree = ""; }; + 655155171DB3D59900368D35 /* BitcoinTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitcoinTests.swift; sourceTree = ""; }; + 655155181DB3D59900368D35 /* DecimalNumberTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalNumberTypeTests.swift; sourceTree = ""; }; + 655155191DB3D59900368D35 /* DecimalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalTests.swift; sourceTree = ""; }; + 6551551A1DB3D59900368D35 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 6551551B1DB3D59900368D35 /* LocaleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocaleTests.swift; sourceTree = ""; }; + 6551551C1DB3D59900368D35 /* MoneyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoneyTests.swift; sourceTree = ""; }; + 6551551D1DB3D59900368D35 /* NSDecimalNumberTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalNumberTests.swift; sourceTree = ""; }; + 6551551E1DB3D59900368D35 /* NSDecimalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalTests.swift; sourceTree = ""; }; + 65599E681DB3CFD300EC123C /* Generate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Generate.swift; sourceTree = ""; }; + 65599E691DB3CFD300EC123C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 65599E6A1DB3CFD300EC123C /* Money.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Money.h; sourceTree = ""; }; + 65599E6B1DB3CFD300EC123C /* Money.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Money.xcconfig; sourceTree = ""; }; + 65599E6C1DB3CFD300EC123C /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = ""; }; + 65599E721DB3D17E00EC123C /* Money.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Money.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 65599E7C1DB3D17F00EC123C /* MoneyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MoneyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 65599E8B1DB3D2D500EC123C /* Autogenerated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Autogenerated.swift; sourceTree = ""; }; + 65599E8C1DB3D2D500EC123C /* Bitcoin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bitcoin.swift; sourceTree = ""; }; + 65599E8D1DB3D2D500EC123C /* Currency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Currency.swift; sourceTree = ""; }; + 65599E8E1DB3D2D500EC123C /* Decimal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Decimal.swift; sourceTree = ""; }; + 65599E8F1DB3D2D500EC123C /* DecimalNumberType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecimalNumberType.swift; sourceTree = ""; }; + 65599E901DB3D2D500EC123C /* Locale.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locale.swift; sourceTree = ""; }; + 65599E911DB3D2D500EC123C /* Money.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Money.swift; sourceTree = ""; }; + 65599E921DB3D2D500EC123C /* NSDecimalExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalExtensions.swift; sourceTree = ""; }; + 65599E931DB3D2D500EC123C /* NSDecimalNumberExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDecimalNumberExtensions.swift; sourceTree = ""; }; + 65599E941DB3D2D500EC123C /* Support.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Support.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 65B92ACF1BE0E4A700F82024 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6557F4C71BEB7F32003CD2BF /* ValueCoding.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92ADA1BE0E4A700F82024 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 65B92ADE1BE0E4A700F82024 /* Money.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AEC1BE0E4C800F82024 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6557F4C91BEB7F3D003CD2BF /* ValueCoding.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AF91BE0E4D800F82024 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6557F4CB1BEB7F46003CD2BF /* ValueCoding.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B031BE0E4D800F82024 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 65B92B071BE0E4D800F82024 /* Money.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B151BE0E4E700F82024 /* Frameworks */ = { + 65599E6E1DB3D17E00EC123C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6557F4CD1BEB7F51003CD2BF /* ValueCoding.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 65B92B1F1BE0E4E700F82024 /* Frameworks */ = { + 65599E791DB3D17F00EC123C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 65B92B231BE0E4E700F82024 /* Money.framework in Frameworks */, + 65599E7D1DB3D17F00EC123C /* Money.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 65B92AC71BE0E46C00F82024 = { - isa = PBXGroup; - children = ( - 65B92B301BE0E51E00F82024 /* Money */, - 65B92B371BE0E69500F82024 /* Tests */, - 65B92B311BE0E51E00F82024 /* Supporting Files */, - 65B92AD41BE0E4A700F82024 /* Products */, - 65D3055E1BE94FE10032D99F /* Dependencies */, - ); - sourceTree = ""; - }; - 65B92AD41BE0E4A700F82024 /* Products */ = { - isa = PBXGroup; - children = ( - 65B92AD31BE0E4A700F82024 /* Money.framework */, - 65B92ADD1BE0E4A700F82024 /* Money-iOSTests.xctest */, - 65B92AF01BE0E4C800F82024 /* Money.framework */, - 65B92AFD1BE0E4D800F82024 /* Money.framework */, - 65B92B061BE0E4D800F82024 /* Money-tvOSTests.xctest */, - 65B92B191BE0E4E700F82024 /* Money.framework */, - 65B92B221BE0E4E700F82024 /* Money-OSXTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 65B92B301BE0E51E00F82024 /* Money */ = { - isa = PBXGroup; - children = ( - 65DEE3241BFA0F370043A718 /* iOS */, - 65DEE3261BFA0F370043A718 /* Shared */, - ); - path = Money; - sourceTree = ""; - }; - 65B92B311BE0E51E00F82024 /* Supporting Files */ = { + 655155131DB3D56400368D35 /* ... */ = { isa = PBXGroup; children = ( - 65B92B331BE0E51E00F82024 /* Money.h */, - 65B92B321BE0E51E00F82024 /* Info.plist */, - 65A876D61BE6491800E26F22 /* Generate.swift */, - 65B92B361BE0E57800F82024 /* Money.xcconfig */, + 65599E671DB3CFD300EC123C /* Supporting Files */, + 65599E731DB3D17E00EC123C /* Products */, ); - name = "Supporting Files"; - path = "Money/Supporting Files"; + name = ...; sourceTree = ""; }; - 65B92B371BE0E69500F82024 /* Tests */ = { + 655155141DB3D59900368D35 /* Tests */ = { isa = PBXGroup; children = ( - 65B92B381BE0E69500F82024 /* Info.plist */, - 65DD229D1BFA10DF0054F62D /* iOS */, - 65DD229F1BFA10DF0054F62D /* Shared */, + 6551551A1DB3D59900368D35 /* Info.plist */, + 655155151DB3D59900368D35 /* ApplePayTests.swift */, + 655155161DB3D59900368D35 /* AutogeneratedTests.swift */, + 655155171DB3D59900368D35 /* BitcoinTests.swift */, + 655155181DB3D59900368D35 /* DecimalNumberTypeTests.swift */, + 655155191DB3D59900368D35 /* DecimalTests.swift */, + 6551551B1DB3D59900368D35 /* LocaleTests.swift */, + 6551551C1DB3D59900368D35 /* MoneyTests.swift */, + 6551551D1DB3D59900368D35 /* NSDecimalNumberTests.swift */, + 6551551E1DB3D59900368D35 /* NSDecimalTests.swift */, ); path = Tests; sourceTree = ""; }; - 65D3055E1BE94FE10032D99F /* Dependencies */ = { + 65599E601DB3CF2E00EC123C = { isa = PBXGroup; children = ( - 6557F4CC1BEB7F51003CD2BF /* ValueCoding.framework */, - 6557F4CA1BEB7F46003CD2BF /* ValueCoding.framework */, - 6557F4C81BEB7F3D003CD2BF /* ValueCoding.framework */, - 6557F4C61BEB7F32003CD2BF /* ValueCoding.framework */, + 65599E8A1DB3D2D500EC123C /* Sources */, + 655155141DB3D59900368D35 /* Tests */, + 655155131DB3D56400368D35 /* ... */, ); - name = Dependencies; sourceTree = ""; }; - 65DD229D1BFA10DF0054F62D /* iOS */ = { + 65599E671DB3CFD300EC123C /* Supporting Files */ = { isa = PBXGroup; children = ( - 65DD229E1BFA10DF0054F62D /* ApplePayTests.swift */, - ); - path = iOS; - sourceTree = ""; - }; - 65DD229F1BFA10DF0054F62D /* Shared */ = { - isa = PBXGroup; - children = ( - 65579FC51C0288A300C3F8C7 /* AutogeneratedTests.swift */, - 65DD22A01BFA10DF0054F62D /* BitcoinTests.swift */, - 65579F8B1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift */, - 65DD22A11BFA10DF0054F62D /* DecimalTests.swift */, - 6553909C1C037A1A00610C6F /* LocaleTests.swift */, - 65DD22AA1BFA10DF0054F62D /* MoneyTests.swift */, - 65DD22AB1BFA10DF0054F62D /* NSDecimalNumberTests.swift */, - 65DD22AC1BFA10DF0054F62D /* NSDecimalTests.swift */, - ); - path = Shared; - sourceTree = ""; - }; - 65DEE3241BFA0F370043A718 /* iOS */ = { - isa = PBXGroup; - children = ( - 65DEE3251BFA0F370043A718 /* ApplePay.swift */, - ); - path = iOS; + 65599E6A1DB3CFD300EC123C /* Money.h */, + 65599E691DB3CFD300EC123C /* Info.plist */, + 65599E681DB3CFD300EC123C /* Generate.swift */, + 655155101DB3D45100368D35 /* Carthage.xcconfig */, + 65599E6B1DB3CFD300EC123C /* Money.xcconfig */, + 65599E6C1DB3CFD300EC123C /* Version.xcconfig */, + ); + path = "Supporting Files"; sourceTree = ""; }; - 65DEE3261BFA0F370043A718 /* Shared */ = { + 65599E731DB3D17E00EC123C /* Products */ = { isa = PBXGroup; children = ( - 65DEE3271BFA0F370043A718 /* Autogenerated.swift */, - 65882AFA1C6CAF9A0056E00B /* Bitcoin.swift */, - 65DEE3281BFA0F370043A718 /* Currency.swift */, - 65579FB51C0228EB00C3F8C7 /* Locale.swift */, - 65DEE3331BFA0F370043A718 /* Money.swift */, - 65DEE3341BFA0F370043A718 /* Support.swift */, - 65DEE3291BFA0F370043A718 /* Decimal */, + 65599E721DB3D17E00EC123C /* Money.framework */, + 65599E7C1DB3D17F00EC123C /* MoneyTests.xctest */, ); - path = Shared; + name = Products; sourceTree = ""; }; - 65DEE3291BFA0F370043A718 /* Decimal */ = { + 65599E8A1DB3D2D500EC123C /* Sources */ = { isa = PBXGroup; children = ( - 65DEE32A1BFA0F370043A718 /* Decimal.swift */, - 65DEE32B1BFA0F370043A718 /* DecimalNumberType.swift */, - 65DEE32C1BFA0F370043A718 /* NSDecimalExtensions.swift */, - 65DEE32D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift */, - ); - path = Decimal; + 655155111DB3D50700368D35 /* ApplePay.swift */, + 65599E8B1DB3D2D500EC123C /* Autogenerated.swift */, + 65599E8C1DB3D2D500EC123C /* Bitcoin.swift */, + 65599E8D1DB3D2D500EC123C /* Currency.swift */, + 65599E8E1DB3D2D500EC123C /* Decimal.swift */, + 65599E8F1DB3D2D500EC123C /* DecimalNumberType.swift */, + 65599E901DB3D2D500EC123C /* Locale.swift */, + 65599E911DB3D2D500EC123C /* Money.swift */, + 65599E921DB3D2D500EC123C /* NSDecimalExtensions.swift */, + 65599E931DB3D2D500EC123C /* NSDecimalNumberExtensions.swift */, + 65599E941DB3D2D500EC123C /* Support.swift */, + ); + path = Sources; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 65B92AD01BE0E4A700F82024 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 65B92B351BE0E51E00F82024 /* Money.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AED1BE0E4C800F82024 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 65B92B3C1BE0E70500F82024 /* Money.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AFA1BE0E4D800F82024 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 65B92B3D1BE0E70500F82024 /* Money.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B161BE0E4E700F82024 /* Headers */ = { + 65599E6F1DB3D17E00EC123C /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 65B92B3E1BE0E70600F82024 /* Money.h in Headers */, + 65ECB2B11DB3DC9900F96F46 /* Money.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 65B92AD21BE0E4A700F82024 /* Money-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 65B92AE91BE0E4A700F82024 /* Build configuration list for PBXNativeTarget "Money-iOS" */; - buildPhases = ( - 65B92ACE1BE0E4A700F82024 /* Sources */, - 65B92ACF1BE0E4A700F82024 /* Frameworks */, - 65B92AD01BE0E4A700F82024 /* Headers */, - 65B92AD11BE0E4A700F82024 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 65A876DE1BE65FF600E26F22 /* PBXTargetDependency */, - ); - name = "Money-iOS"; - productName = "Money-iOS"; - productReference = 65B92AD31BE0E4A700F82024 /* Money.framework */; - productType = "com.apple.product-type.framework"; - }; - 65B92ADC1BE0E4A700F82024 /* Money-iOSTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 65B92AEA1BE0E4A700F82024 /* Build configuration list for PBXNativeTarget "Money-iOSTests" */; - buildPhases = ( - 65B92AD91BE0E4A700F82024 /* Sources */, - 65B92ADA1BE0E4A700F82024 /* Frameworks */, - 65B92ADB1BE0E4A700F82024 /* Resources */, - 65D305641BE955AE0032D99F /* Carthage Copy Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 65B92AE01BE0E4A700F82024 /* PBXTargetDependency */, - ); - name = "Money-iOSTests"; - productName = "Money-iOSTests"; - productReference = 65B92ADD1BE0E4A700F82024 /* Money-iOSTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 65B92AEF1BE0E4C800F82024 /* Money-watchOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 65B92AF51BE0E4C800F82024 /* Build configuration list for PBXNativeTarget "Money-watchOS" */; - buildPhases = ( - 65B92AEB1BE0E4C800F82024 /* Sources */, - 65B92AEC1BE0E4C800F82024 /* Frameworks */, - 65B92AED1BE0E4C800F82024 /* Headers */, - 65B92AEE1BE0E4C800F82024 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 65A876E01BE6600500E26F22 /* PBXTargetDependency */, - ); - name = "Money-watchOS"; - productName = "Money-watchOS"; - productReference = 65B92AF01BE0E4C800F82024 /* Money.framework */; - productType = "com.apple.product-type.framework"; - }; - 65B92AFC1BE0E4D800F82024 /* Money-tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 65B92B0E1BE0E4D800F82024 /* Build configuration list for PBXNativeTarget "Money-tvOS" */; - buildPhases = ( - 65B92AF81BE0E4D800F82024 /* Sources */, - 65B92AF91BE0E4D800F82024 /* Frameworks */, - 65B92AFA1BE0E4D800F82024 /* Headers */, - 65B92AFB1BE0E4D800F82024 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 65A876E21BE6602800E26F22 /* PBXTargetDependency */, - ); - name = "Money-tvOS"; - productName = "Money-tvOS"; - productReference = 65B92AFD1BE0E4D800F82024 /* Money.framework */; - productType = "com.apple.product-type.framework"; - }; - 65B92B051BE0E4D800F82024 /* Money-tvOSTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 65B92B111BE0E4D800F82024 /* Build configuration list for PBXNativeTarget "Money-tvOSTests" */; - buildPhases = ( - 65B92B021BE0E4D800F82024 /* Sources */, - 65B92B031BE0E4D800F82024 /* Frameworks */, - 65B92B041BE0E4D800F82024 /* Resources */, - 65D305651BE956060032D99F /* Carthage Copy Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 65B92B091BE0E4D800F82024 /* PBXTargetDependency */, - ); - name = "Money-tvOSTests"; - productName = "Money-tvOSTests"; - productReference = 65B92B061BE0E4D800F82024 /* Money-tvOSTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 65B92B181BE0E4E700F82024 /* Money-OSX */ = { + 65599E711DB3D17E00EC123C /* Money */ = { isa = PBXNativeTarget; - buildConfigurationList = 65B92B2A1BE0E4E700F82024 /* Build configuration list for PBXNativeTarget "Money-OSX" */; + buildConfigurationList = 65599E881DB3D17F00EC123C /* Build configuration list for PBXNativeTarget "Money" */; buildPhases = ( - 65B92B141BE0E4E700F82024 /* Sources */, - 65B92B151BE0E4E700F82024 /* Frameworks */, - 65B92B161BE0E4E700F82024 /* Headers */, - 65B92B171BE0E4E700F82024 /* Resources */, + 65599E6D1DB3D17E00EC123C /* Sources */, + 65599E6E1DB3D17E00EC123C /* Frameworks */, + 65599E6F1DB3D17E00EC123C /* Headers */, + 65599E701DB3D17E00EC123C /* Resources */, ); buildRules = ( ); dependencies = ( - 65A876E41BE6603100E26F22 /* PBXTargetDependency */, + 652899921DB3D96B0099D541 /* PBXTargetDependency */, ); - name = "Money-OSX"; - productName = "Money-OSX"; - productReference = 65B92B191BE0E4E700F82024 /* Money.framework */; + name = Money; + productName = Money; + productReference = 65599E721DB3D17E00EC123C /* Money.framework */; productType = "com.apple.product-type.framework"; }; - 65B92B211BE0E4E700F82024 /* Money-OSXTests */ = { + 65599E7B1DB3D17F00EC123C /* MoneyTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 65B92B2D1BE0E4E700F82024 /* Build configuration list for PBXNativeTarget "Money-OSXTests" */; + buildConfigurationList = 65599E891DB3D17F00EC123C /* Build configuration list for PBXNativeTarget "MoneyTests" */; buildPhases = ( - 65B92B1E1BE0E4E700F82024 /* Sources */, - 65B92B1F1BE0E4E700F82024 /* Frameworks */, - 65B92B201BE0E4E700F82024 /* Resources */, - 65D305661BE956230032D99F /* Carthage Copy Frameworks */, + 65599E781DB3D17F00EC123C /* Sources */, + 65599E791DB3D17F00EC123C /* Frameworks */, + 65599E7A1DB3D17F00EC123C /* Resources */, + 65ECB2B21DB3DD9F00F96F46 /* Copy Carthage Frameworks */, ); buildRules = ( ); dependencies = ( - 65B92B251BE0E4E700F82024 /* PBXTargetDependency */, + 65599E7F1DB3D17F00EC123C /* PBXTargetDependency */, ); - name = "Money-OSXTests"; - productName = "Money-OSXTests"; - productReference = 65B92B221BE0E4E700F82024 /* Money-OSXTests.xctest */; + name = MoneyTests; + productName = MoneyTests; + productReference = 65599E7C1DB3D17F00EC123C /* MoneyTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 65B92AC81BE0E46C00F82024 /* Project object */ = { + 65599E611DB3CF2E00EC123C /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0720; + LastSwiftUpdateCheck = 0730; + LastUpgradeCheck = 0800; TargetAttributes = { - 65A876D81BE65FAF00E26F22 = { - CreatedOnToolsVersion = 7.1; - }; - 65B92AD21BE0E4A700F82024 = { - CreatedOnToolsVersion = 7.1; - }; - 65B92ADC1BE0E4A700F82024 = { - CreatedOnToolsVersion = 7.1; - }; - 65B92AEF1BE0E4C800F82024 = { - CreatedOnToolsVersion = 7.1; - }; - 65B92AFC1BE0E4D800F82024 = { - CreatedOnToolsVersion = 7.1; + 65599E711DB3D17E00EC123C = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; }; - 65B92B051BE0E4D800F82024 = { - CreatedOnToolsVersion = 7.1; + 65599E7B1DB3D17F00EC123C = { + CreatedOnToolsVersion = 7.3.1; }; - 65B92B181BE0E4E700F82024 = { - CreatedOnToolsVersion = 7.1; - }; - 65B92B211BE0E4E700F82024 = { - CreatedOnToolsVersion = 7.1; + 65687D5B1DB3D8B70016FB31 = { + CreatedOnToolsVersion = 7.3.1; }; }; }; - buildConfigurationList = 65B92ACB1BE0E46C00F82024 /* Build configuration list for PBXProject "Money" */; + buildConfigurationList = 65599E641DB3CF2E00EC123C /* Build configuration list for PBXProject "Money" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 65B92AC71BE0E46C00F82024; - productRefGroup = 65B92AD41BE0E4A700F82024 /* Products */; + mainGroup = 65599E601DB3CF2E00EC123C; + productRefGroup = 65599E731DB3D17E00EC123C /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 65A876D81BE65FAF00E26F22 /* Generate Swift */, - 65B92AD21BE0E4A700F82024 /* Money-iOS */, - 65B92ADC1BE0E4A700F82024 /* Money-iOSTests */, - 65B92AEF1BE0E4C800F82024 /* Money-watchOS */, - 65B92AFC1BE0E4D800F82024 /* Money-tvOS */, - 65B92B051BE0E4D800F82024 /* Money-tvOSTests */, - 65B92B181BE0E4E700F82024 /* Money-OSX */, - 65B92B211BE0E4E700F82024 /* Money-OSXTests */, + 65687D5B1DB3D8B70016FB31 /* Generate Swift */, + 65599E711DB3D17E00EC123C /* Money */, + 65599E7B1DB3D17F00EC123C /* MoneyTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 65B92AD11BE0E4A700F82024 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92ADB1BE0E4A700F82024 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AEE1BE0E4C800F82024 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AFB1BE0E4D800F82024 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B041BE0E4D800F82024 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B171BE0E4E700F82024 /* Resources */ = { + 65599E701DB3D17E00EC123C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 65B92B201BE0E4E700F82024 /* Resources */ = { + 65599E7A1DB3D17F00EC123C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -657,7 +298,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 65A876DC1BE65FDA00E26F22 /* Generate Currency Type */ = { + 65687D5F1DB3D8C30016FB31 /* Generate Swift */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -665,260 +306,106 @@ inputPaths = ( "$(SRCROOT)/Supporting Files/Generate.swift", ); - name = "Generate Currency Type"; - outputPaths = ( - "$(SRCROOT)/Money/Shared/Autogenerated.swift", - "$(SRCROOT)/Tests/Shared/AutogeneratedTests.swift", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_1\"\n\n\n\n\n"; - }; - 65D305641BE955AE0032D99F /* Carthage Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/ValueCoding.framework", - ); - name = "Carthage Copy Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - 65D305651BE956060032D99F /* Carthage Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/tvOS/ValueCoding.framework", - ); - name = "Carthage Copy Frameworks"; + name = "Generate Swift"; outputPaths = ( + "$(SRCROOT)/Sources/Autogenerated.swift", + "$(SRCROOT)/Tests/AutogeneratedTests.swift", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; + shellScript = "\"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_1\""; }; - 65D305661BE956230032D99F /* Carthage Copy Frameworks */ = { + 65ECB2B21DB3DD9F00F96F46 /* Copy Carthage Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "$(SRCROOT)/Carthage/Build/Mac/ValueCoding.framework", + ValueCoding, ); - name = "Carthage Copy Frameworks"; + name = "Copy Carthage Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; + shellScript = "case \"$PLATFORM_NAME\" in\nmacosx) plat=Mac;;\niphone*) plat=iOS;;\nwatch*) plat=watchOS;;\nappletv*) plat=tvOS;;\n*) echo \"error: Unknown PLATFORM_NAME: $PLATFORM_NAME\"; exit 1;;\nesac\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nframework=$(basename \"${!VAR}\")\nexport SCRIPT_INPUT_FILE_$n=\"$SRCROOT\"/Carthage/Build/$plat/\"$framework\".framework\ndone\n\n/usr/local/bin/carthage copy-frameworks || exit\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nsource=${!VAR}.dSYM\ndest=${BUILT_PRODUCTS_DIR}/$(basename \"$source\")\nditto \"$source\" \"$dest\" || exit\ndone"; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 65B92ACE1BE0E4A700F82024 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 65DEE3651BFA0F370043A718 /* Support.swift in Sources */, - 65579FB61C0228EB00C3F8C7 /* Locale.swift in Sources */, - 65DEE3451BFA0F370043A718 /* DecimalNumberType.swift in Sources */, - 65DEE3491BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */, - 65DEE34D1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */, - 65DEE3411BFA0F370043A718 /* Decimal.swift in Sources */, - 65DEE33D1BFA0F370043A718 /* Currency.swift in Sources */, - 65882AFB1C6CB02C0056E00B /* Bitcoin.swift in Sources */, - 65DEE3611BFA0F370043A718 /* Money.swift in Sources */, - 65DEE3391BFA0F370043A718 /* Autogenerated.swift in Sources */, - 65DEE3351BFA0F370043A718 /* ApplePay.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AD91BE0E4A700F82024 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 65DD22BE1BFA10F30054F62D /* BitcoinTests.swift in Sources */, - 65DD22C51BFA10F30054F62D /* NSDecimalTests.swift in Sources */, - 65DD22C31BFA10F30054F62D /* MoneyTests.swift in Sources */, - 65579F8C1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */, - 65DD22C61BFA10F60054F62D /* ApplePayTests.swift in Sources */, - 65DD22C41BFA10F30054F62D /* NSDecimalNumberTests.swift in Sources */, - 65DD22BF1BFA10F30054F62D /* DecimalTests.swift in Sources */, - 65579FC61C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */, - 6553909D1C037A1A00610C6F /* LocaleTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AEB1BE0E4C800F82024 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 65DEE3661BFA0F370043A718 /* Support.swift in Sources */, - 65DEE3461BFA0F370043A718 /* DecimalNumberType.swift in Sources */, - 65DEE34A1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */, - 65DEE34E1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */, - 65DEE3421BFA0F370043A718 /* Decimal.swift in Sources */, - 65DEE33E1BFA0F370043A718 /* Currency.swift in Sources */, - 65882AFC1C6CB02D0056E00B /* Bitcoin.swift in Sources */, - 65DEE3621BFA0F370043A718 /* Money.swift in Sources */, - 65579FB71C0228EB00C3F8C7 /* Locale.swift in Sources */, - 65DEE33A1BFA0F370043A718 /* Autogenerated.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92AF81BE0E4D800F82024 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 65DEE3671BFA0F370043A718 /* Support.swift in Sources */, - 65DEE3471BFA0F370043A718 /* DecimalNumberType.swift in Sources */, - 65DEE34B1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */, - 65DEE34F1BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */, - 65DEE3431BFA0F370043A718 /* Decimal.swift in Sources */, - 65DEE33F1BFA0F370043A718 /* Currency.swift in Sources */, - 65882AFD1C6CB02D0056E00B /* Bitcoin.swift in Sources */, - 65DEE3631BFA0F370043A718 /* Money.swift in Sources */, - 65579FB81C0228EB00C3F8C7 /* Locale.swift in Sources */, - 65DEE33B1BFA0F370043A718 /* Autogenerated.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B021BE0E4D800F82024 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 65579FC71C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */, - 65DD22B61BFA10F20054F62D /* BitcoinTests.swift in Sources */, - 65DD22BD1BFA10F20054F62D /* NSDecimalTests.swift in Sources */, - 65DD22BB1BFA10F20054F62D /* MoneyTests.swift in Sources */, - 65DD22BC1BFA10F20054F62D /* NSDecimalNumberTests.swift in Sources */, - 6553909E1C037A1A00610C6F /* LocaleTests.swift in Sources */, - 65579F8D1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */, - 65DD22B71BFA10F20054F62D /* DecimalTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 65B92B141BE0E4E700F82024 /* Sources */ = { + 65599E6D1DB3D17E00EC123C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 65DEE3681BFA0F370043A718 /* Support.swift in Sources */, - 65DEE3481BFA0F370043A718 /* DecimalNumberType.swift in Sources */, - 65DEE34C1BFA0F370043A718 /* NSDecimalExtensions.swift in Sources */, - 65DEE3501BFA0F370043A718 /* NSDecimalNumberExtensions.swift in Sources */, - 65DEE3441BFA0F370043A718 /* Decimal.swift in Sources */, - 65DEE3401BFA0F370043A718 /* Currency.swift in Sources */, - 65882AFE1C6CB02E0056E00B /* Bitcoin.swift in Sources */, - 65DEE3641BFA0F370043A718 /* Money.swift in Sources */, - 65579FB91C0228EB00C3F8C7 /* Locale.swift in Sources */, - 65DEE33C1BFA0F370043A718 /* Autogenerated.swift in Sources */, + 65599E971DB3D2D500EC123C /* Currency.swift in Sources */, + 65599E9E1DB3D2D500EC123C /* Support.swift in Sources */, + 65599E9D1DB3D2D500EC123C /* NSDecimalNumberExtensions.swift in Sources */, + 65599E961DB3D2D500EC123C /* Bitcoin.swift in Sources */, + 65599E9B1DB3D2D500EC123C /* Money.swift in Sources */, + 65599E991DB3D2D500EC123C /* DecimalNumberType.swift in Sources */, + 65599E9C1DB3D2D500EC123C /* NSDecimalExtensions.swift in Sources */, + 65599E951DB3D2D500EC123C /* Autogenerated.swift in Sources */, + 65599E981DB3D2D500EC123C /* Decimal.swift in Sources */, + 655155121DB3D50700368D35 /* ApplePay.swift in Sources */, + 65599E9A1DB3D2D500EC123C /* Locale.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 65B92B1E1BE0E4E700F82024 /* Sources */ = { + 65599E781DB3D17F00EC123C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 65579FC81C0288A300C3F8C7 /* AutogeneratedTests.swift in Sources */, - 65DD22B51BFA10F10054F62D /* NSDecimalTests.swift in Sources */, - 65DD22B41BFA10F10054F62D /* NSDecimalNumberTests.swift in Sources */, - 65DD22AF1BFA10F10054F62D /* DecimalTests.swift in Sources */, - 65DD22B31BFA10F10054F62D /* MoneyTests.swift in Sources */, - 6553909F1C037A1A00610C6F /* LocaleTests.swift in Sources */, - 65579F8E1C01F0C100C3F8C7 /* DecimalNumberTypeTests.swift in Sources */, - 65DD22AE1BFA10F10054F62D /* BitcoinTests.swift in Sources */, + 655155231DB3D59900368D35 /* DecimalTests.swift in Sources */, + 655155271DB3D59900368D35 /* NSDecimalNumberTests.swift in Sources */, + 655155221DB3D59900368D35 /* DecimalNumberTypeTests.swift in Sources */, + 655155211DB3D59900368D35 /* BitcoinTests.swift in Sources */, + 655155201DB3D59900368D35 /* AutogeneratedTests.swift in Sources */, + 6551551F1DB3D59900368D35 /* ApplePayTests.swift in Sources */, + 655155251DB3D59900368D35 /* LocaleTests.swift in Sources */, + 655155281DB3D59900368D35 /* NSDecimalTests.swift in Sources */, + 655155261DB3D59900368D35 /* MoneyTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 65A876DE1BE65FF600E26F22 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 65A876D81BE65FAF00E26F22 /* Generate Swift */; - targetProxy = 65A876DD1BE65FF600E26F22 /* PBXContainerItemProxy */; - }; - 65A876E01BE6600500E26F22 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 65A876D81BE65FAF00E26F22 /* Generate Swift */; - targetProxy = 65A876DF1BE6600500E26F22 /* PBXContainerItemProxy */; - }; - 65A876E21BE6602800E26F22 /* PBXTargetDependency */ = { + 652899921DB3D96B0099D541 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 65A876D81BE65FAF00E26F22 /* Generate Swift */; - targetProxy = 65A876E11BE6602800E26F22 /* PBXContainerItemProxy */; + target = 65687D5B1DB3D8B70016FB31 /* Generate Swift */; + targetProxy = 652899911DB3D96B0099D541 /* PBXContainerItemProxy */; }; - 65A876E41BE6603100E26F22 /* PBXTargetDependency */ = { + 65599E7F1DB3D17F00EC123C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 65A876D81BE65FAF00E26F22 /* Generate Swift */; - targetProxy = 65A876E31BE6603100E26F22 /* PBXContainerItemProxy */; - }; - 65B92AE01BE0E4A700F82024 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 65B92AD21BE0E4A700F82024 /* Money-iOS */; - targetProxy = 65B92ADF1BE0E4A700F82024 /* PBXContainerItemProxy */; - }; - 65B92B091BE0E4D800F82024 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 65B92AFC1BE0E4D800F82024 /* Money-tvOS */; - targetProxy = 65B92B081BE0E4D800F82024 /* PBXContainerItemProxy */; - }; - 65B92B251BE0E4E700F82024 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 65B92B181BE0E4E700F82024 /* Money-OSX */; - targetProxy = 65B92B241BE0E4E700F82024 /* PBXContainerItemProxy */; + target = 65599E711DB3D17E00EC123C /* Money */; + targetProxy = 65599E7E1DB3D17F00EC123C /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 65A876DA1BE65FAF00E26F22 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 65A876DB1BE65FAF00E26F22 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 65B92ACC1BE0E46C00F82024 /* Debug */ = { + 65599E651DB3CF2E00EC123C /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 65599E6B1DB3CFD300EC123C /* Money.xcconfig */; buildSettings = { - CLANG_ENABLE_CODE_COVERAGE = YES; ENABLE_TESTABILITY = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; - 65B92ACD1BE0E46C00F82024 /* Release */ = { + 65599E661DB3CF2E00EC123C /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 65599E6B1DB3CFD300EC123C /* Money.xcconfig */; buildSettings = { - CLANG_ENABLE_CODE_COVERAGE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; }; - 65B92AE51BE0E4A700F82024 /* Debug */ = { + 65599E841DB3D17F00EC123C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -932,17 +419,17 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; + FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -957,25 +444,20 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 65B92AE61BE0E4A700F82024 /* Release */ = { + 65599E851DB3D17F00EC123C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -989,338 +471,17 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 65B92AE71BE0E4A700F82024 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-iOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 65B92AE81BE0E4A700F82024 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-iOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 65B92AF61BE0E4C800F82024 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/watchOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 4; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 65B92AF71BE0E4C800F82024 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/watchOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = watchos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 4; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 65B92B0F1BE0E4D800F82024 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 65B92B101BE0E4D800F82024 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); + FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1329,119 +490,19 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = appletvos; SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 65B92B121BE0E4D800F82024 /* Debug */ = { + 65599E861DB3D17F00EC123C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-tvOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TVOS_DEPLOYMENT_TARGET = 9.0; - }; - name = Debug; - }; - 65B92B131BE0E4D800F82024 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-tvOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 65B92B2B1BE0E4E700F82024 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1458,19 +519,9 @@ CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1485,24 +536,20 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + TVOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; }; - 65B92B2C1BE0E4E700F82024 /* Release */ = { + 65599E871DB3D17F00EC123C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 65B92B361BE0E57800F82024 /* Money.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1519,19 +566,9 @@ CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1540,200 +577,68 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + TVOS_DEPLOYMENT_TARGET = 10.0; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release; }; - 65B92B2E1BE0E4E700F82024 /* Debug */ = { + 65687D5C1DB3D8B70016FB31 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-OSXTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; - 65B92B2F1BE0E4E700F82024 /* Release */ = { + 65687D5D1DB3D8B70016FB31 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "me.danthorpe.Money-OSXTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 65A876D91BE65FAF00E26F22 /* Build configuration list for PBXAggregateTarget "Generate Swift" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 65A876DA1BE65FAF00E26F22 /* Debug */, - 65A876DB1BE65FAF00E26F22 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 65B92ACB1BE0E46C00F82024 /* Build configuration list for PBXProject "Money" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 65B92ACC1BE0E46C00F82024 /* Debug */, - 65B92ACD1BE0E46C00F82024 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 65B92AE91BE0E4A700F82024 /* Build configuration list for PBXNativeTarget "Money-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 65B92AE51BE0E4A700F82024 /* Debug */, - 65B92AE61BE0E4A700F82024 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 65B92AEA1BE0E4A700F82024 /* Build configuration list for PBXNativeTarget "Money-iOSTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 65B92AE71BE0E4A700F82024 /* Debug */, - 65B92AE81BE0E4A700F82024 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 65B92AF51BE0E4C800F82024 /* Build configuration list for PBXNativeTarget "Money-watchOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 65B92AF61BE0E4C800F82024 /* Debug */, - 65B92AF71BE0E4C800F82024 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 65B92B0E1BE0E4D800F82024 /* Build configuration list for PBXNativeTarget "Money-tvOS" */ = { + 65599E641DB3CF2E00EC123C /* Build configuration list for PBXProject "Money" */ = { isa = XCConfigurationList; buildConfigurations = ( - 65B92B0F1BE0E4D800F82024 /* Debug */, - 65B92B101BE0E4D800F82024 /* Release */, + 65599E651DB3CF2E00EC123C /* Debug */, + 65599E661DB3CF2E00EC123C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 65B92B111BE0E4D800F82024 /* Build configuration list for PBXNativeTarget "Money-tvOSTests" */ = { + 65599E881DB3D17F00EC123C /* Build configuration list for PBXNativeTarget "Money" */ = { isa = XCConfigurationList; buildConfigurations = ( - 65B92B121BE0E4D800F82024 /* Debug */, - 65B92B131BE0E4D800F82024 /* Release */, + 65599E841DB3D17F00EC123C /* Debug */, + 65599E851DB3D17F00EC123C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 65B92B2A1BE0E4E700F82024 /* Build configuration list for PBXNativeTarget "Money-OSX" */ = { + 65599E891DB3D17F00EC123C /* Build configuration list for PBXNativeTarget "MoneyTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 65B92B2B1BE0E4E700F82024 /* Debug */, - 65B92B2C1BE0E4E700F82024 /* Release */, + 65599E861DB3D17F00EC123C /* Debug */, + 65599E871DB3D17F00EC123C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 65B92B2D1BE0E4E700F82024 /* Build configuration list for PBXNativeTarget "Money-OSXTests" */ = { + 65687D5E1DB3D8B70016FB31 /* Build configuration list for PBXAggregateTarget "Generate Swift" */ = { isa = XCConfigurationList; buildConfigurations = ( - 65B92B2E1BE0E4E700F82024 /* Debug */, - 65B92B2F1BE0E4E700F82024 /* Release */, + 65687D5C1DB3D8B70016FB31 /* Debug */, + 65687D5D1DB3D8B70016FB31 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 65B92AC81BE0E46C00F82024 /* Project object */; + rootObject = 65599E611DB3CF2E00EC123C /* Project object */; } diff --git a/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/0D32C110-9E81-4857-87B2-283B1C66329A.plist b/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/0D32C110-9E81-4857-87B2-283B1C66329A.plist deleted file mode 100644 index 4bac043..0000000 --- a/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/0D32C110-9E81-4857-87B2-283B1C66329A.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - classNames - - DecimalNumberTypeTests - - testPerformanceInitDouble() - - com.apple.XCTPerformanceMetric_WallClockTime - - baselineAverage - 0.020856 - baselineIntegrationDisplayName - 22 Nov 2015, 13:09:55 - - - testPerformanceInitInt() - - com.apple.XCTPerformanceMetric_WallClockTime - - baselineAverage - 0.018283 - baselineIntegrationDisplayName - 22 Nov 2015, 13:09:55 - - - - - - diff --git a/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/Info.plist b/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/Info.plist deleted file mode 100644 index 0a50199..0000000 --- a/Money.xcodeproj/xcshareddata/xcbaselines/65B92ADC1BE0E4A700F82024.xcbaseline/Info.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - runDestinationsByUUID - - 0D32C110-9E81-4857-87B2-283B1C66329A - - localComputer - - busSpeedInMHz - 100 - cpuCount - 1 - cpuKind - 6-Core Intel Xeon E5 - cpuSpeedInMHz - 3500 - logicalCPUCoresPerPackage - 12 - modelCode - MacPro6,1 - physicalCPUCoresPerPackage - 6 - platformIdentifier - com.apple.platform.macosx - - targetArchitecture - x86_64 - targetDevice - - modelCode - iPhone7,2 - platformIdentifier - com.apple.platform.iphonesimulator - - - - - diff --git a/Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme b/Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme deleted file mode 100644 index 905acb4..0000000 --- a/Money.xcodeproj/xcshareddata/xcschemes/Money-iOS.xcscheme +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme b/Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme deleted file mode 100644 index d2a0603..0000000 --- a/Money.xcodeproj/xcshareddata/xcschemes/Money-tvOS.xcscheme +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Money.xcodeproj/xcshareddata/xcschemes/Money-watchOS.xcscheme b/Money.xcodeproj/xcshareddata/xcschemes/Money-watchOS.xcscheme deleted file mode 100644 index cd63e47..0000000 --- a/Money.xcodeproj/xcshareddata/xcschemes/Money-watchOS.xcscheme +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Money.xcodeproj/xcshareddata/xcschemes/Money-OSX.xcscheme b/Money.xcodeproj/xcshareddata/xcschemes/Money.xcscheme similarity index 81% rename from Money.xcodeproj/xcshareddata/xcschemes/Money-OSX.xcscheme rename to Money.xcodeproj/xcshareddata/xcschemes/Money.xcscheme index 6c05b43..975a957 100644 --- a/Money.xcodeproj/xcshareddata/xcschemes/Money-OSX.xcscheme +++ b/Money.xcodeproj/xcshareddata/xcschemes/Money.xcscheme @@ -1,6 +1,6 @@ @@ -26,16 +26,15 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -43,9 +42,9 @@ @@ -65,9 +64,9 @@ @@ -83,9 +82,9 @@ diff --git a/Money/Shared/Locale.swift b/Money/Shared/Locale.swift deleted file mode 100644 index 9f43f8b..0000000 --- a/Money/Shared/Locale.swift +++ /dev/null @@ -1,86 +0,0 @@ -// -// Locale.swift -// Money -// -// Created by Daniel Thorpe on 22/11/2015. -// -// - -import Foundation - -/** - LanguageType provides an interface to retrieve - a language identifier. -*/ -public protocol LanguageType { - - /// - returns: the language identifier as a String - var languageIdentifier: String { get } -} - -/** - CountryType provides an interface to retrieve - a country identifier. - */ -public protocol CountryType { - - /// - returns: the country identifier as a String - var countryIdentifier: String { get } -} - -/** - LocaleType provides an interface to retrieve - a locale identifier. - */ -public protocol LocaleType { - - /// - returns: the locale identifier as a String - var localeIdentifier: String { get } -} - -/** - LocaleType extension for types which also conform to - LanguageType and CountryType. - */ -extension LocaleType where Self: LanguageType, Self: CountryType { - - /** - Default implementation of localeIdentifier, where - if a country identifier is not empty, it is appended to the - language identifier, with an underscore. - - returns: the locale identifier as a String - */ - public var localeIdentifier: String { - guard !countryIdentifier.isEmpty else { - return languageIdentifier - } - return "\(languageIdentifier)_\(countryIdentifier)" - } -} - -/** - Convenience currency related properties on NSLocale -*/ -public extension NSLocale { - - /// - returns: a String? for the currency code. - var currencyCode: String? { - return objectForKey(NSLocaleCurrencyCode) as? String - } - - /// - returns: a String? for the currency symbol. - var currencySymbol: String? { - return objectForKey(NSLocaleCurrencySymbol) as? String - } - - /// - returns: a String? for the currency grouping separator. - var currencyGroupingSeparator: String? { - return objectForKey(NSLocaleGroupingSeparator) as? String - } - - /// - returns: a String? for the currency decimal separator. - var currencyDecimalSeparator: String? { - return objectForKey(NSLocaleDecimalSeparator) as? String - } -} - diff --git a/Money/iOS/ApplePay.swift b/Sources/ApplePay.swift similarity index 98% rename from Money/iOS/ApplePay.swift rename to Sources/ApplePay.swift index a09433b..6c1009e 100644 --- a/Money/iOS/ApplePay.swift +++ b/Sources/ApplePay.swift @@ -1,6 +1,6 @@ // -// ApplePay.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,6 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#if os(iOS) + import Foundation import PassKit import ValueCoding @@ -223,3 +225,4 @@ public func == return lhs.cost == rhs.cost && lhs.label == rhs.label && lhs.type == rhs.type } +#endif diff --git a/Money/Shared/Autogenerated.swift b/Sources/Autogenerated.swift similarity index 96% rename from Money/Shared/Autogenerated.swift rename to Sources/Autogenerated.swift index f9d89d8..d644a02 100644 --- a/Money/Shared/Autogenerated.swift +++ b/Sources/Autogenerated.swift @@ -2693,26 +2693,26 @@ public enum ChineseSpeakingCountry: CountryType { /// China is a country which speaks Chinese. case China - /// Hong Kong SAR China is a country which speaks Chinese. - case HongKongSarChina - /// Macau SAR China is a country which speaks Chinese. - case MacauSarChina + /// Hong Kong (China) is a country which speaks Chinese. + case HongKongChina + /// Macau (China) is a country which speaks Chinese. + case MacauChina /// Singapore is a country which speaks Chinese. case Singapore /// Taiwan is a country which speaks Chinese. case Taiwan /// - returns: an Array of all the countries which speak Chinese - public static let all: [ChineseSpeakingCountry] = [ .China, .HongKongSarChina, .MacauSarChina, .Singapore, .Taiwan ] + public static let all: [ChineseSpeakingCountry] = [ .China, .HongKongChina, .MacauChina, .Singapore, .Taiwan ] /// - returns: the country identifier of a specific Chinese speaking country. public var countryIdentifier: String { switch self { case .China: return "CN" - case .HongKongSarChina: + case .HongKongChina: return "HK" - case .MacauSarChina: + case .MacauChina: return "MO" case .Singapore: return "SG" @@ -2843,8 +2843,12 @@ public enum EnglishSpeakingCountry: CountryType { case Barbados /// Belgium is a country which speaks English. case Belgium + /// Burundi is a country which speaks English. + case Burundi /// Bermuda is a country which speaks English. case Bermuda + /// Brazil is a country which speaks English. + case Brazil /// Bahamas is a country which speaks English. case Bahamas /// Botswana is a country which speaks English. @@ -2861,6 +2865,8 @@ public enum EnglishSpeakingCountry: CountryType { case CookIslands /// Cameroon is a country which speaks English. case Cameroon + /// China is a country which speaks English. + case China /// Christmas Island is a country which speaks English. case ChristmasIsland /// Cyprus is a country which speaks English. @@ -2909,8 +2915,8 @@ public enum EnglishSpeakingCountry: CountryType { case Guam /// Guyana is a country which speaks English. case Guyana - /// Hong Kong SAR China is a country which speaks English. - case HongKongSarChina + /// Hong Kong (China) is a country which speaks English. + case HongKongChina /// Croatia is a country which speaks English. case Croatia /// Hungary is a country which speaks English. @@ -2933,12 +2939,16 @@ public enum EnglishSpeakingCountry: CountryType { case Jersey /// Jamaica is a country which speaks English. case Jamaica + /// Japan is a country which speaks English. + case Japan /// Kenya is a country which speaks English. case Kenya /// Kiribati is a country which speaks English. case Kiribati /// St. Kitts & Nevis is a country which speaks English. case StKittsNevis + /// South Korea is a country which speaks English. + case SouthKorea /// Cayman Islands is a country which speaks English. case CaymanIslands /// St. Lucia is a country which speaks English. @@ -2959,8 +2969,8 @@ public enum EnglishSpeakingCountry: CountryType { case Madagascar /// Marshall Islands is a country which speaks English. case MarshallIslands - /// Macau SAR China is a country which speaks English. - case MacauSarChina + /// Macau (China) is a country which speaks English. + case MacauChina /// Northern Mariana Islands is a country which speaks English. case NorthernMarianaIslands /// Montserrat is a country which speaks English. @@ -2969,6 +2979,8 @@ public enum EnglishSpeakingCountry: CountryType { case Malta /// Mauritius is a country which speaks English. case Mauritius + /// Maldives is a country which speaks English. + case Maldives /// Malawi is a country which speaks English. case Malawi /// Malaysia is a country which speaks English. @@ -3047,6 +3059,8 @@ public enum EnglishSpeakingCountry: CountryType { case TrinidadTobago /// Tuvalu is a country which speaks English. case Tuvalu + /// Taiwan is a country which speaks English. + case Taiwan /// Tanzania is a country which speaks English. case Tanzania /// Uganda is a country which speaks English. @@ -3073,7 +3087,7 @@ public enum EnglishSpeakingCountry: CountryType { case Zimbabwe /// - returns: an Array of all the countries which speak English - public static let all: [EnglishSpeakingCountry] = [ .World, .Europe, .Andorra, .AntiguaBarbuda, .Anguilla, .Albania, .AmericanSamoa, .Austria, .Australia, .BosniaHerzegovina, .Barbados, .Belgium, .Bermuda, .Bahamas, .Botswana, .Belize, .Canada, .CocosKeelingIslands, .Switzerland, .CookIslands, .Cameroon, .ChristmasIsland, .Cyprus, .CzechRepublic, .Germany, .DiegoGarcia, .Denmark, .Dominica, .Estonia, .Eritrea, .Spain, .Finland, .Fiji, .FalklandIslands, .Micronesia, .France, .UnitedKingdom, .Grenada, .Guernsey, .Ghana, .Gibraltar, .Gambia, .Greece, .Guam, .Guyana, .HongKongSarChina, .Croatia, .Hungary, .Ireland, .Israel, .IsleOfMan, .India, .BritishIndianOceanTerritory, .Iceland, .Italy, .Jersey, .Jamaica, .Kenya, .Kiribati, .StKittsNevis, .CaymanIslands, .StLucia, .Liberia, .Lesotho, .Lithuania, .Luxembourg, .Latvia, .Montenegro, .Madagascar, .MarshallIslands, .MacauSarChina, .NorthernMarianaIslands, .Montserrat, .Malta, .Mauritius, .Malawi, .Malaysia, .Namibia, .NorfolkIsland, .Nigeria, .Netherlands, .Norway, .Nauru, .Niue, .NewZealand, .PapuaNewGuinea, .Philippines, .Pakistan, .Poland, .PitcairnIslands, .PuertoRico, .Portugal, .Palau, .Romania, .Russia, .Rwanda, .SolomonIslands, .Seychelles, .Sudan, .Sweden, .Singapore, .StHelena, .Slovenia, .Slovakia, .SierraLeone, .SouthSudan, .SintMaarten, .Swaziland, .TurksCaicosIslands, .Tokelau, .Tonga, .Turkey, .TrinidadTobago, .Tuvalu, .Tanzania, .Uganda, .USOutlyingIslands, .UnitedStates, .StVincentGrenadines, .BritishVirginIslands, .USVirginIslands, .Vanuatu, .Samoa, .SouthAfrica, .Zambia, .Zimbabwe ] + public static let all: [EnglishSpeakingCountry] = [ .World, .Europe, .Andorra, .AntiguaBarbuda, .Anguilla, .Albania, .AmericanSamoa, .Austria, .Australia, .BosniaHerzegovina, .Barbados, .Belgium, .Burundi, .Bermuda, .Brazil, .Bahamas, .Botswana, .Belize, .Canada, .CocosKeelingIslands, .Switzerland, .CookIslands, .Cameroon, .China, .ChristmasIsland, .Cyprus, .CzechRepublic, .Germany, .DiegoGarcia, .Denmark, .Dominica, .Estonia, .Eritrea, .Spain, .Finland, .Fiji, .FalklandIslands, .Micronesia, .France, .UnitedKingdom, .Grenada, .Guernsey, .Ghana, .Gibraltar, .Gambia, .Greece, .Guam, .Guyana, .HongKongChina, .Croatia, .Hungary, .Ireland, .Israel, .IsleOfMan, .India, .BritishIndianOceanTerritory, .Iceland, .Italy, .Jersey, .Jamaica, .Japan, .Kenya, .Kiribati, .StKittsNevis, .SouthKorea, .CaymanIslands, .StLucia, .Liberia, .Lesotho, .Lithuania, .Luxembourg, .Latvia, .Montenegro, .Madagascar, .MarshallIslands, .MacauChina, .NorthernMarianaIslands, .Montserrat, .Malta, .Mauritius, .Maldives, .Malawi, .Malaysia, .Namibia, .NorfolkIsland, .Nigeria, .Netherlands, .Norway, .Nauru, .Niue, .NewZealand, .PapuaNewGuinea, .Philippines, .Pakistan, .Poland, .PitcairnIslands, .PuertoRico, .Portugal, .Palau, .Romania, .Russia, .Rwanda, .SolomonIslands, .Seychelles, .Sudan, .Sweden, .Singapore, .StHelena, .Slovenia, .Slovakia, .SierraLeone, .SouthSudan, .SintMaarten, .Swaziland, .TurksCaicosIslands, .Tokelau, .Tonga, .Turkey, .TrinidadTobago, .Tuvalu, .Taiwan, .Tanzania, .Uganda, .USOutlyingIslands, .UnitedStates, .StVincentGrenadines, .BritishVirginIslands, .USVirginIslands, .Vanuatu, .Samoa, .SouthAfrica, .Zambia, .Zimbabwe ] /// - returns: the country identifier of a specific English speaking country. public var countryIdentifier: String { @@ -3102,8 +3116,12 @@ public enum EnglishSpeakingCountry: CountryType { return "BB" case .Belgium: return "BE" + case .Burundi: + return "BI" case .Bermuda: return "BM" + case .Brazil: + return "BR" case .Bahamas: return "BS" case .Botswana: @@ -3120,6 +3138,8 @@ public enum EnglishSpeakingCountry: CountryType { return "CK" case .Cameroon: return "CM" + case .China: + return "CN" case .ChristmasIsland: return "CX" case .Cyprus: @@ -3168,7 +3188,7 @@ public enum EnglishSpeakingCountry: CountryType { return "GU" case .Guyana: return "GY" - case .HongKongSarChina: + case .HongKongChina: return "HK" case .Croatia: return "HR" @@ -3192,12 +3212,16 @@ public enum EnglishSpeakingCountry: CountryType { return "JE" case .Jamaica: return "JM" + case .Japan: + return "JP" case .Kenya: return "KE" case .Kiribati: return "KI" case .StKittsNevis: return "KN" + case .SouthKorea: + return "KR" case .CaymanIslands: return "KY" case .StLucia: @@ -3218,7 +3242,7 @@ public enum EnglishSpeakingCountry: CountryType { return "MG" case .MarshallIslands: return "MH" - case .MacauSarChina: + case .MacauChina: return "MO" case .NorthernMarianaIslands: return "MP" @@ -3228,6 +3252,8 @@ public enum EnglishSpeakingCountry: CountryType { return "MT" case .Mauritius: return "MU" + case .Maldives: + return "MV" case .Malawi: return "MW" case .Malaysia: @@ -3306,6 +3332,8 @@ public enum EnglishSpeakingCountry: CountryType { return "TT" case .Tuvalu: return "TV" + case .Taiwan: + return "TW" case .Tanzania: return "TZ" case .Uganda: @@ -3358,6 +3386,30 @@ public enum EweSpeakingCountry: CountryType { } } +/** + An enum of countries which speak Faroese. +*/ +public enum FaroeseSpeakingCountry: CountryType { + + /// Denmark is a country which speaks Faroese. + case Denmark + /// Faroe Islands is a country which speaks Faroese. + case FaroeIslands + + /// - returns: an Array of all the countries which speak Faroese + public static let all: [FaroeseSpeakingCountry] = [ .Denmark, .FaroeIslands ] + + /// - returns: the country identifier of a specific Faroese speaking country. + public var countryIdentifier: String { + switch self { + case .Denmark: + return "DK" + case .FaroeIslands: + return "FO" + } + } +} + /** An enum of countries which speak French. */ @@ -3842,6 +3894,30 @@ public enum NepaliSpeakingCountry: CountryType { } } +/** + An enum of countries which speak Northern Luri. +*/ +public enum NorthernLuriSpeakingCountry: CountryType { + + /// Iraq is a country which speaks Northern Luri. + case Iraq + /// Iran is a country which speaks Northern Luri. + case Iran + + /// - returns: an Array of all the countries which speak Northern Luri + public static let all: [NorthernLuriSpeakingCountry] = [ .Iraq, .Iran ] + + /// - returns: the country identifier of a specific Northern Luri speaking country. + public var countryIdentifier: String { + switch self { + case .Iraq: + return "IQ" + case .Iran: + return "IR" + } + } +} + /** An enum of countries which speak Northern Sami. */ @@ -3979,8 +4055,8 @@ public enum PortugueseSpeakingCountry: CountryType { case CapeVerde /// Guinea-Bissau is a country which speaks Portuguese. case GuineaBissau - /// Macau SAR China is a country which speaks Portuguese. - case MacauSarChina + /// Macau (China) is a country which speaks Portuguese. + case MacauChina /// Mozambique is a country which speaks Portuguese. case Mozambique /// Portugal is a country which speaks Portuguese. @@ -3991,7 +4067,7 @@ public enum PortugueseSpeakingCountry: CountryType { case TimorLeste /// - returns: an Array of all the countries which speak Portuguese - public static let all: [PortugueseSpeakingCountry] = [ .Angola, .Brazil, .CapeVerde, .GuineaBissau, .MacauSarChina, .Mozambique, .Portugal, .SãoToméPríncipe, .TimorLeste ] + public static let all: [PortugueseSpeakingCountry] = [ .Angola, .Brazil, .CapeVerde, .GuineaBissau, .MacauChina, .Mozambique, .Portugal, .SãoToméPríncipe, .TimorLeste ] /// - returns: the country identifier of a specific Portuguese speaking country. public var countryIdentifier: String { @@ -4004,7 +4080,7 @@ public enum PortugueseSpeakingCountry: CountryType { return "CV" case .GuineaBissau: return "GW" - case .MacauSarChina: + case .MacauChina: return "MO" case .Mozambique: return "MZ" @@ -4655,6 +4731,9 @@ public enum Locale { /// ### Assamese case Assamese + /// ### Asturian + case Asturian + /// ### Asu case Asu @@ -4703,6 +4782,9 @@ public enum Locale { /// ### Burmese case Burmese + /// ### Cantonese + case Cantonese + /** ### Catalan - requires: CatalanSpeakingCountry @@ -4718,6 +4800,9 @@ public enum Locale { */ case CentralKurdish(CentralKurdishSpeakingCountry) + /// ### Chechen + case Chechen + /// ### Cherokee case Cherokee @@ -4784,8 +4869,11 @@ public enum Locale { /// ### Ewondo case Ewondo - /// ### Faroese - case Faroese + /** + ### Faroese + - requires: FaroeseSpeakingCountry + */ + case Faroese(FaroeseSpeakingCountry) /// ### Filipino case Filipino @@ -5015,6 +5103,9 @@ public enum Locale { */ case Masai(MasaiSpeakingCountry) + /// ### Mazanderani + case Mazanderani + /// ### Meru case Meru @@ -5048,6 +5139,12 @@ public enum Locale { /// ### North Ndebele case NorthNdebele + /** + ### Northern Luri + - requires: NorthernLuriSpeakingCountry + */ + case NorthernLuri(NorthernLuriSpeakingCountry) + /** ### Northern Sami - requires: NorthernSamiSpeakingCountry @@ -5352,6 +5449,8 @@ extension Locale: LanguageType { return "hy" case .Assamese: return "as" + case .Asturian: + return "ast" case .Asu: return "asa" case .Azerbaijani: @@ -5382,12 +5481,16 @@ extension Locale: LanguageType { return "bg" case .Burmese: return "my" + case .Cantonese: + return "yue" case .Catalan(_): return "ca" case .CentralAtlasTamazight: return "tzm" case .CentralKurdish(_): return "ckb" + case .Chechen: + return "ce" case .Cherokee: return "chr" case .Chiga: @@ -5420,7 +5523,7 @@ extension Locale: LanguageType { return "ee" case .Ewondo: return "ewo" - case .Faroese: + case .Faroese(_): return "fo" case .Filipino: return "fil" @@ -5554,6 +5657,8 @@ extension Locale: LanguageType { return "mr" case .Masai(_): return "mas" + case .Mazanderani: + return "mzn" case .Meru: return "mer" case .Meta: @@ -5574,6 +5679,8 @@ extension Locale: LanguageType { return "jgo" case .NorthNdebele: return "nd" + case .NorthernLuri(_): + return "lrc" case .NorthernSami(_): return "se" case .NorwegianBokmål(_): @@ -5724,7 +5831,7 @@ extension Locale: CountryType { /// - returns: the country identifier as a String. public var countryIdentifier: String { switch self { - case .Aghem, .Akan, .Amharic, .Armenian, .Assamese, .Asu, .Azerbaijani, .Bafia, .Bambara, .Basaa, .Basque, .Belarusian, .Bemba, .Bena, .Bodo, .Bosnian, .Breton, .Bulgarian, .Burmese, .CentralAtlasTamazight, .Cherokee, .Chiga, .Colognian, .Cornish, .Czech, .Duala, .Dzongkha, .Embu, .Estonian, .Ewondo, .Faroese, .Filipino, .Finnish, .Friulian, .Galician, .Ganda, .Georgian, .Gujarati, .Gusii, .Hawaiian, .Hebrew, .Hindi, .Hungarian, .Icelandic, .Igbo, .InariSami, .Indonesian, .Inuktitut, .Irish, .Japanese, .JolaFonyi, .Kabuverdianu, .Kabyle, .Kako, .Kalaallisut, .Kalenjin, .Kamba, .Kannada, .Kashmiri, .Kazakh, .Khmer, .Kikuyu, .Kinyarwanda, .Konkani, .KoyraChiini, .KoyraboroSenni, .Kwasio, .Kyrgyz, .Lakota, .Langi, .Lao, .Latvian, .Lithuanian, .LowerSorbian, .LubaKatanga, .Luo, .Luxembourgish, .Luyia, .Macedonian, .Machame, .MakhuwaMeetto, .Makonde, .Malagasy, .Malayalam, .Maltese, .Manx, .Marathi, .Meru, .Meta, .Mongolian, .Morisyen, .Mundang, .Nama, .Ngiemboon, .Ngomba, .NorthNdebele, .NorwegianNynorsk, .Nuer, .Nyankole, .Oriya, .Pashto, .Polish, .Romansh, .Rombo, .Rundi, .Rwa, .Sakha, .Samburu, .Sango, .Sangu, .ScottishGaelic, .Sena, .Shambala, .Shona, .SichuanYi, .Sinhala, .Slovak, .Slovenian, .Soga, .StandardMoroccanTamazight, .Tachelhit, .Taita, .Tajik, .Tasawaq, .Telugu, .Thai, .Tongan, .Turkmen, .Ukrainian, .UpperSorbian, .Uyghur, .Vai, .Vietnamese, .Vunjo, .Walser, .Welsh, .WesternFrisian, .Yangben, .Yiddish, .Zarma, .Zulu: + case .Aghem, .Akan, .Amharic, .Armenian, .Assamese, .Asturian, .Asu, .Azerbaijani, .Bafia, .Bambara, .Basaa, .Basque, .Belarusian, .Bemba, .Bena, .Bodo, .Bosnian, .Breton, .Bulgarian, .Burmese, .Cantonese, .CentralAtlasTamazight, .Chechen, .Cherokee, .Chiga, .Colognian, .Cornish, .Czech, .Duala, .Dzongkha, .Embu, .Estonian, .Ewondo, .Filipino, .Finnish, .Friulian, .Galician, .Ganda, .Georgian, .Gujarati, .Gusii, .Hawaiian, .Hebrew, .Hindi, .Hungarian, .Icelandic, .Igbo, .InariSami, .Indonesian, .Inuktitut, .Irish, .Japanese, .JolaFonyi, .Kabuverdianu, .Kabyle, .Kako, .Kalaallisut, .Kalenjin, .Kamba, .Kannada, .Kashmiri, .Kazakh, .Khmer, .Kikuyu, .Kinyarwanda, .Konkani, .KoyraChiini, .KoyraboroSenni, .Kwasio, .Kyrgyz, .Lakota, .Langi, .Lao, .Latvian, .Lithuanian, .LowerSorbian, .LubaKatanga, .Luo, .Luxembourgish, .Luyia, .Macedonian, .Machame, .MakhuwaMeetto, .Makonde, .Malagasy, .Malayalam, .Maltese, .Manx, .Marathi, .Mazanderani, .Meru, .Meta, .Mongolian, .Morisyen, .Mundang, .Nama, .Ngiemboon, .Ngomba, .NorthNdebele, .NorwegianNynorsk, .Nuer, .Nyankole, .Oriya, .Pashto, .Polish, .Romansh, .Rombo, .Rundi, .Rwa, .Sakha, .Samburu, .Sango, .Sangu, .ScottishGaelic, .Sena, .Shambala, .Shona, .SichuanYi, .Sinhala, .Slovak, .Slovenian, .Soga, .StandardMoroccanTamazight, .Tachelhit, .Taita, .Tajik, .Tasawaq, .Telugu, .Thai, .Tongan, .Turkmen, .Ukrainian, .UpperSorbian, .Uyghur, .Vai, .Vietnamese, .Vunjo, .Walser, .Welsh, .WesternFrisian, .Yangben, .Yiddish, .Zarma, .Zulu: return "" case .Afrikaans(let country): return country.countryIdentifier @@ -5750,6 +5857,8 @@ extension Locale: CountryType { return country.countryIdentifier case .Ewe(let country): return country.countryIdentifier + case .Faroese(let country): + return country.countryIdentifier case .French(let country): return country.countryIdentifier case .Fulah(let country): @@ -5772,6 +5881,8 @@ extension Locale: CountryType { return country.countryIdentifier case .Nepali(let country): return country.countryIdentifier + case .NorthernLuri(let country): + return country.countryIdentifier case .NorthernSami(let country): return country.countryIdentifier case .NorwegianBokmål(let country): diff --git a/Money/Shared/Bitcoin.swift b/Sources/Bitcoin.swift similarity index 97% rename from Money/Shared/Bitcoin.swift rename to Sources/Bitcoin.swift index 38901c0..253a108 100644 --- a/Money/Shared/Bitcoin.swift +++ b/Sources/Bitcoin.swift @@ -1,6 +1,6 @@ - // -// Bitcoin.swift -// Money +// +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // diff --git a/Money/Shared/Currency.swift b/Sources/Currency.swift similarity index 95% rename from Money/Shared/Currency.swift rename to Sources/Currency.swift index c7590b5..530e414 100644 --- a/Money/Shared/Currency.swift +++ b/Sources/Currency.swift @@ -1,6 +1,6 @@ // -// Currency.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. - import Foundation /** @@ -82,9 +81,6 @@ public extension CurrencyType { raiseOnDivideByZero: true ) } -} - -internal extension CurrencyType { static func formattedWithStyle(style: NSNumberFormatterStyle, forLocale tmp: NSLocale) -> NSDecimalNumber -> String { @@ -96,13 +92,12 @@ internal extension CurrencyType { formatter.locale = locale formatter.numberStyle = style formatter.maximumFractionDigits = scale - formatter.currencySymbol = symbol ?? locale.currencySymbol + formatter.currencySymbol = symbol ?? locale.mny_currencySymbol return { formatter.stringFromNumber($0)! } } } - /** Custom currency types should refine CustomCurrencyType. @@ -232,21 +227,21 @@ public struct Currency { convenience init(code: String) { let locale = NSLocale(localeIdentifier: NSLocale.canonicalLocaleIdentifierFromString(NSLocale.localeIdentifierFromComponents([NSLocaleCurrencyCode: code]))) - let symbol = locale.currencySymbol! + let symbol = locale.mny_currencySymbol! let fmtr = NSNumberFormatter() fmtr.locale = locale fmtr.numberStyle = .CurrencyStyle fmtr.currencyCode = code - fmtr.currencySymbol = locale.currencySymbol + fmtr.currencySymbol = locale.mny_currencySymbol let scale = fmtr.maximumFractionDigits self.init(code: code, scale: scale, symbol: symbol) } convenience init(locale: NSLocale) { - let code = locale.currencyCode! - let symbol = locale.currencySymbol + let code = locale.mny_currencyCode! + let symbol = locale.mny_currencySymbol let fmtr = NSNumberFormatter() fmtr.numberStyle = .CurrencyStyle diff --git a/Money/Shared/Decimal/Decimal.swift b/Sources/Decimal.swift similarity index 97% rename from Money/Shared/Decimal/Decimal.swift rename to Sources/Decimal.swift index b1c3398..7f0d201 100644 --- a/Money/Shared/Decimal/Decimal.swift +++ b/Sources/Decimal.swift @@ -1,6 +1,6 @@ // -// Decimal.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. - import Foundation import ValueCoding diff --git a/Money/Shared/Decimal/DecimalNumberType.swift b/Sources/DecimalNumberType.swift similarity index 99% rename from Money/Shared/Decimal/DecimalNumberType.swift rename to Sources/DecimalNumberType.swift index 7bb9f8d..f528205 100644 --- a/Money/Shared/Decimal/DecimalNumberType.swift +++ b/Sources/DecimalNumberType.swift @@ -1,6 +1,6 @@ // -// DecimalNumberType.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. - import Foundation /** diff --git a/Sources/Locale.swift b/Sources/Locale.swift new file mode 100644 index 0000000..0068e4a --- /dev/null +++ b/Sources/Locale.swift @@ -0,0 +1,112 @@ +// +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe +// +// The MIT License (MIT) +// +// Copyright (c) 2015 Daniel Thorpe +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +import Foundation + +/** + LanguageType provides an interface to retrieve + a language identifier. +*/ +public protocol LanguageType { + + /// - returns: the language identifier as a String + var languageIdentifier: String { get } +} + +/** + CountryType provides an interface to retrieve + a country identifier. + */ +public protocol CountryType { + + /// - returns: the country identifier as a String + var countryIdentifier: String { get } +} + +/** + LocaleType provides an interface to retrieve + a locale identifier. + */ +public protocol LocaleType { + + /// - returns: the locale identifier as a String + var localeIdentifier: String { get } +} + +/** + LocaleType extension for types which also conform to + LanguageType and CountryType. + */ +extension LocaleType where Self: LanguageType, Self: CountryType { + + /** + Default implementation of localeIdentifier, where + if a country identifier is not empty, it is appended to the + language identifier, with an underscore. + - returns: the locale identifier as a String + */ + public var localeIdentifier: String { + guard !countryIdentifier.isEmpty else { + return languageIdentifier + } + return "\(languageIdentifier)_\(countryIdentifier)" + } +} + +/** + Convenience currency related properties on NSLocale +*/ +internal extension NSLocale { + + /// - returns: a String? for the currency code. + var mny_currencyCode: String? { + if #available(iOS 10.0, iOSApplicationExtension 10.0, watchOS 3.0, watchOSApplicationExtension 3.0, tvOS 10.0, tvOSApplicationExtension 10.0, OSX 10.12, OSXApplicationExtension 10.12, *) { + return currencyCode + } else { + return objectForKey(NSLocaleCurrencyCode) as? String + } + } + + /// - returns: a String? for the currency symbol. + var mny_currencySymbol: String? { + if #available(iOS 10.0, iOSApplicationExtension 10.0, watchOS 3.0, watchOSApplicationExtension 3.0, tvOS 10.0, tvOSApplicationExtension 10.0, OSX 10.12, OSXApplicationExtension 10.12, *) { + return currencySymbol + } else { + return objectForKey(NSLocaleCurrencySymbol) as? String + } + } + + /// - returns: a String? for the currency grouping separator. + var mny_currencyGroupingSeparator: String? { + return objectForKey(NSLocaleGroupingSeparator) as? String + } + + /// - returns: a String? for the currency decimal separator. + var mny_currencyDecimalSeparator: String? { + return objectForKey(NSLocaleDecimalSeparator) as? String + } +} + diff --git a/Money/Shared/Money.swift b/Sources/Money.swift similarity index 99% rename from Money/Shared/Money.swift rename to Sources/Money.swift index f4404b1..062e836 100644 --- a/Money/Shared/Money.swift +++ b/Sources/Money.swift @@ -1,6 +1,6 @@ // -// Money.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. - import Foundation import ValueCoding diff --git a/Money/Shared/Decimal/NSDecimalExtensions.swift b/Sources/NSDecimalExtensions.swift similarity index 98% rename from Money/Shared/Decimal/NSDecimalExtensions.swift rename to Sources/NSDecimalExtensions.swift index 51fbf4b..68c1e04 100644 --- a/Money/Shared/Decimal/NSDecimalExtensions.swift +++ b/Sources/NSDecimalExtensions.swift @@ -1,6 +1,6 @@ // -// NSDecimalExtensions.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // diff --git a/Money/Shared/Decimal/NSDecimalNumberExtensions.swift b/Sources/NSDecimalNumberExtensions.swift similarity index 98% rename from Money/Shared/Decimal/NSDecimalNumberExtensions.swift rename to Sources/NSDecimalNumberExtensions.swift index 23244b8..bb6862b 100644 --- a/Money/Shared/Decimal/NSDecimalNumberExtensions.swift +++ b/Sources/NSDecimalNumberExtensions.swift @@ -1,6 +1,6 @@ // -// NSDecimalNumberExtensions.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // diff --git a/Money/Shared/Support.swift b/Sources/Support.swift similarity index 94% rename from Money/Shared/Support.swift rename to Sources/Support.swift index 4f8aada..6378cd6 100644 --- a/Money/Shared/Support.swift +++ b/Sources/Support.swift @@ -1,6 +1,6 @@ // -// Support.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // // The MIT License (MIT) // @@ -24,7 +24,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. - import Foundation extension Int: BooleanType { diff --git a/Supporting Files/Carthage.xcconfig b/Supporting Files/Carthage.xcconfig new file mode 100644 index 0000000..76e8367 --- /dev/null +++ b/Supporting Files/Carthage.xcconfig @@ -0,0 +1,10 @@ +// +// FeatureKit +// +// Copyright © 2016 FeatureKit. All rights reserved. +// + +FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac/ $(inherited) +FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS/ $(inherited) +FRAMEWORK_SEARCH_PATHS[sdk=watch*] = $(SRCROOT)/Carthage/Build/watchOS/ $(inherited) +FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(SRCROOT)/Carthage/Build/tvOS/ $(inherited) diff --git a/Supporting Files/Money.h b/Supporting Files/Money.h index eeb4678..576691a 100644 --- a/Supporting Files/Money.h +++ b/Supporting Files/Money.h @@ -1,12 +1,10 @@ // -// Money.h // Money // -// Created by Daniel Thorpe on 28/10/2015. -// +// Copyright © 2016 Money. All rights reserved. // -#import +@import Foundation; //! Project version number for Money. FOUNDATION_EXPORT double MoneyVersionNumber; diff --git a/Supporting Files/Money.xcconfig b/Supporting Files/Money.xcconfig index 2410add..b929dd0 100644 --- a/Supporting Files/Money.xcconfig +++ b/Supporting Files/Money.xcconfig @@ -1,14 +1,48 @@ // -// Money.xcconfig // Money // -// Created by Daniel Thorpe on 28/10/2015. -// +// Copyright © 2016 Money. All rights reserved. // -MONEY_VERSION = 1.7.0 +#include "Version.xcconfig" + +// Metadata +INFOPLIST_FILE_framework = $(SRCROOT)/Supporting Files/Info.plist +INFOPLIST_FILE_xctest = $(SRCROOT)/Tests/Info.plist +INFOPLIST_FILE = $(INFOPLIST_FILE_$(WRAPPER_EXTENSION)) + +PRODUCT_BUNDLE_IDENTIFIER_framework = me.danthorpe.Money +PRODUCT_BUNDLE_IDENTIFIER_xctest = me.danthorpe.MoneyTests +PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER_$(WRAPPER_EXTENSION)) + +PRODUCT_NAME_framework = Money +PRODUCT_NAME_xctest = MoneyTests +PRODUCT_NAME = $(PRODUCT_NAME_$(WRAPPER_EXTENSION)) + +APPLICATION_EXTENSION_API_ONLY_framework = YES +APPLICATION_EXTENSION_API_ONLY_xctest = NO +APPLICATION_EXTENSION_API_ONLY = $(APPLICATION_EXTENSION_API_ONLY_$(WRAPPER_EXTENSION)) + +SWIFT_VERSION = 2.3 + +// Build Settings +SUPPORTED_PLATFORMS = macosx iphoneos appletvos watchos appletvsimulator iphonesimulator watchsimulator +RESOURCES_TARGETED_DEVICE_FAMILY = 1,2,3,4 +DYLIB_INSTALL_NAME_BASE = @rpath + +// Code Signing +CODE_SIGN_IDENTITY = - + +// Deployment +DEFINES_MODULE = YES + +MACOSX_DEPLOYMENT_TARGET = 10.11 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 +TVOS_DEPLOYMENT_TARGET = 9.2 +WATCHOS_DEPLOYMENT_TARGET = 2.2 + +LD_RUNPATH_SEARCH_PATHS_framework = @executable_path/../Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS_xctest = @loader_path/Frameworks @executable_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks +LD_RUNPATH_SEARCH_PATHS = $(LD_RUNPATH_SEARCH_PATHS_$(WRAPPER_EXTENSION)) -APPLICATION_EXTENSION_API_ONLY = YES -INFOPLIST_FILE = $(SRCROOT)/Supporting Files/Info.plist -PRODUCT_BUNDLE_IDENTIFIER = me.danthorpe.Money -PRODUCT_NAME = Money +#include "Carthage.xcconfig" diff --git a/Supporting Files/Version.xcconfig b/Supporting Files/Version.xcconfig new file mode 100644 index 0000000..89cfafe --- /dev/null +++ b/Supporting Files/Version.xcconfig @@ -0,0 +1 @@ +MONEY_VERSION = 1.8.0 diff --git a/Tests/iOS/ApplePayTests.swift b/Tests/ApplePayTests.swift similarity index 75% rename from Tests/iOS/ApplePayTests.swift rename to Tests/ApplePayTests.swift index af5baa1..f2a2b56 100644 --- a/Tests/iOS/ApplePayTests.swift +++ b/Tests/ApplePayTests.swift @@ -1,10 +1,30 @@ // -// ApplePayTests.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 16/11/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#if os(iOS) import XCTest import PassKit @@ -114,3 +134,6 @@ class PKPaymentRequestTests: ApplePayTests { XCTAssertEqual(request.paymentSummaryItems.last!.amount, items.map { $0.cost }.reduce(0, combine: +).amount) } } + +#endif + diff --git a/Tests/Shared/AutogeneratedTests.swift b/Tests/AutogeneratedTests.swift similarity index 96% rename from Tests/Shared/AutogeneratedTests.swift rename to Tests/AutogeneratedTests.swift index aab9117..844eab0 100644 --- a/Tests/Shared/AutogeneratedTests.swift +++ b/Tests/AutogeneratedTests.swift @@ -275,13 +275,13 @@ class ChineseSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "TW") } - func test__country_identifier_for_HongKongSarChina() { - country = .HongKongSarChina + func test__country_identifier_for_HongKongChina() { + country = .HongKongChina XCTAssertEqual(country.countryIdentifier, "HK") } - func test__country_identifier_for_MacauSarChina() { - country = .MacauSarChina + func test__country_identifier_for_MacauChina() { + country = .MacauChina XCTAssertEqual(country.countryIdentifier, "MO") } @@ -395,8 +395,8 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "BB") } - func test__country_identifier_for_HongKongSarChina() { - country = .HongKongSarChina + func test__country_identifier_for_HongKongChina() { + country = .HongKongChina XCTAssertEqual(country.countryIdentifier, "HK") } @@ -440,6 +440,16 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "CM") } + func test__country_identifier_for_Brazil() { + country = .Brazil + XCTAssertEqual(country.countryIdentifier, "BR") + } + + func test__country_identifier_for_Taiwan() { + country = .Taiwan + XCTAssertEqual(country.countryIdentifier, "TW") + } + func test__country_identifier_for_Gibraltar() { country = .Gibraltar XCTAssertEqual(country.countryIdentifier, "GI") @@ -505,8 +515,8 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "NO") } - func test__country_identifier_for_MacauSarChina() { - country = .MacauSarChina + func test__country_identifier_for_MacauChina() { + country = .MacauChina XCTAssertEqual(country.countryIdentifier, "MO") } @@ -570,6 +580,11 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "TO") } + func test__country_identifier_for_Maldives() { + country = .Maldives + XCTAssertEqual(country.countryIdentifier, "MV") + } + func test__country_identifier_for_Italy() { country = .Italy XCTAssertEqual(country.countryIdentifier, "IT") @@ -615,16 +630,31 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "GU") } + func test__country_identifier_for_Burundi() { + country = .Burundi + XCTAssertEqual(country.countryIdentifier, "BI") + } + func test__country_identifier_for_Andorra() { country = .Andorra XCTAssertEqual(country.countryIdentifier, "AD") } + func test__country_identifier_for_Japan() { + country = .Japan + XCTAssertEqual(country.countryIdentifier, "JP") + } + func test__country_identifier_for_Cyprus() { country = .Cyprus XCTAssertEqual(country.countryIdentifier, "CY") } + func test__country_identifier_for_Liberia() { + country = .Liberia + XCTAssertEqual(country.countryIdentifier, "LR") + } + func test__country_identifier_for_StVincentGrenadines() { country = .StVincentGrenadines XCTAssertEqual(country.countryIdentifier, "VC") @@ -635,16 +665,16 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "US") } - func test__country_identifier_for_Liberia() { - country = .Liberia - XCTAssertEqual(country.countryIdentifier, "LR") - } - func test__country_identifier_for_Uganda() { country = .Uganda XCTAssertEqual(country.countryIdentifier, "UG") } + func test__country_identifier_for_China() { + country = .China + XCTAssertEqual(country.countryIdentifier, "CN") + } + func test__country_identifier_for_Slovakia() { country = .Slovakia XCTAssertEqual(country.countryIdentifier, "SK") @@ -960,6 +990,11 @@ class EnglishSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "TK") } + func test__country_identifier_for_SouthKorea() { + country = .SouthKorea + XCTAssertEqual(country.countryIdentifier, "KR") + } + func test__country_identifier_for_CookIslands() { country = .CookIslands XCTAssertEqual(country.countryIdentifier, "CK") @@ -1016,6 +1051,21 @@ class EweSpeakingCountryAutogeneratedTests: XCTestCase { } } +class FaroeseSpeakingCountryAutogeneratedTests: XCTestCase { + + var country: FaroeseSpeakingCountry! + + func test__country_identifier_for_FaroeIslands() { + country = .FaroeIslands + XCTAssertEqual(country.countryIdentifier, "FO") + } + + func test__country_identifier_for_Denmark() { + country = .Denmark + XCTAssertEqual(country.countryIdentifier, "DK") + } +} + class FrenchSpeakingCountryAutogeneratedTests: XCTestCase { var country: FrenchSpeakingCountry! @@ -1456,6 +1506,21 @@ class NepaliSpeakingCountryAutogeneratedTests: XCTestCase { } } +class NorthernLuriSpeakingCountryAutogeneratedTests: XCTestCase { + + var country: NorthernLuriSpeakingCountry! + + func test__country_identifier_for_Iraq() { + country = .Iraq + XCTAssertEqual(country.countryIdentifier, "IQ") + } + + func test__country_identifier_for_Iran() { + country = .Iran + XCTAssertEqual(country.countryIdentifier, "IR") + } +} + class NorthernSamiSpeakingCountryAutogeneratedTests: XCTestCase { var country: NorthernSamiSpeakingCountry! @@ -1570,8 +1635,8 @@ class PortugueseSpeakingCountryAutogeneratedTests: XCTestCase { XCTAssertEqual(country.countryIdentifier, "AO") } - func test__country_identifier_for_MacauSarChina() { - country = .MacauSarChina + func test__country_identifier_for_MacauChina() { + country = .MacauChina XCTAssertEqual(country.countryIdentifier, "MO") } @@ -2339,14 +2404,14 @@ class LocaleChineseLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "zh_TW") } - func test__language_identifier_for_Chinese_HongKongSarChina() { - locale = .Chinese(.HongKongSarChina) + func test__language_identifier_for_Chinese_HongKongChina() { + locale = .Chinese(.HongKongChina) XCTAssertEqual(locale.languageIdentifier, "zh") XCTAssertEqual(locale.localeIdentifier, "zh_HK") } - func test__language_identifier_for_Chinese_MacauSarChina() { - locale = .Chinese(.MacauSarChina) + func test__language_identifier_for_Chinese_MacauChina() { + locale = .Chinese(.MacauChina) XCTAssertEqual(locale.languageIdentifier, "zh") XCTAssertEqual(locale.localeIdentifier, "zh_MO") } @@ -2479,8 +2544,8 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_BB") } - func test__language_identifier_for_English_HongKongSarChina() { - locale = .English(.HongKongSarChina) + func test__language_identifier_for_English_HongKongChina() { + locale = .English(.HongKongChina) XCTAssertEqual(locale.languageIdentifier, "en") XCTAssertEqual(locale.localeIdentifier, "en_HK") } @@ -2533,6 +2598,18 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_CM") } + func test__language_identifier_for_English_Brazil() { + locale = .English(.Brazil) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_BR") + } + + func test__language_identifier_for_English_Taiwan() { + locale = .English(.Taiwan) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_TW") + } + func test__language_identifier_for_English_Gibraltar() { locale = .English(.Gibraltar) XCTAssertEqual(locale.languageIdentifier, "en") @@ -2611,8 +2688,8 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_NO") } - func test__language_identifier_for_English_MacauSarChina() { - locale = .English(.MacauSarChina) + func test__language_identifier_for_English_MacauChina() { + locale = .English(.MacauChina) XCTAssertEqual(locale.languageIdentifier, "en") XCTAssertEqual(locale.localeIdentifier, "en_MO") } @@ -2689,6 +2766,12 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_TO") } + func test__language_identifier_for_English_Maldives() { + locale = .English(.Maldives) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_MV") + } + func test__language_identifier_for_English_Italy() { locale = .English(.Italy) XCTAssertEqual(locale.languageIdentifier, "en") @@ -2743,18 +2826,36 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_GU") } + func test__language_identifier_for_English_Burundi() { + locale = .English(.Burundi) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_BI") + } + func test__language_identifier_for_English_Andorra() { locale = .English(.Andorra) XCTAssertEqual(locale.languageIdentifier, "en") XCTAssertEqual(locale.localeIdentifier, "en_AD") } + func test__language_identifier_for_English_Japan() { + locale = .English(.Japan) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_JP") + } + func test__language_identifier_for_English_Cyprus() { locale = .English(.Cyprus) XCTAssertEqual(locale.languageIdentifier, "en") XCTAssertEqual(locale.localeIdentifier, "en_CY") } + func test__language_identifier_for_English_Liberia() { + locale = .English(.Liberia) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_LR") + } + func test__language_identifier_for_English_StVincentGrenadines() { locale = .English(.StVincentGrenadines) XCTAssertEqual(locale.languageIdentifier, "en") @@ -2767,18 +2868,18 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_US") } - func test__language_identifier_for_English_Liberia() { - locale = .English(.Liberia) - XCTAssertEqual(locale.languageIdentifier, "en") - XCTAssertEqual(locale.localeIdentifier, "en_LR") - } - func test__language_identifier_for_English_Uganda() { locale = .English(.Uganda) XCTAssertEqual(locale.languageIdentifier, "en") XCTAssertEqual(locale.localeIdentifier, "en_UG") } + func test__language_identifier_for_English_China() { + locale = .English(.China) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_CN") + } + func test__language_identifier_for_English_Slovakia() { locale = .English(.Slovakia) XCTAssertEqual(locale.languageIdentifier, "en") @@ -3157,6 +3258,12 @@ class LocaleEnglishLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "en_TK") } + func test__language_identifier_for_English_SouthKorea() { + locale = .English(.SouthKorea) + XCTAssertEqual(locale.languageIdentifier, "en") + XCTAssertEqual(locale.localeIdentifier, "en_KR") + } + func test__language_identifier_for_English_CookIslands() { locale = .English(.CookIslands) XCTAssertEqual(locale.languageIdentifier, "en") @@ -3223,6 +3330,23 @@ class LocaleEweLanguageAutogeneratedTests: XCTestCase { } } +class LocaleFaroeseLanguageAutogeneratedTests: XCTestCase { + + var locale: Locale! + + func test__language_identifier_for_Faroese_FaroeIslands() { + locale = .Faroese(.FaroeIslands) + XCTAssertEqual(locale.languageIdentifier, "fo") + XCTAssertEqual(locale.localeIdentifier, "fo_FO") + } + + func test__language_identifier_for_Faroese_Denmark() { + locale = .Faroese(.Denmark) + XCTAssertEqual(locale.languageIdentifier, "fo") + XCTAssertEqual(locale.localeIdentifier, "fo_DK") + } +} + class LocaleFrenchLanguageAutogeneratedTests: XCTestCase { var locale: Locale! @@ -3740,6 +3864,23 @@ class LocaleNepaliLanguageAutogeneratedTests: XCTestCase { } } +class LocaleNorthernLuriLanguageAutogeneratedTests: XCTestCase { + + var locale: Locale! + + func test__language_identifier_for_NorthernLuri_Iraq() { + locale = .NorthernLuri(.Iraq) + XCTAssertEqual(locale.languageIdentifier, "lrc") + XCTAssertEqual(locale.localeIdentifier, "lrc_IQ") + } + + func test__language_identifier_for_NorthernLuri_Iran() { + locale = .NorthernLuri(.Iran) + XCTAssertEqual(locale.languageIdentifier, "lrc") + XCTAssertEqual(locale.localeIdentifier, "lrc_IR") + } +} + class LocaleNorthernSamiLanguageAutogeneratedTests: XCTestCase { var locale: Locale! @@ -3871,8 +4012,8 @@ class LocalePortugueseLanguageAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "pt_AO") } - func test__language_identifier_for_Portuguese_MacauSarChina() { - locale = .Portuguese(.MacauSarChina) + func test__language_identifier_for_Portuguese_MacauChina() { + locale = .Portuguese(.MacauChina) XCTAssertEqual(locale.languageIdentifier, "pt") XCTAssertEqual(locale.localeIdentifier, "pt_MO") } @@ -4464,6 +4605,12 @@ class LocaleAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "as") } + func test__language_identifier_for_Asturian() { + locale = .Asturian + XCTAssertEqual(locale.languageIdentifier, "ast") + XCTAssertEqual(locale.localeIdentifier, "ast") + } + func test__language_identifier_for_Asu() { locale = .Asu XCTAssertEqual(locale.languageIdentifier, "asa") @@ -4548,12 +4695,24 @@ class LocaleAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "my") } + func test__language_identifier_for_Cantonese() { + locale = .Cantonese + XCTAssertEqual(locale.languageIdentifier, "yue") + XCTAssertEqual(locale.localeIdentifier, "yue") + } + func test__language_identifier_for_CentralAtlasTamazight() { locale = .CentralAtlasTamazight XCTAssertEqual(locale.languageIdentifier, "tzm") XCTAssertEqual(locale.localeIdentifier, "tzm") } + func test__language_identifier_for_Chechen() { + locale = .Chechen + XCTAssertEqual(locale.languageIdentifier, "ce") + XCTAssertEqual(locale.localeIdentifier, "ce") + } + func test__language_identifier_for_Cherokee() { locale = .Cherokee XCTAssertEqual(locale.languageIdentifier, "chr") @@ -4614,12 +4773,6 @@ class LocaleAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "ewo") } - func test__language_identifier_for_Faroese() { - locale = .Faroese - XCTAssertEqual(locale.languageIdentifier, "fo") - XCTAssertEqual(locale.localeIdentifier, "fo") - } - func test__language_identifier_for_Filipino() { locale = .Filipino XCTAssertEqual(locale.languageIdentifier, "fil") @@ -4956,6 +5109,12 @@ class LocaleAutogeneratedTests: XCTestCase { XCTAssertEqual(locale.localeIdentifier, "mr") } + func test__language_identifier_for_Mazanderani() { + locale = .Mazanderani + XCTAssertEqual(locale.languageIdentifier, "mzn") + XCTAssertEqual(locale.localeIdentifier, "mzn") + } + func test__language_identifier_for_Meru() { locale = .Meru XCTAssertEqual(locale.languageIdentifier, "mer") diff --git a/Tests/BitcoinTests.swift b/Tests/BitcoinTests.swift new file mode 100644 index 0000000..e858def --- /dev/null +++ b/Tests/BitcoinTests.swift @@ -0,0 +1,49 @@ +// +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe +// +// The MIT License (MIT) +// +// Copyright (c) 2015 Daniel Thorpe +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +import XCTest +@testable import Money + + +class BitcoinCurrencyTests: XCTestCase { + + func test__xbt_currency_code() { + XCTAssertEqual(Currency.XBT.code, "XBT") + } + + func test__btc_currency_code() { + XCTAssertEqual(Currency.BTC.code, "BTC") + } + + func test__btc_currency_symbol() { + XCTAssertEqual(Currency.BTC.symbol, "Ƀ") + } + + func test__btc_currency_scale() { + XCTAssertEqual(Currency.BTC.scale, 8) + } +} + diff --git a/Tests/Shared/DecimalNumberTypeTests.swift b/Tests/DecimalNumberTypeTests.swift similarity index 69% rename from Tests/Shared/DecimalNumberTypeTests.swift rename to Tests/DecimalNumberTypeTests.swift index 86c1c5b..c571415 100644 --- a/Tests/Shared/DecimalNumberTypeTests.swift +++ b/Tests/DecimalNumberTypeTests.swift @@ -1,10 +1,28 @@ // -// DecimalNumberTypeTests.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 22/11/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. import XCTest @testable import Money diff --git a/Tests/Shared/DecimalTests.swift b/Tests/DecimalTests.swift similarity index 63% rename from Tests/Shared/DecimalTests.swift rename to Tests/DecimalTests.swift index ee7dfec..d0e3ede 100644 --- a/Tests/Shared/DecimalTests.swift +++ b/Tests/DecimalTests.swift @@ -1,10 +1,28 @@ // -// DecimalTests.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 03/11/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. import XCTest import ValueCoding diff --git a/Tests/LocaleTests.swift b/Tests/LocaleTests.swift new file mode 100644 index 0000000..a11dc42 --- /dev/null +++ b/Tests/LocaleTests.swift @@ -0,0 +1,67 @@ +// +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe +// +// The MIT License (MIT) +// +// Copyright (c) 2015 Daniel Thorpe +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +import XCTest +@testable import Money + +class LocaleTests: XCTestCase { + + var en_US: NSLocale! + var es_ES: NSLocale! + + override func setUp() { + super.setUp() + en_US = NSLocale(localeIdentifier: Locale.English(.UnitedStates).localeIdentifier) + es_ES = NSLocale(localeIdentifier: Locale.Spanish(.Spain).localeIdentifier) + } + + override func tearDown() { + en_US = nil + es_ES = nil + super.tearDown() + } + + func test__currency_code() { + XCTAssertEqual(en_US.mny_currencyCode, "USD") + XCTAssertEqual(es_ES.mny_currencyCode, "EUR") + } + + func test__currency_symbol() { + XCTAssertEqual(en_US.mny_currencySymbol, "$") + XCTAssertEqual(es_ES.mny_currencySymbol, "€") + } + + func test__currency_currencyGroupingSeparator() { + XCTAssertEqual(en_US.mny_currencyGroupingSeparator, ",") + XCTAssertEqual(es_ES.mny_currencyGroupingSeparator, ".") + } + + func test__currency_currencyDecimalSeparator() { + XCTAssertEqual(en_US.mny_currencyDecimalSeparator, ".") + XCTAssertEqual(es_ES.mny_currencyDecimalSeparator, ",") + } +} + diff --git a/Tests/Shared/MoneyTests.swift b/Tests/MoneyTests.swift similarity index 89% rename from Tests/Shared/MoneyTests.swift rename to Tests/MoneyTests.swift index e1d603b..8d9dee7 100644 --- a/Tests/Shared/MoneyTests.swift +++ b/Tests/MoneyTests.swift @@ -1,10 +1,28 @@ // -// Money_iOSTests.swift -// Money-iOSTests +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 28/10/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. import XCTest @testable import Money diff --git a/Tests/Shared/NSDecimalNumberTests.swift b/Tests/NSDecimalNumberTests.swift similarity index 66% rename from Tests/Shared/NSDecimalNumberTests.swift rename to Tests/NSDecimalNumberTests.swift index 2218927..db2b02e 100644 --- a/Tests/Shared/NSDecimalNumberTests.swift +++ b/Tests/NSDecimalNumberTests.swift @@ -1,10 +1,28 @@ // -// NSDecimalNumberTests.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 05/11/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. import XCTest @testable import Money diff --git a/Tests/Shared/NSDecimalTests.swift b/Tests/NSDecimalTests.swift similarity index 70% rename from Tests/Shared/NSDecimalTests.swift rename to Tests/NSDecimalTests.swift index da210fa..9bd071a 100644 --- a/Tests/Shared/NSDecimalTests.swift +++ b/Tests/NSDecimalTests.swift @@ -1,10 +1,28 @@ // -// NSDecimalTests.swift -// Money +// Money, https://github.com/danthorpe/Money +// Created by Dan Thorpe, @danthorpe // -// Created by Daniel Thorpe on 05/11/2015. +// The MIT License (MIT) // +// Copyright (c) 2015 Daniel Thorpe // +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. import XCTest @testable import Money diff --git a/Tests/Shared/BitcoinTests.swift b/Tests/Shared/BitcoinTests.swift deleted file mode 100644 index c49696b..0000000 --- a/Tests/Shared/BitcoinTests.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// BitcoinTests.swift -// Money -// -// Created by Daniel Thorpe on 08/11/2015. -// -// - -import XCTest -@testable import Money - - -class BitcoinCurrencyTests: XCTestCase { - - func test__xbt_currency_code() { - XCTAssertEqual(Currency.XBT.code, "XBT") - } - - func test__btc_currency_code() { - XCTAssertEqual(Currency.BTC.code, "BTC") - } - - func test__btc_currency_symbol() { - XCTAssertEqual(Currency.BTC.symbol, "Ƀ") - } - - func test__btc_currency_scale() { - XCTAssertEqual(Currency.BTC.scale, 8) - } -} - diff --git a/Tests/Shared/LocaleTests.swift b/Tests/Shared/LocaleTests.swift deleted file mode 100644 index 03c170f..0000000 --- a/Tests/Shared/LocaleTests.swift +++ /dev/null @@ -1,49 +0,0 @@ -// -// LocaleTests.swift -// Money -// -// Created by Daniel Thorpe on 23/11/2015. -// -// - -import XCTest -@testable import Money - -class LocaleTests: XCTestCase { - - var en_US: NSLocale! - var es_ES: NSLocale! - - override func setUp() { - super.setUp() - en_US = NSLocale(localeIdentifier: Locale.English(.UnitedStates).localeIdentifier) - es_ES = NSLocale(localeIdentifier: Locale.Spanish(.Spain).localeIdentifier) - } - - override func tearDown() { - en_US = nil - es_ES = nil - super.tearDown() - } - - func test__currency_code() { - XCTAssertEqual(en_US.currencyCode, "USD") - XCTAssertEqual(es_ES.currencyCode, "EUR") - } - - func test__currency_symbol() { - XCTAssertEqual(en_US.currencySymbol, "$") - XCTAssertEqual(es_ES.currencySymbol, "€") - } - - func test__currency_currencyGroupingSeparator() { - XCTAssertEqual(en_US.currencyGroupingSeparator, ",") - XCTAssertEqual(es_ES.currencyGroupingSeparator, ".") - } - - func test__currency_currencyDecimalSeparator() { - XCTAssertEqual(en_US.currencyDecimalSeparator, ".") - XCTAssertEqual(es_ES.currencyDecimalSeparator, ",") - } -} -