Skip to content

Commit 5cdaf4c

Browse files
danthorpedanthorpe
committed
Merge branch 'release/1.1.0'
2 parents d0b29d3 + 1895e45 commit 5cdaf4c

26 files changed

+272
-163
lines changed

‎.ci/buildkite/pipeline.template.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
steps:
2+
-
3+
name: ":muscle: Lint"
4+
command: .ci/scripts/lint
25
-
36
name: ":fastlane: Test iOS"
47
command: .ci/scripts/test-ios

‎.ci/scripts/lint

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
source /usr/local/opt/chruby/share/chruby/chruby.sh
3+
chruby ruby
4+
bundle exec fastlane lint

‎.ci/scripts/send-coverage

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
#!/usr/bin/env bash
2-
bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -D .ci/xcodebuild-data
2+
source /usr/local/opt/chruby/share/chruby/chruby.sh
3+
chruby ruby
4+
bundle exec slather coverage --scheme "FX-iOS" --buildkite --coveralls --build-directory .ci/xcodebuild-data

‎.fastlane/Fastfile

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
2+
lane :lint do
3+
4+
swiftLint(
5+
mode: :lint,
6+
config_file: '.swiftlint.yml'
7+
)
8+
end
9+
110
platform :ios do
211

312
desc "Runs all the tests"
413
lane :test do
514

615
carthage(
7-
platform: "iOS"
16+
platform: "iOS",
17+
use_binaries: false
818
)
919

1020
scan(
@@ -23,7 +33,8 @@ platform :mac do
2333
lane :test do
2434

2535
carthage(
26-
platform: "Mac"
36+
platform: "Mac",
37+
use_binaries: false
2738
)
2839

2940
scan(

‎.jazzy.yaml ‎.jazzy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
author_name: Daniel Thorpe
22
author_url: http://danthorpe.me
33
module_name: MoneyFX
4-
module_version: 1.0.0
4+
module_version: 1.1.0
55
github_url: https://github.com/danthorpe/FX
66
readme: README.md
77
podspec: MoneyFX.podspec
88

9-
swift_version: 2.1.1
9+
swift_version: 2.2
1010
xcodebuild-arguments: -scheme,FX-iOS
1111

‎.slather.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
coverage_service: coveralls
2+
xcodeproj: FX.xcodeproj
3+
build_directory: .ci/xcodebuild-data
4+
ignore:
5+
- Tests/*
6+
- Supporting Files/*

‎.swiftlint.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
excluded:
2+
- Carthage
3+
- Tests
4+
disabled_rules:
5+
# - valid_docs
6+
# - statement_position
7+
- line_length
8+
- type_name
9+
- variable_name
10+
file_length:
11+
warning: 750
12+
error: 1200
13+

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# 1.1.0
2+
1. [[FX-2](https://github.com/danthorpe/FX/pull/2)]: Corrects the spelling of CocoaPods - thanks @ReadmeCritic & @orta.
3+
2. [[FX-3](https://github.com/danthorpe/FX/pull/3)]: Moves test coverage reporting to Coveralls. Includes SwiftLint into local and CI build phases.
4+
3. [[FX-4](https://github.com/danthorpe/FX/pull/4)]: Updates to Swift 2.2. There are still some dependencies which are not yet Swift 2.2 ready.
5+
16
# 1.0.0
27
🎉🐝 Initial release of Money FX.

‎Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "venmo/DVR" "v0.2.1"
22
github "antitypical/Result" "1.0.2"
33
github "SwiftyJSON/SwiftyJSON" "2.3.3"
4-
github "danthorpe/ValueCoding" "1.2.0"
5-
github "danthorpe/Money" "0c14d7bb6449e9f2f394b37927f6b01614dbde55"
4+
github "danthorpe/ValueCoding" "1.3.0"
5+
github "danthorpe/Money" "1.7.0"

‎FX.xcodeproj/project.pbxproj

+67-1
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@
381381
isa = PBXNativeTarget;
382382
buildConfigurationList = 65F6F8AF1C62B84500155987 /* Build configuration list for PBXNativeTarget "FX-iOS" */;
383383
buildPhases = (
384+
6564A21A1CA34CDD00ED2F77 /* Swift Lint */,
384385
65F6F8941C62B84500155987 /* Sources */,
385386
65F6F8951C62B84500155987 /* Frameworks */,
386387
65F6F8961C62B84500155987 /* Headers */,
@@ -418,6 +419,7 @@
418419
isa = PBXNativeTarget;
419420
buildConfigurationList = 65F6F8BB1C62B87E00155987 /* Build configuration list for PBXNativeTarget "FX-watchOS" */;
420421
buildPhases = (
422+
6564A21B1CA34CFB00ED2F77 /* Swift Lint */,
421423
65F6F8B11C62B87E00155987 /* Sources */,
422424
65F6F8B21C62B87E00155987 /* Frameworks */,
423425
65F6F8B31C62B87E00155987 /* Headers */,
@@ -436,6 +438,7 @@
436438
isa = PBXNativeTarget;
437439
buildConfigurationList = 65F6F8D41C62B89D00155987 /* Build configuration list for PBXNativeTarget "FX-tvOS" */;
438440
buildPhases = (
441+
6564A21C1CA34D1700ED2F77 /* Swift Lint */,
439442
65F6F8BE1C62B89D00155987 /* Sources */,
440443
65F6F8BF1C62B89D00155987 /* Frameworks */,
441444
65F6F8C01C62B89D00155987 /* Headers */,
@@ -473,6 +476,7 @@
473476
isa = PBXNativeTarget;
474477
buildConfigurationList = 65F6F8F01C62B8DA00155987 /* Build configuration list for PBXNativeTarget "FX-OSX" */;
475478
buildPhases = (
479+
6564A21D1CA34D2B00ED2F77 /* Swift Lint */,
476480
65F6F8DA1C62B8DA00155987 /* Sources */,
477481
65F6F8DB1C62B8DA00155987 /* Frameworks */,
478482
65F6F8DC1C62B8DA00155987 /* Headers */,
@@ -513,7 +517,7 @@
513517
isa = PBXProject;
514518
attributes = {
515519
LastSwiftUpdateCheck = 0720;
516-
LastUpgradeCheck = 0720;
520+
LastUpgradeCheck = 0730;
517521
TargetAttributes = {
518522
65F6F8981C62B84500155987 = {
519523
CreatedOnToolsVersion = 7.2.1;
@@ -629,6 +633,66 @@
629633
/* End PBXResourcesBuildPhase section */
630634

631635
/* Begin PBXShellScriptBuildPhase section */
636+
6564A21A1CA34CDD00ED2F77 /* Swift Lint */ = {
637+
isa = PBXShellScriptBuildPhase;
638+
buildActionMask = 2147483647;
639+
files = (
640+
);
641+
inputPaths = (
642+
);
643+
name = "Swift Lint";
644+
outputPaths = (
645+
);
646+
runOnlyForDeploymentPostprocessing = 0;
647+
shellPath = /bin/sh;
648+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n [ -f .swiftlint.yml ] && CONFIG=\".swiftlint.yml\" || CONFIG=\"$HOME/.swiftlint.yml\"\n swiftlint lint --config $CONFIG\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
649+
showEnvVarsInLog = 0;
650+
};
651+
6564A21B1CA34CFB00ED2F77 /* Swift Lint */ = {
652+
isa = PBXShellScriptBuildPhase;
653+
buildActionMask = 2147483647;
654+
files = (
655+
);
656+
inputPaths = (
657+
);
658+
name = "Swift Lint";
659+
outputPaths = (
660+
);
661+
runOnlyForDeploymentPostprocessing = 0;
662+
shellPath = /bin/sh;
663+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n [ -f .swiftlint.yml ] && CONFIG=\".swiftlint.yml\" || CONFIG=\"$HOME/.swiftlint.yml\"\n swiftlint lint --config $CONFIG\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
664+
showEnvVarsInLog = 0;
665+
};
666+
6564A21C1CA34D1700ED2F77 /* Swift Lint */ = {
667+
isa = PBXShellScriptBuildPhase;
668+
buildActionMask = 2147483647;
669+
files = (
670+
);
671+
inputPaths = (
672+
);
673+
name = "Swift Lint";
674+
outputPaths = (
675+
);
676+
runOnlyForDeploymentPostprocessing = 0;
677+
shellPath = /bin/sh;
678+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n [ -f .swiftlint.yml ] && CONFIG=\".swiftlint.yml\" || CONFIG=\"$HOME/.swiftlint.yml\"\n swiftlint lint --config $CONFIG\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
679+
showEnvVarsInLog = 0;
680+
};
681+
6564A21D1CA34D2B00ED2F77 /* Swift Lint */ = {
682+
isa = PBXShellScriptBuildPhase;
683+
buildActionMask = 2147483647;
684+
files = (
685+
);
686+
inputPaths = (
687+
);
688+
name = "Swift Lint";
689+
outputPaths = (
690+
);
691+
runOnlyForDeploymentPostprocessing = 0;
692+
shellPath = /bin/sh;
693+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n [ -f .swiftlint.yml ] && CONFIG=\".swiftlint.yml\" || CONFIG=\"$HOME/.swiftlint.yml\"\n swiftlint lint --config $CONFIG\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
694+
showEnvVarsInLog = 0;
695+
};
632696
65C6D35E1C640AFF0090F6B3 /* Carthage Copy Frameworks */ = {
633697
isa = PBXShellScriptBuildPhase;
634698
buildActionMask = 2147483647;
@@ -793,6 +857,8 @@
793857
65F6F8921C62B77800155987 /* Debug */ = {
794858
isa = XCBuildConfiguration;
795859
buildSettings = {
860+
ENABLE_TESTABILITY = YES;
861+
ONLY_ACTIVE_ARCH = YES;
796862
};
797863
name = Debug;
798864
};

‎FX.xcodeproj/xcshareddata/xcschemes/FX-OSX.xcscheme

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

‎FX.xcodeproj/xcshareddata/xcschemes/FX-iOS.xcscheme

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

‎FX.xcodeproj/xcshareddata/xcschemes/FX-tvOS.xcscheme

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

‎FX.xcodeproj/xcshareddata/xcschemes/FX-watchOS.xcscheme

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

‎Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source 'https://rubygems.org'
22

3+
gem 'slather'
34
gem 'scan'
45
gem 'fastlane', '>= 1.35'
56
gem 'xcpretty'

0 commit comments

Comments
 (0)