From 03d015a81ede394874c04afab90ca1adef83c7ff Mon Sep 17 00:00:00 2001 From: Daniel Thorpe Date: Mon, 12 Dec 2016 16:24:51 +0100 Subject: [PATCH] 2.0.1 (#68) * Updates to Swift 3.0 (#63) * [swift/3.0]: Gets framework building in Swift 3.0 * [swift/3.0]: Swift 3.0 tests passing * [swift/3.0]: Gets the podspec validating * Uses higher version of ValueCoding (#66) which support Swift 3.0.1 * Sorts out builds for Swift 3 (#67) * [MNY-67]: Updates Cartfile resolved * [OPR-67]: Fixes pipeline for iOS queue * [2.0.1]: Updates the versions --- .ci/buildkite/pipeline.template.yml | 4 ++-- Cartfile | 2 +- Cartfile.resolved | 2 +- Money.podspec | 2 +- Money.xcodeproj/project.pbxproj | 2 ++ Supporting Files/Money.xcconfig | 2 ++ Supporting Files/Version.xcconfig | 2 +- Supporting Files/Warnings.xcconfig | 27 +++++++++++++++++++++++++++ 8 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 Supporting Files/Warnings.xcconfig diff --git a/.ci/buildkite/pipeline.template.yml b/.ci/buildkite/pipeline.template.yml index 3e1d81a..4b31177 100755 --- a/.ci/buildkite/pipeline.template.yml +++ b/.ci/buildkite/pipeline.template.yml @@ -8,11 +8,11 @@ steps: name: "iOS" command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_ios" agents: - iOS-Simulator: true + queue: "iOS-Simulator" xcode: "$XCODE" - name: "tvOS" command: "source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby ruby && bundle install --quiet && bundle exec fastlane test_tvos" agents: - iOS-Simulator: true + queue: "iOS-Simulator" xcode: "$XCODE" diff --git a/Cartfile b/Cartfile index 56b3ea8..8346379 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "danthorpe/ValueCoding" "2.0.0" +github "danthorpe/ValueCoding" "2.1.0" diff --git a/Cartfile.resolved b/Cartfile.resolved index 56b3ea8..8346379 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "danthorpe/ValueCoding" "2.0.0" +github "danthorpe/ValueCoding" "2.1.0" diff --git a/Money.podspec b/Money.podspec index 5dce1ff..307d0c6 100644 --- a/Money.podspec +++ b/Money.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Money" - s.version = "2.0.0" + s.version = "2.0.1" s.summary = "Swift types for working with Money." s.description = <<-DESC diff --git a/Money.xcodeproj/project.pbxproj b/Money.xcodeproj/project.pbxproj index 49d689f..becee0e 100644 --- a/Money.xcodeproj/project.pbxproj +++ b/Money.xcodeproj/project.pbxproj @@ -90,6 +90,7 @@ 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 = ""; }; + 65AA39ED1DFEF418000942A7 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 65ECB2BF1DB4134C00F96F46 /* Autogenerate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Autogenerate.h; sourceTree = ""; }; 65ECB2C01DB4134C00F96F46 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -158,6 +159,7 @@ 655155101DB3D45100368D35 /* Carthage.xcconfig */, 65599E6B1DB3CFD300EC123C /* Money.xcconfig */, 65599E6C1DB3CFD300EC123C /* Version.xcconfig */, + 65AA39ED1DFEF418000942A7 /* Warnings.xcconfig */, ); path = "Supporting Files"; sourceTree = ""; diff --git a/Supporting Files/Money.xcconfig b/Supporting Files/Money.xcconfig index 2c59830..a31ec10 100644 --- a/Supporting Files/Money.xcconfig +++ b/Supporting Files/Money.xcconfig @@ -45,4 +45,6 @@ LD_RUNPATH_SEARCH_PATHS_framework = @executable_path/../Frameworks @loader_path/ 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)) +#include "Warnings.xcconfig" #include "Carthage.xcconfig" + diff --git a/Supporting Files/Version.xcconfig b/Supporting Files/Version.xcconfig index 02b7324..997e8ea 100644 --- a/Supporting Files/Version.xcconfig +++ b/Supporting Files/Version.xcconfig @@ -1 +1 @@ -MONEY_VERSION = 2.0.0 +MONEY_VERSION = 2.0.1 diff --git a/Supporting Files/Warnings.xcconfig b/Supporting Files/Warnings.xcconfig new file mode 100644 index 0000000..731fc7d --- /dev/null +++ b/Supporting Files/Warnings.xcconfig @@ -0,0 +1,27 @@ +// +// Money +// +// Copyright © 2016 Money. All rights reserved. +// + +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +ENABLE_TESTABILITY = YES +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 +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_ANALYZER_NONNULL = YES