Merge branch 'release/1.1.0'

.ci/buildkite/pipeline.template.yml

@@ -1,4 +1,7 @@
 steps:
+  -
+    name: ":muscle: Lint"
+    command: .ci/scripts/lint    
   -
     name: ":fastlane: Test iOS"
     command: .ci/scripts/test-ios

.ci/scripts/lint

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+source /usr/local/opt/chruby/share/chruby/chruby.sh
+chruby ruby
+bundle exec fastlane lint

.ci/scripts/send-coverage

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

.fastlane/Fastfile

@@ -1,10 +1,20 @@
+
+lane :lint do
+
+    swiftLint(
+        mode: :lint, 
+        config_file: '.swiftlint.yml'
+    )
+end
+
 platform :ios do
 
   desc "Runs all the tests"
   lane :test do
 
     carthage(
-      platform: "iOS"
+      platform: "iOS",
+      use_binaries: false
     )
 
     scan(
@@ -23,7 +33,8 @@ platform :mac do
   lane :test do
 
     carthage(
-      platform: "Mac"
+      platform: "Mac",
+      use_binaries: false      
     )    
 
     scan(

.jazzy.yaml → .jazzy.yml

@@ -1,11 +1,11 @@
 author_name: Daniel Thorpe
 author_url: http://danthorpe.me
 module_name: MoneyFX
-module_version: 1.0.0
+module_version: 1.1.0
 github_url: https://github.com/danthorpe/FX
 readme: README.md
 podspec: MoneyFX.podspec
 
-swift_version: 2.1.1
+swift_version: 2.2
 xcodebuild-arguments: -scheme,FX-iOS
 

.slather.yml

@@ -0,0 +1,6 @@
+coverage_service: coveralls
+xcodeproj: FX.xcodeproj
+build_directory: .ci/xcodebuild-data
+ignore:
+  - Tests/*
+  - Supporting Files/*

.swiftlint.yml

@@ -0,0 +1,13 @@
+excluded:
+  - Carthage
+  - Tests
+disabled_rules:
+#  - valid_docs
+#  - statement_position
+  - line_length
+  - type_name
+  - variable_name
+file_length:
+  warning: 750
+  error: 1200
+

CHANGELOG.md

@@ -1,2 +1,7 @@
+# 1.1.0
+1. [[FX-2](https://github.com/danthorpe/FX/pull/2)]: Corrects the spelling of CocoaPods - thanks @ReadmeCritic & @orta.
+2. [[FX-3](https://github.com/danthorpe/FX/pull/3)]: Moves test coverage reporting to Coveralls. Includes SwiftLint into local and CI build phases.
+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.
+
 # 1.0.0
 🎉🐝 Initial release of Money FX.

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "venmo/DVR" "v0.2.1"
 github "antitypical/Result" "1.0.2"
 github "SwiftyJSON/SwiftyJSON" "2.3.3"
-github "danthorpe/ValueCoding" "1.2.0"
-github "danthorpe/Money" "0c14d7bb6449e9f2f394b37927f6b01614dbde55"
+github "danthorpe/ValueCoding" "1.3.0"
+github "danthorpe/Money" "1.7.0"

FX.xcodeproj/project.pbxproj

@@ -381,6 +381,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 65F6F8AF1C62B84500155987 /* Build configuration list for PBXNativeTarget "FX-iOS" */;
 			buildPhases = (
+				6564A21A1CA34CDD00ED2F77 /* Swift Lint */,
 				65F6F8941C62B84500155987 /* Sources */,
 				65F6F8951C62B84500155987 /* Frameworks */,
 				65F6F8961C62B84500155987 /* Headers */,
@@ -418,6 +419,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 65F6F8BB1C62B87E00155987 /* Build configuration list for PBXNativeTarget "FX-watchOS" */;
 			buildPhases = (
+				6564A21B1CA34CFB00ED2F77 /* Swift Lint */,
 				65F6F8B11C62B87E00155987 /* Sources */,
 				65F6F8B21C62B87E00155987 /* Frameworks */,
 				65F6F8B31C62B87E00155987 /* Headers */,
@@ -436,6 +438,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 65F6F8D41C62B89D00155987 /* Build configuration list for PBXNativeTarget "FX-tvOS" */;
 			buildPhases = (
+				6564A21C1CA34D1700ED2F77 /* Swift Lint */,
 				65F6F8BE1C62B89D00155987 /* Sources */,
 				65F6F8BF1C62B89D00155987 /* Frameworks */,
 				65F6F8C01C62B89D00155987 /* Headers */,
@@ -473,6 +476,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 65F6F8F01C62B8DA00155987 /* Build configuration list for PBXNativeTarget "FX-OSX" */;
 			buildPhases = (
+				6564A21D1CA34D2B00ED2F77 /* Swift Lint */,
 				65F6F8DA1C62B8DA00155987 /* Sources */,
 				65F6F8DB1C62B8DA00155987 /* Frameworks */,
 				65F6F8DC1C62B8DA00155987 /* Headers */,
@@ -513,7 +517,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0730;
 				TargetAttributes = {
 					65F6F8981C62B84500155987 = {
 						CreatedOnToolsVersion = 7.2.1;
@@ -629,6 +633,66 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		6564A21A1CA34CDD00ED2F77 /* Swift Lint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Swift Lint";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+			showEnvVarsInLog = 0;
+		};
+		6564A21B1CA34CFB00ED2F77 /* Swift Lint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Swift Lint";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+			showEnvVarsInLog = 0;
+		};
+		6564A21C1CA34D1700ED2F77 /* Swift Lint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Swift Lint";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+			showEnvVarsInLog = 0;
+		};
+		6564A21D1CA34D2B00ED2F77 /* Swift Lint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Swift Lint";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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";
+			showEnvVarsInLog = 0;
+		};
 		65C6D35E1C640AFF0090F6B3 /* Carthage Copy Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -793,6 +857,8 @@
 		65F6F8921C62B77800155987 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
+				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
 		};

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'slather'
 gem 'scan'
 gem 'fastlane', '>= 1.35'
 gem 'xcpretty'