diff --git a/CoreStore.podspec b/CoreStore.podspec index e2d0391..fba19e6 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -15,5 +15,7 @@ Pod::Spec.new do |s| s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift" s.frameworks = "Foundation", "CoreData" s.requires_arc = true + s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' } + s.dependency "GCDKit", "1.1.3" end \ No newline at end of file diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 7b5aff8..4ad23a3 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -295,7 +295,7 @@ 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 = ""; }; B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = ""; }; - 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 = ""; }; B5E834BA1B7691F3001D3D50 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = ""; }; B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; @@ -1169,6 +1169,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1208,6 +1209,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/CoreStore/Convenience Helpers/NSProgress+Convenience.swift b/CoreStore/Convenience Helpers/NSProgress+Convenience.swift index 0d811b3..b2fd744 100644 --- a/CoreStore/Convenience Helpers/NSProgress+Convenience.swift +++ b/CoreStore/Convenience Helpers/NSProgress+Convenience.swift @@ -24,7 +24,9 @@ // import Foundation -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - NSProgress diff --git a/CoreStore/CoreStore.swift b/CoreStore/CoreStore.swift index 532c54e..37e0e58 100644 --- a/CoreStore/CoreStore.swift +++ b/CoreStore/CoreStore.swift @@ -24,7 +24,9 @@ // import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - CoreStore diff --git a/CoreStore/Fetching and Querying/DataStack+Querying.swift b/CoreStore/Fetching and Querying/DataStack+Querying.swift index 5408b98..9161a25 100644 --- a/CoreStore/Fetching and Querying/DataStack+Querying.swift +++ b/CoreStore/Fetching and Querying/DataStack+Querying.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - DataStack diff --git a/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift index 30ee6a6..f9b1f17 100644 --- a/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift +++ b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - NSManagedObjectContext diff --git a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift index 17b5676..cd0f03a 100644 --- a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift +++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - NSManagedObjectContext diff --git a/CoreStore/Migrating/CoreStore+Migration.swift b/CoreStore/Migrating/CoreStore+Migration.swift index bd909b2..6f4d0dc 100644 --- a/CoreStore/Migrating/CoreStore+Migration.swift +++ b/CoreStore/Migrating/CoreStore+Migration.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - CoreStore diff --git a/CoreStore/Migrating/DataStack+Migration.swift b/CoreStore/Migrating/DataStack+Migration.swift index 6e6ff37..8c82604 100644 --- a/CoreStore/Migrating/DataStack+Migration.swift +++ b/CoreStore/Migrating/DataStack+Migration.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - DataStack diff --git a/CoreStore/Observing/DataStack+Observing.swift b/CoreStore/Observing/DataStack+Observing.swift index 4b7b039..662c857 100644 --- a/CoreStore/Observing/DataStack+Observing.swift +++ b/CoreStore/Observing/DataStack+Observing.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - DataStack diff --git a/CoreStore/Observing/ListMonitor.swift b/CoreStore/Observing/ListMonitor.swift index 7457388..4158479 100644 --- a/CoreStore/Observing/ListMonitor.swift +++ b/CoreStore/Observing/ListMonitor.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - ListMonitor diff --git a/CoreStore/Observing/ObjectMonitor.swift b/CoreStore/Observing/ObjectMonitor.swift index ada879a..499b43f 100644 --- a/CoreStore/Observing/ObjectMonitor.swift +++ b/CoreStore/Observing/ObjectMonitor.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - ObjectMonitor diff --git a/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift b/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift index cddd47f..6aafa36 100644 --- a/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift +++ b/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - AsynchronousDataTransaction diff --git a/CoreStore/Saving and Processing/BaseDataTransaction.swift b/CoreStore/Saving and Processing/BaseDataTransaction.swift index addc74e..3a47e5e 100644 --- a/CoreStore/Saving and Processing/BaseDataTransaction.swift +++ b/CoreStore/Saving and Processing/BaseDataTransaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - BaseDataTransaction diff --git a/CoreStore/Saving and Processing/DataStack+Transaction.swift b/CoreStore/Saving and Processing/DataStack+Transaction.swift index aa00a64..789b157 100644 --- a/CoreStore/Saving and Processing/DataStack+Transaction.swift +++ b/CoreStore/Saving and Processing/DataStack+Transaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - DataStack diff --git a/CoreStore/Saving and Processing/SynchronousDataTransaction.swift b/CoreStore/Saving and Processing/SynchronousDataTransaction.swift index 2733320..229a763 100644 --- a/CoreStore/Saving and Processing/SynchronousDataTransaction.swift +++ b/CoreStore/Saving and Processing/SynchronousDataTransaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - SynchronousDataTransaction diff --git a/CoreStore/Saving and Processing/UnsafeDataTransaction.swift b/CoreStore/Saving and Processing/UnsafeDataTransaction.swift index 98831ba..29c5b40 100644 --- a/CoreStore/Saving and Processing/UnsafeDataTransaction.swift +++ b/CoreStore/Saving and Processing/UnsafeDataTransaction.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif @available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction") diff --git a/CoreStore/Setting Up/CoreStore+Setup.swift b/CoreStore/Setting Up/CoreStore+Setup.swift index c54c387..bd8364c 100644 --- a/CoreStore/Setting Up/CoreStore+Setup.swift +++ b/CoreStore/Setting Up/CoreStore+Setup.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - CoreStore diff --git a/CoreStore/Setting Up/DataStack.swift b/CoreStore/Setting Up/DataStack.swift index d46dc7f..a65c5e2 100644 --- a/CoreStore/Setting Up/DataStack.swift +++ b/CoreStore/Setting Up/DataStack.swift @@ -25,7 +25,9 @@ import Foundation import CoreData -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first! diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift index eea35a3..2e00ff6 100644 --- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift @@ -8,7 +8,9 @@ import UIKit import CoreStore -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif // MARK: - CustomLoggerViewController diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift index 9f1962d..62e24aa 100644 --- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift @@ -11,7 +11,9 @@ import CoreLocation import MapKit import AddressBookUI import CoreStore -import GCDKit +#if USE_FRAMEWORKS + import GCDKit +#endif private struct Static {