Merge branch 'release/1.2.0'

.gitignore

@@ -45,7 +45,8 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-# Pods/
+Pods/
+Example/Pods/
 
 # Carthage
 #

APNSUtil.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'APNSUtil'
-  s.version          = '1.1.5'
+  s.version          = '1.2.0'
   s.summary          = 'APNSUtil is makes code simple using apple push notification service.'
   s.description      = 'APNSUtil is makes code simple using apple push notification service.'
   s.homepage         = 'https://github.com/pisces/APNSUtil'
@@ -17,5 +17,4 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'https://github.com/pisces/APNSUtil.git', :tag => s.version.to_s }
   s.ios.deployment_target = '9.0'
   s.source_files = 'APNSUtil/Classes/**/*'
-  s.dependency 'ObjectMapper', '~> 3.1'
 end

APNSUtil/Classes/APNSManager.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import UserNotifications
-import ObjectMapper
 
 public class APNSManager {
 
@@ -43,16 +42,19 @@ public class APNSManager {
         dequeue()
         return self
     }
-    public func didFinishLaunching<T: Mappable>(withOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?, as type: T.Type) {
+    public func didFinishLaunching<T: Decodable>(withOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?, as type: T.Type) {
         let remote = launchOptions?[UIApplicationLaunchOptionsKey.remoteNotification] as? [AnyHashable: Any]
         let local = launchOptions?[UIApplicationLaunchOptionsKey.localNotification] as? [AnyHashable: Any]
         guard let userInfo = remote ?? local else {return}
         didReceive(userInfo: userInfo, as: type, isInactive: true)
     }
-    public func didReceive<T: Mappable>(userInfo: [AnyHashable : Any], as: T.Type, isInactive: Bool) {
-        let map = Map(mappingType: .fromJSON, JSON: userInfo as! [String: Any])
-        let model = T.init(map: map)!
-        enqueue(RemoteNotificationElement(isInactive: isInactive, model: model)).dequeue()
+    public func didReceive<T: Decodable>(userInfo: [AnyHashable : Any], as: T.Type, isInactive: Bool) {
+        do {
+            let data = try JSONSerialization.data(withJSONObject: userInfo, options: .prettyPrinted)
+            let model = try JSONDecoder().decode(`as`, from: data)
+            enqueue(RemoteNotificationElement(isInactive: isInactive, model: model)).dequeue()
+        } catch {
+        }
     }
     public func processing(_ subscribable: Subscribable, _ closure: @escaping Processing) -> APNSManager {
         guard processingClosureMap[subscribable.hash] == nil else {return self}
@@ -132,7 +134,7 @@ public class APNSManager {
 }
 
 public struct RemoteNotificationElement {
-    public typealias T = Mappable
+    public typealias T = Decodable
 
     public private(set) var isInactive: Bool = false
     private var model: T!
@@ -142,7 +144,7 @@ public struct RemoteNotificationElement {
         self.model = model
     }
 
-    public func payload<E: Mappable>() -> E {
+    public func payload<E: Decodable>() -> E {
         return model as! E
     }
 }

APNSUtilAppExtension.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'APNSUtilAppExtension'
-  s.version          = '1.1.5'
+  s.version          = '1.2.0'
   s.summary          = 'APNSUtil is makes code simple using apple push notification service.'
   s.description      = 'APNSUtil is makes code simple using apple push notification service.'
   s.homepage         = 'https://github.com/pisces/APNSUtil'
@@ -17,6 +17,5 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'https://github.com/pisces/APNSUtil.git', :tag => s.version.to_s }
   s.ios.deployment_target = '9.0'
   s.source_files = 'APNSUtil/Classes/**/*'
-  s.dependency 'ObjectMapper', '~> 3.1'
   s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DAPP_EXTENSIONS' }
 end

Example/APNSUtil.xcodeproj/project.pbxproj

@@ -288,18 +288,16 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-APNSUtil_Example/Pods-APNSUtil_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-APNSUtil_Example/Pods-APNSUtil_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/APNSUtil/APNSUtil.framework",
-				"${BUILT_PRODUCTS_DIR}/ObjectMapper/ObjectMapper.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/APNSUtil.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-APNSUtil_Example/Pods-APNSUtil_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-APNSUtil_Example/Pods-APNSUtil_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		BDAD0D8957304EFC768F6D68 /* [CP] Check Pods Manifest.lock */ = {

Example/APNSUtil.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/APNSUtil/APNSPayload.swift

@@ -7,23 +7,13 @@
 //
 
 import APNSUtil
-import ObjectMapper
 
 extension RemoteNotificationElement {
     typealias T = APNSPayload
 }
 
-struct APNSPayload: Mappable {
+struct APNSPayload: Decodable {
     var msg: String?
     var id: String?
-
-    init?(map: Map) {
-        mapping(map: map)
-    }
-
-    mutating func mapping(map: Map) {
-        msg <- map["msg"]
-        id <- map["id"]
-    }
 }
 

Example/Podfile

@@ -1,7 +1,7 @@
 use_frameworks!
 
 target 'APNSUtil_Example' do
-  pod 'APNSUtil/AppExtension', :path => '../'
+  pod 'APNSUtil', :path => '../'
 
   target 'APNSUtil_Tests' do
     inherit! :search_paths

Example/Podfile.lock

@@ -1,23 +1,16 @@
 PODS:
-  - APNSUtil/AppExtension (1.1.4):
-    - ObjectMapper (~> 3.1)
-  - ObjectMapper (3.3.0)
+  - APNSUtil (1.2.0)
 
 DEPENDENCIES:
-  - APNSUtil/AppExtension (from `../`)
-
-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - ObjectMapper
+  - APNSUtil (from `../`)
 
 EXTERNAL SOURCES:
   APNSUtil:
     :path: "../"
 
 SPEC CHECKSUMS:
-  APNSUtil: f17545141df5eced25cbe5cbd6381ba4b79b9247
-  ObjectMapper: b612bf8c8e99c4dc0bb6013a51f7c27966ed5da9
+  APNSUtil: 0cb42dffae8b96391243270c1c0566e5f64022a6
 
-PODFILE CHECKSUM: 7563841551ece1485579af146b74c9ca08ddb06d
+PODFILE CHECKSUM: 682a114a47371b5a83ba6292e00758c19f6a5987
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.2