Merge pull request tristanhimmelman#1 from tristanhimmelman/master

Merge master to emrcftci/master

Author: Emre Çiftçi

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+## Why <!-- Describe why you are making the change -->
+
+
+
+## What <!-- Describe what changed -->

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode11.3
 
 env:
   global:
@@ -14,19 +14,13 @@ env:
     #iOS
     - DESTINATION="OS=11.4,name=iPhone X"            SCHEME="$IOS_FRAMEWORK_SCHEME"      RUN_TESTS="YES"
     - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"      RUN_TESTS="YES"
-    - DESTINATION="OS=9.3,name=iPhone 6"             SCHEME="$IOS_FRAMEWORK_SCHEME"      RUN_TESTS="YES"
     #macOS
     - DESTINATION="arch=x86_64"                      SCHEME="$OSX_FRAMEWORK_SCHEME"      RUN_TESTS="YES"
-    #watchOS
-    - DESTINATION="OS=4.3,name=Apple Watch - 42mm"   SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  RUN_TESTS="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"   SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  RUN_TESTS="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"   SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  RUN_TESTS="NO"
     #tvOS
     - DESTINATION="OS=11.4,name=Apple TV 4K"         SCHEME="$TVOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"      SCHEME="$TVOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES"
 
 before_install:
-  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+  - gem install xcpretty --no-document --quiet
 
 script:
   - set -o pipefail

ObjectMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ObjectMapper'
-  s.version = '3.5.0'
+  s.version = '3.5.2'
   s.license = 'MIT'
   s.summary = 'JSON Object mapping written in Swift'
   s.homepage = 'https://github.com/tristanhimmelman/ObjectMapper'

Package.swift

@@ -1,5 +1,11 @@
 import PackageDescription
 
 let package = Package(
-    name: "ObjectMapper"
+    name: "ObjectMapper",
+    targets: [
+        .target(
+            name: "ObjectMapper", 
+            path: "Sources"
+        )
+    ],
 )

Package@swift-4.2.swift

@@ -11,7 +11,7 @@ let package = Package(
     targets: [
         .target(
             name: "ObjectMapper", 
-            dependencies: []
+            path: "Sources"
         )
     ],
     swiftLanguageVersions: [.v3, .v4, .v4_2]

Package@swift-4.swift

@@ -11,7 +11,7 @@ let package = Package(
     targets: [
         .target(
             name: "ObjectMapper", 
-            dependencies: []
+            path: "Sources"
         )
     ],
     swiftLanguageVersions = [3, 4]

README.md

@@ -451,6 +451,8 @@ Note: Generating a JSON string of a Realm Object using ObjectMappers' `toJSON` f
 
 - [Json4Swift - Supports generating `ImmutableMappable` structs online (no plugins needed)](http://www.json4swift.com)
 
+- [JSON to Model - Template based MacOS app which generates structs with customisation.](https://github.com/chanonly123/Json-Model-Generator)  [⬇️Download App](https://github.com/chanonly123/Json-Model-Generator/raw/master/JsonToModel.zip)
+
 If you have a project that utilizes, extends or provides tooling for ObjectMapper, please submit a PR with a link to your project in this section of the README.
 
 # To Do
@@ -468,14 +470,14 @@ Before submitting any pull request, please ensure you have run the included test
 ObjectMapper can be added to your project using [CocoaPods 0.36 or later](http://blog.cocoapods.org/Pod-Authors-Guide-to-CocoaPods-Frameworks/) by adding the following line to your `Podfile`:
 
 ```ruby
-pod 'ObjectMapper', '~> 3.4'
+pod 'ObjectMapper', '~> 3.5' (check releases to make sure this is the latest version)
 ```
 
 ### Carthage
 If you're using [Carthage](https://github.com/Carthage/Carthage) you can add a dependency on ObjectMapper by adding it to your `Cartfile`:
 
 ```
-github "tristanhimmelman/ObjectMapper" ~> 3.4
+github "tristanhimmelman/ObjectMapper" ~> 3.5 (check releases to make sure this is the latest version)
 ```
 
 ### Swift Package Manager

Sources/Mappable.swift

@@ -46,7 +46,7 @@ public protocol StaticMappable: BaseMappable {
 	static func objectForMapping(map: Map) -> BaseMappable?
 }
 
-public extension BaseMappable {
+public extension Mappable {
 
 	/// Initializes object from a JSON String
 	init?(JSONString: String, context: MapContext? = nil) {
@@ -65,12 +65,15 @@ public extension BaseMappable {
 			return nil
 		}
 	}
-	
+}
+
+public extension BaseMappable {
+
 	/// Returns the JSON Dictionary for the object
 	func toJSON() -> [String: Any] {
 		return Mapper().toJSON(self)
 	}
-	
+
 	/// Returns the JSON String for the object
 	func toJSONString(prettyPrint: Bool = false) -> String? {
 		return Mapper().toJSONString(self, prettyPrint: prettyPrint)

Sources/Mapper.swift

@@ -114,6 +114,7 @@ public final class Mapper<N: BaseMappable> {
 				}
 			} catch let error {
 				#if DEBUG
+				#if !os(Linux)
 				let exception: NSException
 				if let mapError = error as? MapError {
 					exception = NSException(name: .init(rawValue: "MapError"), reason: mapError.description, userInfo: nil)
@@ -122,6 +123,7 @@ public final class Mapper<N: BaseMappable> {
 				}
 				exception.raise()
 				#endif
+				#endif
 			}
 		} else {
 			// Ensure BaseMappable is not implemented directly