diff --git a/Sources/CAMediaTimingFunction+Windless.swift b/Sources/CAMediaTimingFunction+Windless.swift index 24bb3cb..8f65e4d 100644 --- a/Sources/CAMediaTimingFunction+Windless.swift +++ b/Sources/CAMediaTimingFunction+Windless.swift @@ -10,11 +10,11 @@ import UIKit public extension CAMediaTimingFunction { - static let linear = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear) + static let linear = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear) - static let easeIn = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn) + static let easeIn = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn) - static let easeOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + static let easeOut = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) - static let easeInOut = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + static let easeInOut = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) } diff --git a/Sources/TransitionFactory.swift b/Sources/TransitionFactory.swift index 5842812..4a82f7f 100644 --- a/Sources/TransitionFactory.swift +++ b/Sources/TransitionFactory.swift @@ -12,7 +12,7 @@ class TransitionFactory { static func fade() -> CATransition { let transition = CATransition() - transition.type = kCATransitionFade + transition.type = CATransitionType.fade return transition } } diff --git a/Sources/WindlessContext.swift b/Sources/WindlessContext.swift index 11a1ce5..7b712a0 100644 --- a/Sources/WindlessContext.swift +++ b/Sources/WindlessContext.swift @@ -53,7 +53,7 @@ extension WindlessContext { appendMultilineLayersPathIfNeeded(on: path) let maskLayer = CAShapeLayer() maskLayer.path = path.cgPath - maskLayer.fillRule = kCAFillRuleEvenOdd + maskLayer.fillRule = CAShapeLayerFillRule.evenOdd coverLayer.mask = maskLayer } diff --git a/Windless.xcodeproj/project.pbxproj b/Windless.xcodeproj/project.pbxproj index 72a1ef0..0f60e35 100644 --- a/Windless.xcodeproj/project.pbxproj +++ b/Windless.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0900; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = Windless; TargetAttributes = { 4A1C00B51FA102E5006DEA4C = { @@ -308,7 +308,7 @@ }; 52D6D9851BEFF229002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; }; }; @@ -497,12 +497,14 @@ 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_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; 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; @@ -554,12 +556,14 @@ 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_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; 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; @@ -613,7 +617,7 @@ PRODUCT_NAME = Windless; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -637,7 +641,7 @@ PRODUCT_NAME = Windless; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -650,7 +654,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Windless.Windless-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -663,7 +667,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Windless.Windless-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Windless.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Windless.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Windless.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Windless.xcodeproj/xcshareddata/xcschemes/Windless-iOS.xcscheme b/Windless.xcodeproj/xcshareddata/xcschemes/Windless-iOS.xcscheme index c1a5e07..649d782 100644 --- a/Windless.xcodeproj/xcshareddata/xcschemes/Windless-iOS.xcscheme +++ b/Windless.xcodeproj/xcshareddata/xcschemes/Windless-iOS.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"