starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-15 05:33:31 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into corestore2_develop

Browse Source 
# Conflicts:
#	Cartfile
#	Cartfile.resolved
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStore/Migrating/DataStack+Migration.swift
#	CoreStore/Setting Up/DataStack.swift
#	README.md
#	Sources/Info.plist
This commit is contained in:
John Estropia
2016-03-24 15:09:36 +09:00
parent dd6c6abaf0 9f1a351311
commit 36e6e4a8b9
14 changed files with 531 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreStore.podspec
View File

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
s.dependency "GCDKit", "1.2.1"
s.dependency "GCDKit", "1.2.2"
end