Merge pull request #15 from Dimentar/develop

Xcode 10 Support
ServiceStack · Sep 25, 2018 · 0a49cb3 · 0a49cb3
2 parents e39d902 + 789b581
commit 0a49cb3
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 35 deletions.
diff --git 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
@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.2.5"
+github "mxcl/PromiseKit" "6.4.1"
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <AdditionalOptions>
@@ -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
@@ -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
@@ -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<T: HasMetadata>: 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
@@ -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
@@ -30,7 +30,8 @@
                     Type<Option>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
                     Type<Option>.optionalProperty("title", get: { $0.title }, set: { $0.title = $1 }),
                     Type<Option>.optionalProperty("value", get: { $0.value }, set: { $0.value = $1 }),
-            ]))
+                ]
+            ))
         }
         public func toJson() -> String {
             return Option.reflect().toJson(self)

diff --git a/Tests/Test.dtos.swift b/Tests/Test.dtos.swift
@@ -1445,8 +1445,7 @@ public protocol IPoco {
     var name: String? { get set }
 }
 
-public protocol IEmptyInterface {
-}
+public protocol IEmptyInterface {}
 
 public class EmptyClass {
     public required init() {}

diff --git a/license.txt b/license.txt
@@ -22,4 +22,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "mxcl/PromiseKit" ~> 6.0.0
		github "mxcl/PromiseKit" ~> 6.4.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "mxcl/PromiseKit" "6.2.5"
		github "mxcl/PromiseKit" "6.4.1"