From 4fe35301acbe2c0842f38e0e5057b4f9fa406eb9 Mon Sep 17 00:00:00 2001 From: Eddie Kaiger Date: Wed, 28 Mar 2018 14:19:09 -0700 Subject: [PATCH 1/3] Ignore tests in code coverage report. --- codecov.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codecov.yml b/codecov.yml index 0da9ac5..1df9c02 100644 --- a/codecov.yml +++ b/codecov.yml @@ -5,6 +5,8 @@ comment: behavior: default layout: header, diff require_changes: false +ignore: + - "SwiftyAttributesTests" coverage: precision: 2 range: "70...99" From 0a0f369366461365839914b50b44432682fc8a5f Mon Sep 17 00:00:00 2001 From: Eddie Kaiger Date: Tue, 3 Apr 2018 23:13:43 -0700 Subject: [PATCH 2/3] Remove warning in Swift 4.1. Upgrade to new recommended Xcode project settings. --- SwiftyAttributes.xcodeproj/project.pbxproj | 10 +++++++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/xcschemes/ExampleApp-iOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/ExampleApp-macOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/SwiftyAttributes.xcscheme | 8 +++----- .../xcschemes/SwiftyAttributesTests.xcscheme | 4 +--- SwiftyAttributes/Sources/common/Attribute.swift | 6 +++++- 7 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 SwiftyAttributes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/SwiftyAttributes.xcodeproj/project.pbxproj b/SwiftyAttributes.xcodeproj/project.pbxproj index 96b0b55..18b48d8 100644 --- a/SwiftyAttributes.xcodeproj/project.pbxproj +++ b/SwiftyAttributes.xcodeproj/project.pbxproj @@ -355,7 +355,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0810; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Eddie Kaiger"; TargetAttributes = { C03658F61DC859D80051F06D = { @@ -691,6 +691,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -698,6 +699,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -733,7 +735,7 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos appletvos appletvsimulator iphoneos iphonesimulator macosx"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -755,6 +757,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -762,6 +765,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -789,7 +793,7 @@ PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL; SUPPORTED_PLATFORMS = "watchsimulator watchos appletvos appletvsimulator iphoneos iphonesimulator macosx"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; diff --git a/SwiftyAttributes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftyAttributes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftyAttributes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-iOS.xcscheme b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-iOS.xcscheme index e9615dd..3252505 100644 --- a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-iOS.xcscheme +++ b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-macOS.xcscheme b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-macOS.xcscheme index c1031e7..4bad854 100644 --- a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-macOS.xcscheme +++ b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/ExampleApp-macOS.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributes.xcscheme b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributes.xcscheme index a31959a..2390ce3 100644 --- a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributes.xcscheme +++ b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributes.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributesTests.xcscheme b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributesTests.xcscheme index 598265f..b7ff0b4 100644 --- a/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributesTests.xcscheme +++ b/SwiftyAttributes.xcodeproj/xcshareddata/xcschemes/SwiftyAttributesTests.xcscheme @@ -1,6 +1,6 @@ =4.1) + ret = .writingDirections(values.compactMap(WritingDirection.init)) + #else + ret = .writingDirections(values.flatMap(WritingDirection.init)) + #endif default: break } From 1854a09dede0b84d1df1cf6cde97449562d0594f Mon Sep 17 00:00:00 2001 From: Eddie Kaiger Date: Mon, 9 Apr 2018 23:12:09 -0700 Subject: [PATCH 3/3] Update podspec. --- SwiftyAttributes.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SwiftyAttributes.podspec b/SwiftyAttributes.podspec index 03d6846..258acec 100644 --- a/SwiftyAttributes.podspec +++ b/SwiftyAttributes.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "SwiftyAttributes" - s.version = "4.1.0" + s.version = "4.1.1" s.summary = "A Swifty API for attributed strings." s.description = <<-DESC @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.homepage = "https://github.com/eddiekaiger/SwiftyAttributes" s.license = { :type => "MIT", :file => "LICENSE" } s.author = { "Eddie Kaiger" => "eddiekaiger@gmail.com" } - s.source = { :git => "https://github.com/eddiekaiger/SwiftyAttributes.git", :tag => "v4.1.0" } + s.source = { :git => "https://github.com/eddiekaiger/SwiftyAttributes.git", :tag => "v4.1.1" } s.source_files = "SwiftyAttributes/Sources/common/*.swift" s.osx.source_files = "SwiftyAttributes/Sources/macOS/*.swift"