mirror of
https://github.com/JohnEstropia/CoreStore.git
synced 2026-03-21 08:59:24 +01:00
allow CoreStore installation both through frameworks or through direct linking
This commit is contained in:
@@ -15,5 +15,7 @@ Pod::Spec.new do |s|
|
|||||||
s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift"
|
s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift"
|
||||||
s.frameworks = "Foundation", "CoreData"
|
s.frameworks = "Foundation", "CoreData"
|
||||||
s.requires_arc = true
|
s.requires_arc = true
|
||||||
|
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
|
||||||
|
|
||||||
s.dependency "GCDKit", "1.1.3"
|
s.dependency "GCDKit", "1.1.3"
|
||||||
end
|
end
|
||||||
@@ -295,7 +295,7 @@
|
|||||||
B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
||||||
B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
|
B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
|
||||||
B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = "<group>"; };
|
B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = "<group>"; };
|
||||||
B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
|
B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
|
||||||
B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
|
B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
|
||||||
B5E834BA1B7691F3001D3D50 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
|
B5E834BA1B7691F3001D3D50 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
|
||||||
B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
|
B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
|
||||||
@@ -1169,6 +1169,7 @@
|
|||||||
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
|
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
|
OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
@@ -1208,6 +1209,7 @@
|
|||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
|
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
|
OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
|
|||||||
@@ -24,7 +24,9 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - NSProgress
|
// MARK: - NSProgress
|
||||||
|
|||||||
@@ -24,7 +24,9 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - CoreStore
|
// MARK: - CoreStore
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - DataStack
|
// MARK: - DataStack
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - NSManagedObjectContext
|
// MARK: - NSManagedObjectContext
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - NSManagedObjectContext
|
// MARK: - NSManagedObjectContext
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - CoreStore
|
// MARK: - CoreStore
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - DataStack
|
// MARK: - DataStack
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - DataStack
|
// MARK: - DataStack
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - ListMonitor
|
// MARK: - ListMonitor
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - ObjectMonitor
|
// MARK: - ObjectMonitor
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - AsynchronousDataTransaction
|
// MARK: - AsynchronousDataTransaction
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - BaseDataTransaction
|
// MARK: - BaseDataTransaction
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - DataStack
|
// MARK: - DataStack
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - SynchronousDataTransaction
|
// MARK: - SynchronousDataTransaction
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
|
@available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - CoreStore
|
// MARK: - CoreStore
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import CoreData
|
import CoreData
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
|
internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
import CoreStore
|
import CoreStore
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// MARK: - CustomLoggerViewController
|
// MARK: - CustomLoggerViewController
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import CoreLocation
|
|||||||
import MapKit
|
import MapKit
|
||||||
import AddressBookUI
|
import AddressBookUI
|
||||||
import CoreStore
|
import CoreStore
|
||||||
import GCDKit
|
#if USE_FRAMEWORKS
|
||||||
|
import GCDKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
private struct Static {
|
private struct Static {
|
||||||
|
|||||||
Reference in New Issue
Block a user