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

Commit 3f1563a

Browse files
authored
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
1 parent d483a84 commit 3f1563a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1174
-2164
lines changed
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
steps:
22
-
3-
name: ":fastlane: Test Mac OS X"
4-
command: .ci/scripts/test-osx
3+
name: "macOS"
4+
command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_mac"
55
agents:
6-
name: "$BUILDKITE_AGENT_META_DATA_NAME"
6+
xcode: "$XCODE"
77
-
8-
name: ":fastlane: Test iOS"
9-
command: .ci/scripts/test-ios
8+
name: "iOS"
9+
command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_ios"
1010
agents:
11-
name: "$BUILDKITE_AGENT_META_DATA_NAME"
11+
iOS-Simulator: true
12+
xcode: "$XCODE"
1213
-
13-
type: "waiter"
14-
-
15-
name: ":muscle: Send Coverage"
16-
command: .ci/scripts/send-coverage
14+
name: "tvOS"
15+
command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_tvos"
1716
agents:
18-
name: "$BUILDKITE_AGENT_META_DATA_NAME"
17+
iOS-Simulator: true
18+
xcode: "$XCODE"

.ci/buildkite/upload

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -eu
44

55
# Makes sure all the steps run on this same agent
6-
sed "s/\$BUILDKITE_AGENT_META_DATA_NAME/$BUILDKITE_AGENT_META_DATA_NAME/" .ci/buildkite/pipeline.template.yml
6+
sed "s/\$XCODE/$BUILDKITE_AGENT_META_DATA_XCODE/;s/\$COMMIT/$BUILDKITE_COMMIT/" .ci/buildkite/pipeline.template.yml

.fastlane/Fastfile

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
1-
platform :ios do
2-
3-
desc "Runs all the tests"
4-
lane :test do
5-
6-
carthage(
7-
platform: "iOS"
8-
)
9-
10-
scan(
11-
scheme: "Money-iOS",
12-
output_directory: ".ci/xcodebuild-data/",
13-
xcargs: "-derivedDataPath .ci/xcodebuild-data/"
14-
)
15-
16-
end
17-
1+
lane :test_ios do
2+
carthage(platform: "iOS")
3+
scan(scheme: "Money", destination: "platform=iOS Simulator,OS=10.0,name=iPhone 6s")
184
end
195

20-
platform :mac do
21-
22-
desc "Runs all the tests"
23-
lane :test do
24-
25-
carthage(
26-
platform: "Mac"
27-
)
6+
lane :test_mac do
7+
carthage(platform: "Mac")
8+
scan(scheme: "Money", destination: "platform=macOS")
9+
end
2810

29-
scan(
30-
scheme: "Money-OSX",
31-
output_directory: ".ci/xcodebuild-data/",
32-
xcargs: "-derivedDataPath .ci/xcodebuild-data/"
33-
)
34-
35-
end
36-
11+
lane :test_tvos do
12+
carthage(platform: "tvOS")
13+
scan(scheme: "Money", destination: "platform=tvOS Simulator,OS=10.0,name=Apple TV 1080p")
3714
end

.jazzy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
author_name: Daniel Thorpe
1+
author: Daniel Thorpe
22
author_url: http://danthorpe.me
3-
module_name: Money
4-
module_version: 1.7.0
3+
module: Money
4+
module_version: 1.8.0
55
github_url: https://github.com/danthorpe/Money
66
readme: README.md
77
podspec: Money.podspec
88

9-
swift_version: 2.2
9+
swift_version: 2.3
1010
xcodebuild-arguments: -scheme,Money-iOS
1111

1212
custom_categories:

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.8.0
2+
1. [[MNY-61](https://github.com/danthorpe/Money/pull/61)]: Updates to Swift 2.3.
3+
14
# 1.7.0
25
1. [[MNY-47](https://github.com/danthorpe/Money/pull/47)]: Updates to Swift 2.2.
36

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "danthorpe/ValueCoding"
1+
github "danthorpe/ValueCoding" "1.5.0"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "danthorpe/ValueCoding" "1.3.0"
1+
github "danthorpe/ValueCoding" "1.5.0"

0 commit comments

Comments
 (0)