From 51edea10790ee995f31213272032e1dbb4ee406a Mon Sep 17 00:00:00 2001 From: Alex Moisei Date: Tue, 25 Sep 2018 10:14:19 +0200 Subject: [PATCH] Updated PromiseKit dependency to 6.4.1 --- Cartfile | 2 +- Cartfile.resolved | 2 +- ServiceStack.podspec | 2 +- ServiceStack.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/ServiceStack-iOS.xcscheme | 8 +++----- .../xcshareddata/xcschemes/ServiceStack-macOS.xcscheme | 8 +++----- .../xcshareddata/xcschemes/ServiceStack-tvOS.xcscheme | 8 +++----- .../xcshareddata/xcschemes/ServiceStack-watchOS.xcscheme | 8 +++----- Sources/DateExtensions.swift | 3 ++- Sources/Json.swift | 6 ++---- Tests/TechStacks.dtos.swift | 3 +-- Tests/Template.swift | 3 ++- Tests/Test.dtos.swift | 3 +-- license.txt | 2 +- 14 files changed, 29 insertions(+), 35 deletions(-) diff --git a/Cartfile b/Cartfile index 75a3e25..49cca04 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "mxcl/PromiseKit" ~> 6.0.0 +github "mxcl/PromiseKit" ~> 6.4.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index f42eac2..a1699c6 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "mxcl/PromiseKit" "6.2.5" +github "mxcl/PromiseKit" "6.4.1" diff --git a/ServiceStack.podspec b/ServiceStack.podspec index cce30c7..62f1eb6 100644 --- a/ServiceStack.podspec +++ b/ServiceStack.podspec @@ -25,6 +25,6 @@ s.source_files = "Sources/**/*" #s.resource_bundles = { "ServiceStack" => ["Resources/*.lproj"] } s.frameworks = "Foundation" -s.dependency 'PromiseKit' +s.dependency 'PromiseKit', '6.4.1' end diff --git a/ServiceStack.xcodeproj/project.pbxproj b/ServiceStack.xcodeproj/project.pbxproj index 68e4c64..39e6627 100644 --- a/ServiceStack.xcodeproj/project.pbxproj +++ b/ServiceStack.xcodeproj/project.pbxproj @@ -517,7 +517,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = ServiceStack; TargetAttributes = { 52D6D97B1BEFF229002C0205 = { @@ -1006,12 +1006,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; @@ -1063,12 +1065,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; diff --git a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-iOS.xcscheme b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-iOS.xcscheme index 2d33327..8bf8cc7 100644 --- a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-iOS.xcscheme +++ b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-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" diff --git a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-macOS.xcscheme b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-macOS.xcscheme index f85df4f..a57b925 100644 --- a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-macOS.xcscheme +++ b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-macOS.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/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-tvOS.xcscheme b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-tvOS.xcscheme index 51da322..4d4f320 100644 --- a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-tvOS.xcscheme +++ b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-tvOS.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/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-watchOS.xcscheme b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-watchOS.xcscheme index 1a63e91..16f8058 100644 --- a/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-watchOS.xcscheme +++ b/ServiceStack.xcodeproj/xcshareddata/xcschemes/ServiceStack-watchOS.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,7 +37,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/DateExtensions.swift b/Sources/DateExtensions.swift index e3b3619..db75167 100755 --- a/Sources/DateExtensions.swift +++ b/Sources/DateExtensions.swift @@ -31,7 +31,8 @@ public extension Date { public func components() -> DateComponents { let components = NSCalendar.current.dateComponents( [Calendar.Component.day, Calendar.Component.month, Calendar.Component.year], - from: self as Date) + from: self as Date + ) return components } diff --git a/Sources/Json.swift b/Sources/Json.swift index e1be74f..b36f36d 100755 --- a/Sources/Json.swift +++ b/Sources/Json.swift @@ -1033,8 +1033,7 @@ public class PropertyType { return nil } - public func setValueAny(instance _: Any, value _: Any) { - } + public func setValueAny(instance _: Any, value _: Any) {} public func getValueAny(instance _: Any) -> Any? { return nil @@ -1068,8 +1067,7 @@ public class PropertyBase: PropertyType { } } - public func setValue(instance _: T, value _: Any) { - } + public func setValue(instance _: T, value _: Any) {} public override func getValueAny(instance: Any) -> Any? { return getValue(instance: instance as! T) diff --git a/Tests/TechStacks.dtos.swift b/Tests/TechStacks.dtos.swift index 20d6908..dbf9699 100755 --- a/Tests/TechStacks.dtos.swift +++ b/Tests/TechStacks.dtos.swift @@ -1754,8 +1754,7 @@ public class TechnologyHistory: TechnologyBase { public var operation: String? } -public protocol IRegisterStats { -} +public protocol IRegisterStats {} public enum TechnologyTier: Int { case ProgrammingLanguage diff --git a/Tests/Template.swift b/Tests/Template.swift index e372ff5..d9c45a5 100755 --- a/Tests/Template.swift +++ b/Tests/Template.swift @@ -30,7 +30,8 @@ Type