Merge pull request #49 from gonzalezreal/swift_2

Xcode 7 and Swift 2 support
gonzalezreal · Sep 13, 2015 · 1ff6c8b · 1ff6c8b
2 parents c69c501 + 87c4d5f
commit 1ff6c8b
Show file tree

Hide file tree

Showing 13 changed files with 146 additions and 106 deletions.
diff --git a/Groot.xcodeproj/project.pbxproj b/Groot.xcodeproj/project.pbxproj
@@ -465,7 +465,9 @@
 		B4DC1AE31AA9CA5E00F67403 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Guillermo Gonzalez";
 				TargetAttributes = {
 					B40873611B5AB6930063F150 = {
@@ -653,6 +655,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Groot;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -675,6 +678,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Groot;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -698,6 +702,7 @@
 				INFOPLIST_FILE = GrootTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = GrootTests;
 				SDKROOT = macosx;
 			};
@@ -717,6 +722,7 @@
 				INFOPLIST_FILE = GrootTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = GrootTests;
 				SDKROOT = macosx;
 			};
@@ -743,6 +749,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -817,6 +824,7 @@
 				INFOPLIST_FILE = Groot/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -835,6 +843,7 @@
 				INFOPLIST_FILE = Groot/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -855,6 +864,7 @@
 				);
 				INFOPLIST_FILE = GrootTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -870,6 +880,7 @@
 				);
 				INFOPLIST_FILE = GrootTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/Groot.xcodeproj/xcshareddata/xcschemes/Groot-Mac.xcscheme b/Groot.xcodeproj/xcshareddata/xcschemes/Groot-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:Groot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/Groot.xcodeproj/xcshareddata/xcschemes/Groot.xcscheme b/Groot.xcodeproj/xcshareddata/xcschemes/Groot.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:Groot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/Groot/GRTJSONSerialization.h b/Groot/GRTJSONSerialization.h
@@ -39,10 +39,10 @@ NS_ASSUME_NONNULL_BEGIN
  
  @return An array of managed objects, or `nil` if an error occurs.
  */
-+ (nullable NSArray *)objectsWithEntityName:(NSString *)entityName
-                               fromJSONData:(NSData *)data
-                                  inContext:(NSManagedObjectContext *)context
-                                      error:(NSError * __nullable * __nullable)error;
++ (nullable NSArray<__kindof NSManagedObject *> *)objectsWithEntityName:(NSString *)entityName
+                                                           fromJSONData:(NSData *)data
+                                                              inContext:(NSManagedObjectContext *)context
+                                                                  error:(NSError * __nullable * __nullable)error;
 
 /**
  Creates or updates a managed object from a JSON dictionary.
@@ -57,10 +57,10 @@ NS_ASSUME_NONNULL_BEGIN
  
  @return A managed object, or `nil` if an error occurs.
  */
-+ (nullable id)objectWithEntityName:(NSString *)entityName
-                 fromJSONDictionary:(NSDictionary *)JSONDictionary
-                          inContext:(NSManagedObjectContext *)context
-                              error:(NSError * __nullable * __nullable)error;
++ (nullable __kindof NSManagedObject *)objectWithEntityName:(NSString *)entityName
+                                         fromJSONDictionary:(NSDictionary *)JSONDictionary
+                                                  inContext:(NSManagedObjectContext *)context
+                                                      error:(NSError * __nullable * __nullable)error;
 
 /**
  Creates or updates a set of managed objects from a JSON array.
@@ -73,10 +73,10 @@ NS_ASSUME_NONNULL_BEGIN
  
  @return An array of managed objects, or `nil` if an error occurs.
  */
-+ (nullable NSArray *)objectsWithEntityName:(NSString *)entityName
-                              fromJSONArray:(NSArray *)JSONArray
-                                  inContext:(NSManagedObjectContext *)context
-                                      error:(NSError * __nullable * __nullable)error;
++ (nullable NSArray<__kindof NSManagedObject *> *)objectsWithEntityName:(NSString *)entityName
+                                                          fromJSONArray:(NSArray *)JSONArray
+                                                              inContext:(NSManagedObjectContext *)context
+                                                                  error:(NSError * __nullable * __nullable)error;
 
 /**
  Converts a managed object into a JSON representation.

diff --git a/Groot/GRTJSONSerialization.m b/Groot/GRTJSONSerialization.m
@@ -30,10 +30,10 @@
 
 @implementation GRTJSONSerialization
 
-+ (nullable NSArray *)objectsWithEntityName:(NSString *)entityName
-                               fromJSONData:(NSData *)data
-                                  inContext:(NSManagedObjectContext *)context
-                                      error:(NSError *__autoreleasing  __nullable * __nullable)outError
++ (nullable NSArray<__kindof NSManagedObject *> *)objectsWithEntityName:(NSString *)entityName
+                                                           fromJSONData:(NSData *)data
+                                                              inContext:(NSManagedObjectContext *)context
+                                                                  error:(NSError *__autoreleasing  __nullable * __nullable)outError
 {
     NSError *error = nil;
     id parsedJSON = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
@@ -55,10 +55,10 @@ + (nullable NSArray *)objectsWithEntityName:(NSString *)entityName
     return [self objectsWithEntityName:entityName fromJSONArray:array inContext:context error:outError];
 }
 
-+ (nullable id)objectWithEntityName:(NSString *)entityName
-                 fromJSONDictionary:(NSDictionary *)JSONDictionary
-                          inContext:(NSManagedObjectContext *)context
-                              error:(NSError *__autoreleasing  __nullable * __nullable)outError
++ (nullable __kindof NSManagedObject *)objectWithEntityName:(NSString *)entityName
+                                         fromJSONDictionary:(NSDictionary *)JSONDictionary
+                                                  inContext:(NSManagedObjectContext *)context
+                                                      error:(NSError *__autoreleasing  __nullable * __nullable)outError
 {
     NSError *error = nil;
     NSEntityDescription *entity = [NSEntityDescription grt_entityForName:entityName inContext:context error:&error];
@@ -75,10 +75,10 @@ + (nullable id)objectWithEntityName:(NSString *)entityName
                                     error:outError].firstObject;
 }
 
-+ (nullable NSArray *)objectsWithEntityName:(NSString *)entityName
-                              fromJSONArray:(NSArray *)JSONArray
-                                  inContext:(NSManagedObjectContext *)context
-                                      error:(NSError *__autoreleasing  __nullable * __nullable)outError
++ (nullable NSArray<__kindof NSManagedObject *> *)objectsWithEntityName:(NSString *)entityName
+                                                          fromJSONArray:(NSArray *)JSONArray
+                                                              inContext:(NSManagedObjectContext *)context
+                                                                  error:(NSError *__autoreleasing  __nullable * __nullable)outError
 {
     NSError *error = nil;
     NSEntityDescription *entity = [NSEntityDescription grt_entityForName:entityName inContext:context error:&error];

diff --git a/Groot/GRTManagedStore.m b/Groot/GRTManagedStore.m
@@ -60,6 +60,10 @@ - (NSURL *)URL {
     return store.URL;
 }
 
+- (instancetype)init {
+    return [self initWithURL:nil model:[NSManagedObjectModel mergedModelFromBundles:nil] error:NULL];
+}
+
 - (nullable instancetype)initWithURL:(nullable NSURL *)URL
                                model:(NSManagedObjectModel *)managedObjectModel
                                error:(NSError *__autoreleasing  __nullable * __nullable)outError