fix inheritance test fail & update podspec to 5.0.0-beta

chantu · chantu · commit 387d757a1b82 · 2019-03-26T16:34:49.000+08:00
diff --git a/HandyJSON.podspec b/HandyJSON.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
     s.author = {'xuyecan' => 'xuyecan@gmail.com'}
     s.license = 'Apache License 2.0'
     s.requires_arc = true
-    s.version = '4.2.1'
+    s.version = '5.0.0-beta'
     s.homepage = "https://github.com/alibaba/handyjson"
     s.name = "HandyJSON"
 
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
     s.watchos.deployment_target = '2.0'
     s.tvos.deployment_target = '9.0'
 
-    s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
+    s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
 end
diff --git a/HandyJSONDemo/ViewController.swift b/HandyJSONDemo/ViewController.swift
@@ -44,13 +44,23 @@ struct Subject: HandyJSON {
     var lessonPeriod: Int?
 }
 
-class Student: HandyJSON {
-    var id: String?
+class Person: HandyJSON {
     var name: String?
     var age: Int?
-    var grade: Grade = .One
     var height: Int?
     var gender: Gender?
+
+    required init() {}
+}
+
+class IdentifiedPerson: Person {
+    var id: String?
+    
+    required init() {}
+}
+
+class Student: IdentifiedPerson {
+    var grade: Grade = .One
     var className: String?
     var teacher: Teacher = Teacher()
     var subjects: [Subject]?
diff --git a/Source/HelpingMapper.swift b/Source/HelpingMapper.swift
@@ -110,7 +110,7 @@ public class HelpingMapper {
         if let _converter = converter {
             let assignmentClosure = { (jsonValue: Any?) -> Any? in
                 if let _value = jsonValue{
-                    if let object = _value as? NSObject{
+                    if let object = _value as? NSObject {
                         if let str = String.transform(from: object){
                             return _converter(str)
                         }
diff --git a/Source/Metadata.swift b/Source/Metadata.swift
@@ -125,8 +125,10 @@ extension Metadata {
 
         var isSwiftClass: Bool {
             get {
-                let lowbit = self.pointer.pointee.databits & 1
-                return lowbit == 1
+                // see include/swift/Runtime/Config.h macro SWIFT_CLASS_IS_SWIFT_MASK
+                // it can be 1 or 2 depending on environment
+                let lowbit = self.pointer.pointee.databits & 3
+                return lowbit != 0
             }
         }
 
@@ -146,7 +148,7 @@ extension Metadata {
             }
 
             // ignore objc-runtime layer
-            guard let metaclass = Metadata.Class(anyType: superclass), metaclass.isSwiftClass else {
+            guard let metaclass = Metadata.Class(anyType: superclass) else {
                 return nil
             }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public class HelpingMapper {`
`110`	`110`	`if let _converter = converter {`
`111`	`111`	`let assignmentClosure = { (jsonValue: Any?) -> Any? in`
`112`	`112`	`if let _value = jsonValue{`
`113`		`- if let object = _value as? NSObject{`
	`113`	`+ if let object = _value as? NSObject {`
`114`	`114`	`if let str = String.transform(from: object){`
`115`	`115`	`return _converter(str)`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,10 @@ extension Metadata {`
`125`	`125`
`126`	`126`	`var isSwiftClass: Bool {`
`127`	`127`	`get {`
`128`		`- let lowbit = self.pointer.pointee.databits & 1`
`129`		`- return lowbit == 1`
	`128`	`+ // see include/swift/Runtime/Config.h macro SWIFT_CLASS_IS_SWIFT_MASK`
	`129`	`+ // it can be 1 or 2 depending on environment`
	`130`	`+ let lowbit = self.pointer.pointee.databits & 3`
	`131`	`+ return lowbit != 0`
`130`	`132`	`}`
`131`	`133`	`}`
`132`	`134`
`@@ -146,7 +148,7 @@ extension Metadata {`
`146`	`148`	`}`
`147`	`149`
`148`	`150`	`// ignore objc-runtime layer`
`149`		`- guard let metaclass = Metadata.Class(anyType: superclass), metaclass.isSwiftClass else {`
	`151`	`+ guard let metaclass = Metadata.Class(anyType: superclass) else {`
`150`	`152`	`return nil`
`151`	`153`	`}`
`152`	`154`