Merge pull request #1021 from magicalpanda/develop

Release MagicalRecord 2.3.0

Author: tonyarnold

.clang-format

@@ -0,0 +1,13 @@
+BasedOnStyle: Chromium
+AlignTrailingComments: true
+BreakBeforeBraces: Allman
+ColumnLimit: 0
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PointerBindsToType: false
+SpacesBeforeTrailingComments: 1
+TabWidth: 8
+UseTab: Never

.cocoadocs.yml

@@ -0,0 +1,12 @@
+additional_guides:
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Installing-MagicalRecord
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Getting-Started
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Working-with-Managed-Object-Contexts
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Creating-Entities
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Deleting-Entities
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Fetching-Entities
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Saving
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Usage-Patterns
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Importing-Data
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Logging
+  - https://github.com/magicalpanda/MagicalRecord/wiki/Upgrading-to-MagicalRecord-2.3

.gitignore

@@ -17,3 +17,5 @@ xcuserdata
 profile
 *.moved-aside
 
+DerivedData
+Carthage/Build

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "Project Files/Tests/Support/Vendor/Kiwi"]
-	path = Project Files/Tests/Support/Vendor/Kiwi
-	url = git://github.com/allending/Kiwi.git
-[submodule "Project Files/Tests/Support/Vendor/Expecta"]
-	path = Project Files/Tests/Support/Vendor/Expecta
-	url = git@github.com:petejkim/expecta.git
+[submodule "Carthage/Checkouts/expecta"]
+	path = Carthage/Checkouts/expecta
+	url = https://github.com/specta/expecta.git

.travis.yml

@@ -0,0 +1,7 @@
+language: objective-c
+script: Support/Scripts/objc-build-scripts/cibuild
+before_install:
+  - brew update
+  - if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
+  
+osx_image: xcode61

Changelog.md CHANGELOG.mdChangelog.md renamed to CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## Version 2.3
+* Dynamic framework targets are provided for both OS X 10.8+ and iOS 8.0+
+* Logging is enabled by default, change the logging level using `+[MagicalRecord setLoggingLevel: MagicalRecordLogLevelOff];` — [see the documentation in the wiki](https://github.com/magicalpanda/MagicalRecord/wiki/Logging)
+* CocoaLumberjack 2.0 support
+* Enabling shorthand category method names can now be done by importing:
+    
+    ```objective-c
+    #import <MagicalRecord/MagicalRecord.h>
+    #import <MagicalRecord/MagicalRecord+ShorthandMethods.h>
+    #import <MagicalRecord/MagicalRecordShorthandMethodAliases.h>
+    ```
+    Then calling `+[MagicalRecord enableShorthandMethods]`.  
+    [See the documentation in the wiki](https://github.com/magicalpanda/MagicalRecord/wiki/Installing-MagicalRecord#shorthand-category-methods).
+    
+* Support for running with Core Data's concurrency debugging checks enabled
+* Many, many, many, many fixes to reported issues
+
 ## Version 2.2
 * Updated examples and fixed errors in README - [Tony Arnold](mailto:tony@thecocoabots.com)
 * Changes block saves to use child context of rootSavingContext so that large saves do not channel through the default context and block the main thread - r-peck
@@ -51,7 +68,7 @@
 * Added fetchAllWithDelegate: method for NSFRC `c0a1657` - [Saul Mora](mailto:saul@magicalpanda.com)
 * Fixed Issue #294 - MR_requestAllSortedBy:ascending:inContext: did not use correct context `3656e74` - [Stephen Vanterpool](mailto:stephen@vanterpool.net)
 * Bumping podspec version `fb81b5b` - [Stephen Vanterpool](mailto:stephen@vanterpool.net)
->>>>>>> release/2.1.0
+
 ## Version 2.0.7
 * Fix small error in README with regard to MR_SHORTHAND - [Maik Gosenshuis](mailto:maik@gosenshuis.nl)
 * Hide intended private cleanUpErrorHandling method - [Saul Mora](mailto:saul@magicalpanda.com)

CONTRIBUTING.md

@@ -0,0 +1,25 @@
+Thanks for contributing to this project!
+
+To make the process as easy as possible, we've got a few guidelines that we'd appreciate you following:
+
+## Filing Issues
+
+Before you file an issue, please ensure that:
+
+1. **It's a bug or a feature request** — if you're looking for help using MagicalRecord, please ask your question on [Stack Overflow](http://stackoverflow.com/). We monitor the [**MagicalRecord** tag](http://stackoverflow.com/questions/tagged/magicalrecord) so be sure to tag your question so that we see it
+1. **Search for an existing issue** — there's a good chance you're not the only one experiencing the problem you've come to tell us about
+2. **Include as much information as you can** — if we can't reproduce the problem you've filed, we can't fix it. Include crash logs, exception reports and code if you can.
+
+## We Prefer Pull Requests
+
+If you know exactly how to implement the feature being suggested or fix the bug being reported, please open a pull request instead of an issue. Pull requests are easier than patches or inline code blocks for discussing and merging the changes. Please ensure that you include tests in the Pull Request — we use XCTest with [Expecta](http://github.com/specta/expecta/).
+
+If you can't make the change yourself, please open an issue after making sure that one isn't already logged.
+
+## Contributing Code
+
+Fork this repository, make some great changes (preferably in a branch named for the topic of the changes you're making) and send a pull request!
+
+All code contributions should match our [coding conventions](/magicalpanda/MagicalRecord/wiki/Coding-Conventions).
+
+Thanks for reading the guidelines!

Cartfile.private

@@ -0,0 +1 @@
+github "specta/expecta" ~> 1.0

Cartfile.resolved

@@ -0,0 +1 @@
+github "specta/expecta" "v1.0.1"