Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
vmartinelli committed Jun 30, 2015
2 parents 4638db1 + ee33610 commit 6577c2f
Show file tree
Hide file tree
Showing 13 changed files with 1,227 additions and 487 deletions.
2 changes: 1 addition & 1 deletion AlecrimCoreData.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "AlecrimCoreData"
s.version = "3.1"
s.version = "3.2"
s.summary = "A framework to easily access Core Data objects in Swift."
s.homepage = "https://github.com/Alecrim/AlecrimCoreData"

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,11 @@ let fetchRequest = dataContext.people.toFetchRequest()
// OS X only
let arrayController = dataContext.people.toArrayController()

// iOS only (returns an AlecrimCoreData FecthedResultsController strong typed instance)
// iOS and OS X
let fetchedResultsController = dataContext.people.toFetchedResultsController()

// iOS only (returns a native NSFetchedResultsController instance)
// iOS: returns a native NSFetchedResultsController class instance
// OS X: returns a NSFetchedResultsController equivalent class (ALCFetchedResultsController) instance
let fetchedResultsController = dataContext.people.toNativeFetchedResultsController()

```
Expand Down
8 changes: 6 additions & 2 deletions Source/AlecrimCoreData.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1451E0161B29F7BA00689C58 /* ALCFetchedResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1451E0151B29F7BA00689C58 /* ALCFetchedResultsController.swift */; };
1464BD1D1B20F973007CD240 /* Attribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1464BD0F1B20F973007CD240 /* Attribute.swift */; };
1464BD1E1B20F973007CD240 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1464BD111B20F973007CD240 /* Context.swift */; };
1464BD1F1B20F973007CD240 /* ContextOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1464BD121B20F973007CD240 /* ContextOptions.swift */; };
Expand All @@ -26,6 +27,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
1451E0151B29F7BA00689C58 /* ALCFetchedResultsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ALCFetchedResultsController.swift; sourceTree = "<group>"; };
1464BD0F1B20F973007CD240 /* Attribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Attribute.swift; sourceTree = "<group>"; };
1464BD111B20F973007CD240 /* Context.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Context.swift; sourceTree = "<group>"; };
1464BD121B20F973007CD240 /* ContextOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextOptions.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -103,6 +105,7 @@
1464BD161B20F973007CD240 /* Other */ = {
isa = PBXGroup;
children = (
1451E0151B29F7BA00689C58 /* ALCFetchedResultsController.swift */,
1464BD171B20F973007CD240 /* FetchedResultsController.swift */,
1464BD181B20F973007CD240 /* FetchedResultsSectionInfo.swift */,
);
Expand Down Expand Up @@ -246,6 +249,7 @@
1464BD2E1B20FAB5007CD240 /* NSPredicateExtensions.swift in Sources */,
1464BD2C1B20FA81007CD240 /* EntitySetCollectionOperatorAttribute.swift in Sources */,
149733741B21F716000A0EDE /* FetchAsyncHandler.swift in Sources */,
1451E0161B29F7BA00689C58 /* ALCFetchedResultsController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -350,7 +354,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 238;
CURRENT_PROJECT_VERSION = 259;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = "$(DYLIB_CURRENT_VERSION)";
Expand All @@ -373,7 +377,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 238;
CURRENT_PROJECT_VERSION = 259;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = "$(DYLIB_CURRENT_VERSION)";
DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
Expand Down
Loading

0 comments on commit 6577c2f

Please sign in to comment.