Adds support for macOS

Also makes it possible to specify which cloud kit container you want to use.
JagCesar · May 1, 2017 · ec6a50a · ec6a50a
1 parent 0e5e810
commit ec6a50a
Show file tree

Hide file tree

Showing 14 changed files with 500 additions and 147 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: objective-c
 osx_image: xcode8.1
 xcode_sdk: 9.0
 xcode_project: CloudKitCurrentUser.xcodeproj
-xcode_scheme: CloudKitCurrentUser
 script:
-  - fastlane test
+  - fastlane scan --scheme "CloudKitCurrentUser iOS" --sdk iphonesimulator10.1
+  - fastlane scan --scheme "CloudKitCurrentUser macOS" --sdk macosx10.12
+
diff --git a/CloudKitCurrentUser.xcodeproj/project.pbxproj b/CloudKitCurrentUser.xcodeproj/project.pbxproj
diff --git a/...ta/xcschemes/CloudKitCurrentUser.xcscheme → ...cschemes/CloudKitCurrentUser iOS.xcscheme b/...ta/xcschemes/CloudKitCurrentUser.xcscheme → ...cschemes/CloudKitCurrentUser iOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "FC1D26A51DF21BAD005049CA"
                BuildableName = "CloudKitCurrentUser.framework"
-               BlueprintName = "CloudKitCurrentUser"
+               BlueprintName = "CloudKitCurrentUser iOS"
                ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -32,9 +32,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FC1D26AE1DF21BAD005049CA"
-               BuildableName = "CloudKitCurrentUserTests.xctest"
-               BlueprintName = "CloudKitCurrentUserTests"
+               BlueprintIdentifier = "FC1B22A71EA56A8400A17879"
+               BuildableName = "CloudKitCurrentUser iOS Tests.xctest"
+               BlueprintName = "CloudKitCurrentUser iOS Tests"
                ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -44,7 +44,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "FC1D26A51DF21BAD005049CA"
             BuildableName = "CloudKitCurrentUser.framework"
-            BlueprintName = "CloudKitCurrentUser"
+            BlueprintName = "CloudKitCurrentUser iOS"
             ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -66,7 +66,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "FC1D26A51DF21BAD005049CA"
             BuildableName = "CloudKitCurrentUser.framework"
-            BlueprintName = "CloudKitCurrentUser"
+            BlueprintName = "CloudKitCurrentUser iOS"
             ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -84,7 +84,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "FC1D26A51DF21BAD005049CA"
             BuildableName = "CloudKitCurrentUser.framework"
-            BlueprintName = "CloudKitCurrentUser"
+            BlueprintName = "CloudKitCurrentUser iOS"
             ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/CloudKitCurrentUser.xcodeproj/xcshareddata/xcschemes/CloudKitCurrentUser macOS.xcscheme b/CloudKitCurrentUser.xcodeproj/xcshareddata/xcschemes/CloudKitCurrentUser macOS.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FC1B228B1EA5658700A17879"
+               BuildableName = "CloudKitCurrentUser.framework"
+               BlueprintName = "CloudKitCurrentUser macOS"
+               ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FC1B22B61EA56AA900A17879"
+               BuildableName = "CloudKitCurrentUser macOS Tests.xctest"
+               BlueprintName = "CloudKitCurrentUser macOS Tests"
+               ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "FC1B228B1EA5658700A17879"
+            BuildableName = "CloudKitCurrentUser.framework"
+            BlueprintName = "CloudKitCurrentUser macOS"
+            ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "FC1B228B1EA5658700A17879"
+            BuildableName = "CloudKitCurrentUser.framework"
+            BlueprintName = "CloudKitCurrentUser macOS"
+            ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "FC1B228B1EA5658700A17879"
+            BuildableName = "CloudKitCurrentUser.framework"
+            BlueprintName = "CloudKitCurrentUser macOS"
+            ReferencedContainer = "container:CloudKitCurrentUser.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/JagCesar/CloudKitCurrentUser.svg?branch=master)](https://travis-ci.org/JagCesar/CloudKitCurrentUser)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![CloudKitCurrentUser](https://img.shields.io/badge/platform-iOS-lightgrey.svg?style=flat)](https://github.com/JagCesar/CloudKitCurrentUser)
+[![CloudKitCurrentUser](https://img.shields.io/badge/platform-iOS%20%7C%20macOS-lightgrey.svg?style=flat)](https://github.com/JagCesar/CloudKitCurrentUser)
 [![License](https://img.shields.io/badge/license-MIT-AA8DF8.svg?style=flat)](https://github.com/JagCesar/CloudKitCurrentUser/blob/master/LICENSE)
 [![Language](https://img.shields.io/badge/language-Swift%203-E05C43.svg?style=flat)](https://swift.org)
 [![Twitter](https://img.shields.io/badge/twitter-@JagCesar-00ACED.svg?style=flat)](http://twitter.com/JagCesar)

diff --git a/CloudKitCurrentUser/CloudKitCurrentUser.h → Sources/CloudKitCurrentUser.h b/CloudKitCurrentUser/CloudKitCurrentUser.h → Sources/CloudKitCurrentUser.h
@@ -1,12 +1,4 @@
-//
-//  CloudKitCurrentUser.h
-//  CloudKitCurrentUser
-//
-//  Created by Cesar Pinto Castillo on 2016-12-02.
-//  Copyright © 2016 JagCesar. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for CloudKitCurrentUser.
 FOUNDATION_EXPORT double CloudKitCurrentUserVersionNumber;
@@ -15,5 +7,3 @@ FOUNDATION_EXPORT double CloudKitCurrentUserVersionNumber;
 FOUNDATION_EXPORT const unsigned char CloudKitCurrentUserVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <CloudKitCurrentUser/PublicHeader.h>
-
-
diff --git a/...rentUser/CloudKitCurrentUserRequest.swift → Sources/CloudKitCurrentUserRequest.swift b/...rentUser/CloudKitCurrentUserRequest.swift → Sources/CloudKitCurrentUserRequest.swift
@@ -9,8 +9,10 @@
 import CloudKit
 
 internal class CloudKitCurrentUserRequest: CurrentUserRequestProtocol {
+    var cloudKitContainerIdentifier: String?
+
     func currentStatus(completionBlock: @escaping StatusCompletionBlock) {
-        CKContainer.default().accountStatus { accountStatus, error in
+        currentContainer().accountStatus { accountStatus, error in
             switch accountStatus {
             case .couldNotDetermine:
                 completionBlock(.NotDetermined, error)
@@ -25,12 +27,20 @@ internal class CloudKitCurrentUserRequest: CurrentUserRequestProtocol {
     }
 
     func userIdentifier(completionBlock: @escaping UserIdentifierCompletionBlock) {
-        CKContainer.default().fetchUserRecordID { recordID, error in
+        currentContainer().fetchUserRecordID { recordID, error in
             completionBlock(recordID?.recordName, error)
         }
     }
 
     func statusChangedNotification() -> NSNotification.Name {
         return NSNotification.Name.CKAccountChanged
     }
+
+    private func currentContainer() -> CKContainer {
+        if let cloudKitContainerIdentifier = cloudKitContainerIdentifier {
+            return CKContainer(identifier: cloudKitContainerIdentifier)
+        } else {
+            return CKContainer.default()
+        }
+    }
 }
diff --git a/CloudKitCurrentUser/CurrentUser.swift → Sources/CurrentUser.swift b/CloudKitCurrentUser/CurrentUser.swift → Sources/CurrentUser.swift
@@ -20,6 +20,11 @@ public class CurrentUser {
     private var isLoadingUserIdentifier: Bool = false
     private var userIdentifierCompletionBlocks: [UserIdentifierCompletionBlock] = []
     var userRequestObject: CurrentUserRequestProtocol = CloudKitCurrentUserRequest()
+    public var cloudKitContainerIdentifier: String? {
+        didSet {
+            userRequestObject.cloudKitContainerIdentifier = cloudKitContainerIdentifier
+        }
+    }
 
     private init() {
         NotificationCenter.default.addObserver(self,

diff --git a/...rentUser/CurrentUserRequestProtocol.swift → Sources/CurrentUserRequestProtocol.swift b/...rentUser/CurrentUserRequestProtocol.swift → Sources/CurrentUserRequestProtocol.swift
@@ -19,8 +19,9 @@ public typealias StatusCompletionBlock = (_ status: CurrentUserStatus, _ error:
 public typealias UserIdentifierCompletionBlock = (_ userIdentifier: String?, _ error: Error?) -> Swift.Void
 
 internal protocol CurrentUserRequestProtocol: class {
+    var cloudKitContainerIdentifier: String? { get set }
+
     func currentStatus(completionBlock: @escaping StatusCompletionBlock)
     func userIdentifier(completionBlock: @escaping UserIdentifierCompletionBlock)
-
     func statusChangedNotification() -> NSNotification.Name
 }
diff --git a/CloudKitCurrentUser/Info.plist → Sources/Info-iOS.plist b/CloudKitCurrentUser/Info.plist → Sources/Info-iOS.plist
diff --git a/Sources/Info-macOS.plist b/Sources/Info-macOS.plist
@@ -0,0 +1,26 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.3.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2017 JagCesar. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/...tUserTests/CloudKitCurrentUserTests.swift → Unit tests/CloudKitCurrentUserTests.swift b/...tUserTests/CloudKitCurrentUserTests.swift → Unit tests/CloudKitCurrentUserTests.swift
@@ -18,6 +18,7 @@ struct TestError: Error {
 }
 
 class TestableCurrentUserRequest: CurrentUserRequestProtocol {
+    var cloudKitContainerIdentifier: String?
     var status: CurrentUserStatus = .NotDetermined
     var userIdentifier: String?
     var error: Error?
@@ -108,10 +109,10 @@ class CloudKitCurrentUserTests: XCTestCase {
         let testExpectation = expectation(description: "User changed notification")
         var token: NSObjectProtocol?
         token = NotificationCenter.default.addObserver(forName: CurrentUser.statusChangedNotification,
-                                               object: nil,
-                                               queue: nil) { notification in
-                                                NotificationCenter.default.removeObserver(token!)
-                                                testExpectation.fulfill()
+                                                       object: nil,
+                                                       queue: nil) { _ in
+                                                        NotificationCenter.default.removeObserver(token!)
+                                                        testExpectation.fulfill()
         }
         testableCurrentUser.statusChanged()
         waitForExpectations(timeout: 5, handler: nil)

diff --git a/CloudKitCurrentUserTests/Info.plist → Unit tests/Info.plist b/CloudKitCurrentUserTests/Info.plist → Unit tests/Info.plist
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -27,11 +27,6 @@ platform :ios do
     increment_version_number(bump_type: options[:type])
   end
 
-  desc "Runs all the tests"
-  lane :test do
-    scan
-  end
-
   desc "Deploy a new version"
   lane :deploy do
     ensure_git_branch(branch: "master")