Merge branch 'release/1.2.0'

bbriatte · bbriatte · commit 85790096de3d · 2019-01-06T23:03:09.000+01:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -6,3 +6,4 @@ excluded:
 disabled_rules:
   - nesting
   - redundant_optional_initialization
+  - inert_defer
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Digipolitan
+Copyright (c) 2019, Digipolitan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -11,7 +11,7 @@ let package = Package(
             targets: ["PolymorphCore"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Digipolitan/string-case-swift.git", from: "1.0.0")
+        .package(url: "https://github.com/Digipolitan/string-case-swift.git", from: "1.1.0")
     ],
     targets: [
         .target(
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 PolymorphCore
 =================================
 
-[![Swift Version](https://img.shields.io/badge/swift-4.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
+[![Swift Version](https://img.shields.io/badge/swift-4.2-orange.svg?style=flat)](https://developer.apple.com/swift/)
 [![Swift Package Manager](https://rawgit.com/jlyonsmith/artwork/master/SwiftPackageManager/swiftpackagemanager-compatible.svg)](https://swift.org/package-manager/)
 [![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
 
diff --git a/Sources/PolymorphCore/Class.swift b/Sources/PolymorphCore/Class.swift
@@ -142,8 +142,8 @@ public class Class: Object, Documentable, Packageable {
 
 extension Class: Hashable {
 
-    public var hashValue: Int {
-        return self.id.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.id)
     }
 
     public static func == (lhs: Class, rhs: Class) -> Bool {
diff --git a/Sources/PolymorphCore/Enum.swift b/Sources/PolymorphCore/Enum.swift
@@ -79,8 +79,8 @@ public class Enum: Object, Documentable, Packageable {
     }
 
     public func addValue(_ value: Value) -> Bool {
-        for v in self.values {
-            guard v.name != value.name else {
+        for val in self.values {
+            guard val.name != value.name else {
                 return false
             }
         }
@@ -91,8 +91,8 @@ public class Enum: Object, Documentable, Packageable {
 
 extension Enum: Hashable {
 
-    public var hashValue: Int {
-        return self.id.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.id)
     }
 
     public static func == (lhs: Enum, rhs: Enum) -> Bool {
diff --git a/Sources/PolymorphCore/External.swift b/Sources/PolymorphCore/External.swift
@@ -68,8 +68,8 @@ public class External: Object, Documentable, Packageable {
 
 extension External: Hashable {
 
-    public var hashValue: Int {
-        return self.id.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.id)
     }
 
     public static func == (lhs: External, rhs: External) -> Bool {
diff --git a/Sources/PolymorphCore/Models.swift b/Sources/PolymorphCore/Models.swift
@@ -55,11 +55,11 @@ public class Models: Documentable, Codable {
     }
 
     public func findObject(name: String) -> Object? {
-        if let c = self.findClass(name: name) {
-            return c
+        if let clazz = self.findClass(name: name) {
+            return clazz
         }
-        if let e = self.findEnum(name: name) {
-            return e
+        if let enu = self.findEnum(name: name) {
+            return enu
         }
         return self.findExternal(name: name)
     }
diff --git a/Sources/PolymorphCore/Native.swift b/Sources/PolymorphCore/Native.swift
@@ -77,8 +77,8 @@ public class Native: Member {
 
 extension Native: Hashable {
 
-    public var hashValue: Int {
-        return self.name.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.name)
     }
 
     public static func == (lhs: Native, rhs: Native) -> Bool {
diff --git a/Sources/PolymorphCore/Network.swift b/Sources/PolymorphCore/Network.swift
@@ -44,8 +44,8 @@ public class Network: Documentable, Codable {
     }
 
     public func findObject(name: String) -> Object? {
-        if let c = self.findService(name: name) {
-            return c
+        if let service = self.findService(name: name) {
+            return service
         }
         return nil
     }
diff --git a/Sources/PolymorphCore/Property.swift b/Sources/PolymorphCore/Property.swift
@@ -112,8 +112,8 @@ public class Property: Member, Documentable, Codable {
 
 extension Property: Hashable {
 
-    public var hashValue: Int {
-        return self.name.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.name)
     }
 
     public static func == (lhs: Property, rhs: Property) -> Bool {
diff --git a/Sources/PolymorphCore/Transformer.swift b/Sources/PolymorphCore/Transformer.swift
@@ -44,8 +44,8 @@ public class Transformer: Member {
 
 extension Transformer: Hashable {
 
-    public var hashValue: Int {
-        return self.name.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self.name)
     }
 
     public static func == (lhs: Transformer, rhs: Transformer) -> Bool {
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -1,6 +1,7 @@
 import XCTest
-@testable import PolymorpthCoreTests
 
-XCTMain([
-    testCase(PolymorpthCoreTests.allTests)
-])
+import PolymorphCoreTests
+
+var tests = [XCTestCaseEntry]()
+tests += PolymorphCoreTests.allTests()
+XCTMain(tests)
diff --git a/Tests/PolymorphCoreTests/PolymorphCoreTests.swift b/Tests/PolymorphCoreTests/PolymorphCoreTests.swift
@@ -8,10 +8,10 @@ class PolymorphCoreTests: XCTestCase {
             XCTFail("Cannot create package")
             return
         }
-        let p = Project(name: "Sample", package: package)
+        let proj = Project(name: "Sample", package: package)
 
         let encoder = JSONEncoder()
-        if let data = try? encoder.encode(p),
+        if let data = try? encoder.encode(proj),
             let json = String(data: data, encoding: .utf8) {
             print(json)
         }
diff --git a/Tests/PolymorphCoreTests/XCTestManifests.swift b/Tests/PolymorphCoreTests/XCTestManifests.swift
@@ -0,0 +1,9 @@
+import XCTest
+
+#if !os(macOS)
+public func allTests() -> [XCTestCaseEntry] {
+    return [
+        testCase(PolymorphCoreTests.allTests)
+    ]
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ public class Class: Object, Documentable, Packageable {`
`142`	`142`
`143`	`143`	`extension Class: Hashable {`
`144`	`144`
`145`		`- public var hashValue: Int {`
`146`		`- return self.id.hashValue`
	`145`	`+ public func hash(into hasher: inout Hasher) {`
	`146`	`+ hasher.combine(self.id)`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public static func == (lhs: Class, rhs: Class) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public class Enum: Object, Documentable, Packageable {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public func addValue(_ value: Value) -> Bool {`
`82`		`- for v in self.values {`
`83`		`- guard v.name != value.name else {`
	`82`	`+ for val in self.values {`
	`83`	`+ guard val.name != value.name else {`
`84`	`84`	`return false`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -91,8 +91,8 @@ public class Enum: Object, Documentable, Packageable {`
`91`	`91`
`92`	`92`	`extension Enum: Hashable {`
`93`	`93`
`94`		`- public var hashValue: Int {`
`95`		`- return self.id.hashValue`
	`94`	`+ public func hash(into hasher: inout Hasher) {`
	`95`	`+ hasher.combine(self.id)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public static func == (lhs: Enum, rhs: Enum) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ public class External: Object, Documentable, Packageable {`
`68`	`68`
`69`	`69`	`extension External: Hashable {`
`70`	`70`
`71`		`- public var hashValue: Int {`
`72`		`- return self.id.hashValue`
	`71`	`+ public func hash(into hasher: inout Hasher) {`
	`72`	`+ hasher.combine(self.id)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public static func == (lhs: External, rhs: External) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ public class Models: Documentable, Codable {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public func findObject(name: String) -> Object? {`
`58`		`- if let c = self.findClass(name: name) {`
`59`		`- return c`
	`58`	`+ if let clazz = self.findClass(name: name) {`
	`59`	`+ return clazz`
`60`	`60`	`}`
`61`		`- if let e = self.findEnum(name: name) {`
`62`		`- return e`
	`61`	`+ if let enu = self.findEnum(name: name) {`
	`62`	`+ return enu`
`63`	`63`	`}`
`64`	`64`	`return self.findExternal(name: name)`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ public class Native: Member {`
`77`	`77`
`78`	`78`	`extension Native: Hashable {`
`79`	`79`
`80`		`- public var hashValue: Int {`
`81`		`- return self.name.hashValue`
	`80`	`+ public func hash(into hasher: inout Hasher) {`
	`81`	`+ hasher.combine(self.name)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public static func == (lhs: Native, rhs: Native) -> Bool {`