build fix

evermeer · Jan 9, 2016 · 3c5166e · 3c5166e
1 parent 6db3147
commit 3c5166e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/AppMessage/AppMessage.xcodeproj/project.pbxproj b/AppMessage/AppMessage.xcodeproj/project.pbxproj
@@ -28,6 +28,8 @@
 		7F4A37061BDD92D600A0F73F /* EVCloudKitDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F434A4619628EAA0081F35C /* EVCloudKitDao.swift */; };
 		7F4A37071BDD92D600A0F73F /* EVCloudData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FD41610199666F3003C2CE9 /* EVCloudData.swift */; };
 		7F4A37081BDD92D600A0F73F /* EVCloudKitDataObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F41BB841A2B2B92003FE1DD /* EVCloudKitDataObject.swift */; };
+		7F4CA2C11C4121C500AEE29D /* EVCloudKitEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F3C164F1C1341ED0057B5E1 /* EVCloudKitEnums.swift */; };
+		7F4CA2C21C4121C600AEE29D /* EVCloudKitEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F3C164F1C1341ED0057B5E1 /* EVCloudKitEnums.swift */; };
 		7F5DFB4E1A86B95600628235 /* UzysAssetsPickerController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F5DFB4D1A86B95600628235 /* UzysAssetsPickerController.xib */; };
 		7F5DFB501A86BC8200628235 /* UzysAssetPickerController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7F5DFB4F1A86BC8200628235 /* UzysAssetPickerController.bundle */; };
 		7F5DFB521A86C04100628235 /* JSQMessagesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F5DFB511A86C04100628235 /* JSQMessagesViewController.xib */; };
@@ -631,6 +633,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7F4CA2C21C4121C600AEE29D /* EVCloudKitEnums.swift in Sources */,
 				7F2976581BB940730074C85A /* EVCloudData.swift in Sources */,
 				7F2976511BB93D6A0074C85A /* OSXTest.swift in Sources */,
 				7F2976561BB940730074C85A /* EVglobal.swift in Sources */,
@@ -672,6 +675,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7F4CA2C11C4121C500AEE29D /* EVCloudKitEnums.swift in Sources */,
 				7F4A37051BDD92D600A0F73F /* EVglobal.swift in Sources */,
 				7F4A37061BDD92D600A0F73F /* EVCloudKitDao.swift in Sources */,
 				7F4A37071BDD92D600A0F73F /* EVCloudData.swift in Sources */,

diff --git a/AppMessage/AppMessage/AppDelegate.swift b/AppMessage/AppMessage/AppDelegate.swift
@@ -43,19 +43,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         })
     }
 
-
-// This will only be called when your app is active. Instead we should use the function below
-//    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject]) {
-//        EVLog("Push received")
-//        EVCloudData.publicDB.didReceiveRemoteNotification(userInfo, executeIfNonQuery: {
-//            EVLog("Not a CloudKit Query notification.")
-//        }, completed: {
-//            EVLog("All notifications are processed")
-//        })
-//    }
-
-
-    // Process al notifications
+    #if os(tvOS)
+    //This will only be called when your app is active. So this is what you should use on tvOS
+    func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject]) {
+        EVLog("Push received")
+        EVCloudData.publicDB.didReceiveRemoteNotification(userInfo, executeIfNonQuery: {
+            EVLog("Not a CloudKit Query notification.")
+        }, completed: {
+            EVLog("All notifications are processed")
+        })
+    }
+    #else
+    // Process al notifications even if we are in the background. tvOS will not have this event
     func application(application: UIApplication, didReceiveRemoteNotification userInfo: [NSObject : AnyObject], fetchCompletionHandler completionHandler: (UIBackgroundFetchResult) -> Void) {
         EVLog("Push received")
         EVCloudData.publicDB.didReceiveRemoteNotification(userInfo, executeIfNonQuery: {
@@ -65,7 +64,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 completionHandler(.NewData)
         })
     }
-
+    #endif
 
     func applicationDidEnterBackground(application: UIApplication) {
         // Just to make sure that all updates are written do the cache.

diff --git a/AppMessage/AppMessage/Controlers/TestsViewController.swift b/AppMessage/AppMessage/Controlers/TestsViewController.swift
@@ -306,7 +306,7 @@ class TestsViewController: UIViewController {
         myObj.saveString = "save this"
         myObj.ignoreString = "Forget about this"
 
-        let record = EVCloudKitDao().toCKRecord(myObj)
+        let record = self.dao.toCKRecord(myObj)
         EVLog("record from object: \(record)")
     }
 }

diff --git a/EVCloudKitDao.podspec b/EVCloudKitDao.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
 #
 
 s.name         = "EVCloudKitDao"
-s.version      = "2.16.0"
+s.version      = "2.16.1"
 s.summary      = "iOS: Simplified access to Apple’s CloudKit"
 
 s.description  = "Simplified access to Apple’s CloudKit using reflection and generics"