From 969f4cefb48c8c6a870f4acc1e924e0b6930f398 Mon Sep 17 00:00:00 2001 From: John Estropia Date: Tue, 15 Dec 2015 19:56:07 +0900 Subject: [PATCH] use workspaces for better carthage support --- .gitignore | 1 + .gitmodules | 4 +- .travis.yml | 12 +- CartFile | 1 + Cartfile.resolved | 1 + {Libraries => Carthage/Checkouts}/GCDKit | 0 CoreStore.podspec | 2 +- CoreStore.xcodeproj/project.pbxproj | 166 ++---------------- .../contents.xcworkspacedata | 13 ++ .../xcshareddata/CoreStore.xcscmblueprint | 30 ++++ CoreStore/Info.plist | 2 +- .../CoreStoreDemo.xcodeproj/project.pbxproj | 147 ++-------------- 12 files changed, 80 insertions(+), 299 deletions(-) create mode 100644 CartFile create mode 100644 Cartfile.resolved rename {Libraries => Carthage/Checkouts}/GCDKit (100%) create mode 100644 CoreStore.xcworkspace/contents.xcworkspacedata create mode 100644 CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint diff --git a/.gitignore b/.gitignore index 672689e..4d1eb9f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata CoreStore.xcodeproj/project.xcworkspace/xcuserdata CoreStore.xcodeproj/xcuserdata CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata +Carthage/Build diff --git a/.gitmodules b/.gitmodules index 5388219..5fec53f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Libraries/GCDKit"] - path = Libraries/GCDKit +[submodule "Carthage/Checkouts/GCDKit"] + path = Carthage/Checkouts/GCDKit url = https://github.com/JohnEstropia/GCDKit.git diff --git a/.travis.yml b/.travis.yml index 10b7b4e..dcdff1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,16 +17,20 @@ env: before_install: - gem install cocoapods --no-rdoc --no-ri --no-document --quiet - gem install xcpretty --no-rdoc --no-ri --no-document --quiet + - brew update + - brew install carthage +before_script: + - carthage update --use-submodules script: - set -o pipefail - xcodebuild -version - xcodebuild -showsdks - if [ $RUN_TESTS == "YES" ]; then - xcodebuild -project CoreStore.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c; - xcodebuild -project CoreStore.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c; + xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c; + xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c; fi - - xcodebuild -project "CoreStoreDemo/CoreStoreDemo.xcodeproj" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c; - - xcodebuild -project "CoreStoreDemo/CoreStoreDemo.xcodeproj" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c; + - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c; + - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c; - if [ $POD_LINT == "YES" ]; then pod lib lint --quick; fi diff --git a/CartFile b/CartFile new file mode 100644 index 0000000..a8ee2b6 --- /dev/null +++ b/CartFile @@ -0,0 +1 @@ +github "JohnEstropia/GCDKit" == 1.1.5 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..568d159 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1 @@ +github "JohnEstropia/GCDKit" "1.1.5" diff --git a/Libraries/GCDKit b/Carthage/Checkouts/GCDKit similarity index 100% rename from Libraries/GCDKit rename to Carthage/Checkouts/GCDKit diff --git a/CoreStore.podspec b/CoreStore.podspec index 12ed74d..9246a3c 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CoreStore" - s.version = "1.3.6" + s.version = "1.4.0" s.license = "MIT" s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift" s.homepage = "https://github.com/JohnEstropia/CoreStore" diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 373c22f..30b4f4e 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -16,7 +16,6 @@ B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; }; B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; }; B52DD17E1BE1F8CD00949AFE /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52DD1741BE1F8CC00949AFE /* CoreStore.framework */; }; - B52DD1901BE1F8E600949AFE /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; }; B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD51BD65AE00077652A /* Foundation.framework */; }; B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD71BD65AE50077652A /* CoreData.framework */; }; B52DD1931BE1F8FD00949AFE /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -78,7 +77,6 @@ B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; }; B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321791BD650DE006C9394 /* CoreData.framework */; }; B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B563217B1BD650E3006C9394 /* Foundation.framework */; }; - B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321691BD64F99006C9394 /* GCDKit.framework */; }; B563217E1BD65110006C9394 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; B563217F1BD65216006C9394 /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; }; B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; }; @@ -140,12 +138,13 @@ B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; }; B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; }; B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; }; + B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; }; + B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; }; B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; }; B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; }; B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; }; B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0119FD00C9000E91BB /* Foundation.framework */; }; B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */; }; - B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; }; B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; }; B5E834BB1B7691F3001D3D50 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; }; B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; }; @@ -200,41 +199,6 @@ remoteGlobalIDString = B52DD1731BE1F8CC00949AFE; remoteInfo = "CoreStore OSX"; }; - B52DD18E1BE1F8DC00949AFE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B563212A1BD6359A006C9394; - remoteInfo = "GCDKit OSX"; - }; - B56321641BD64F99006C9394 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B563212B1BD6359A006C9394; - remoteInfo = "GCDKit OSX"; - }; - B56321661BD64F99006C9394 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B56321401BD63D14006C9394; - remoteInfo = "GCDKitTests OSX"; - }; - B56321681BD64F99006C9394 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B56321501BD6408F006C9394; - remoteInfo = "GCDKit watchOS"; - }; - B56321771BD650A3006C9394 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B563214F1BD6408F006C9394; - remoteInfo = "GCDKit watchOS"; - }; B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */; @@ -242,27 +206,6 @@ remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; remoteInfo = CoreStore; }; - B5D808011A34715700A44484 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2FBBCACB19A9FE610070E4AB; - remoteInfo = GCDKit; - }; - B5D808031A34715700A44484 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2FBBCAD619A9FE610070E4AB; - remoteInfo = GCDKitTests; - }; - B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 2FBBCACA19A9FE610070E4AB; - remoteInfo = GCDKit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -277,7 +220,6 @@ B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = ""; }; B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = ""; }; B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFetchedResultsController+Convenience.swift"; sourceTree = ""; }; - B527A17D1C16D98F007C0C35 /* CartFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CartFile; sourceTree = ""; }; B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = ""; }; @@ -293,12 +235,14 @@ B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = ""; }; B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFileManager+Setup.swift"; sourceTree = ""; }; B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = ""; }; + B5BDC91A1C202269008147CD /* CartFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CartFile; sourceTree = ""; }; + B5BDC91C1C2023CF008147CD /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = ""; }; + B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; }; B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+CoreStore.swift"; sourceTree = ""; }; B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; B5D372851A39CDDB00F583D9 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = ""; }; 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; 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 = ""; }; @@ -353,7 +297,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */, + B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */, B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */, 2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */, ); @@ -370,9 +314,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */, B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */, B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */, - B52DD1901BE1F8E600949AFE /* GCDKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -388,7 +332,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */, B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */, B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */, ); @@ -400,7 +343,6 @@ 2F03A52619C5C6DA005002A5 = { isa = PBXGroup; children = ( - B5D806BB1A34715700A44484 /* Libraries */, 2F291E3119C6D4D3007AF63F /* Frameworks */, 2F03A53219C5C6DA005002A5 /* CoreStore */, 2F03A53C19C5C6DA005002A5 /* CoreStoreTests */, @@ -447,7 +389,8 @@ B5E84ED81AFF82360064E85B /* README.md */, B5E84ED91AFF82360064E85B /* LICENSE */, B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */, - B527A17D1C16D98F007C0C35 /* CartFile */, + B5BDC91A1C202269008147CD /* CartFile */, + B5BDC9271C2024F2008147CD /* .travis.yml */, ); name = "Supporting Files"; sourceTree = ""; @@ -475,6 +418,7 @@ 2F291E3119C6D4D3007AF63F /* Frameworks */ = { isa = PBXGroup; children = ( + B5BDC91C1C2023CF008147CD /* GCDKit.framework */, B5548CD71BD65AE50077652A /* CoreData.framework */, B56321791BD650DE006C9394 /* CoreData.framework */, 2F03A54C19C5C872005002A5 /* CoreData.framework */, @@ -497,34 +441,6 @@ path = Migrating; sourceTree = ""; }; - B5D806BB1A34715700A44484 /* Libraries */ = { - isa = PBXGroup; - children = ( - B5D806BC1A34715700A44484 /* GCDKit */, - ); - path = Libraries; - sourceTree = ""; - }; - B5D806BC1A34715700A44484 /* GCDKit */ = { - isa = PBXGroup; - children = ( - B5D806C51A34715700A44484 /* GCDKit.xcodeproj */, - ); - path = GCDKit; - sourceTree = ""; - }; - B5D806C61A34715700A44484 /* Products */ = { - isa = PBXGroup; - children = ( - B5D808021A34715700A44484 /* GCDKit.framework */, - B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */, - B56321651BD64F99006C9394 /* GCDKit.framework */, - B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */, - B56321691BD64F99006C9394 /* GCDKit.framework */, - ); - name = Products; - sourceTree = ""; - }; B5E834B61B7630BD001D3D50 /* Importing Data */ = { isa = PBXGroup; children = ( @@ -689,7 +605,6 @@ buildRules = ( ); dependencies = ( - B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */, ); name = "CoreStore iOS"; productName = CoreStore; @@ -726,7 +641,6 @@ buildRules = ( ); dependencies = ( - B52DD18F1BE1F8DC00949AFE /* PBXTargetDependency */, ); name = "CoreStore OSX"; productName = "CoreStore OSX"; @@ -763,7 +677,6 @@ buildRules = ( ); dependencies = ( - B56321781BD650A3006C9394 /* PBXTargetDependency */, ); name = "CoreStore watchOS"; productName = "CoreStore watchOS"; @@ -808,12 +721,6 @@ mainGroup = 2F03A52619C5C6DA005002A5; productRefGroup = 2F03A53119C5C6DA005002A5 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = B5D806C61A34715700A44484 /* Products */; - ProjectRef = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */, @@ -825,44 +732,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - B56321651BD64F99006C9394 /* GCDKit.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = GCDKit.framework; - remoteRef = B56321641BD64F99006C9394 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "GCDKitTests OSX.xctest"; - remoteRef = B56321661BD64F99006C9394 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B56321691BD64F99006C9394 /* GCDKit.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = GCDKit.framework; - remoteRef = B56321681BD64F99006C9394 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B5D808021A34715700A44484 /* GCDKit.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = GCDKit.framework; - remoteRef = B5D808011A34715700A44484 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "GCDKitTests iOS.xctest"; - remoteRef = B5D808031A34715700A44484 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 2F03A52E19C5C6DA005002A5 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1115,26 +984,11 @@ target = B52DD1731BE1F8CC00949AFE /* CoreStore OSX */; targetProxy = B52DD17F1BE1F8CD00949AFE /* PBXContainerItemProxy */; }; - B52DD18F1BE1F8DC00949AFE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "GCDKit OSX"; - targetProxy = B52DD18E1BE1F8DC00949AFE /* PBXContainerItemProxy */; - }; - B56321781BD650A3006C9394 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "GCDKit watchOS"; - targetProxy = B56321771BD650A3006C9394 /* PBXContainerItemProxy */; - }; B5D372881A39CF4D00F583D9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */; targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */; }; - B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = GCDKit; - targetProxy = B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/CoreStore.xcworkspace/contents.xcworkspacedata b/CoreStore.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..954f208 --- /dev/null +++ b/CoreStore.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint b/CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint new file mode 100644 index 0000000..7203f19 --- /dev/null +++ b/CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0, + "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "EBFDEFFE-8BA0-441A-862A-1DE28AA5CD21", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStore\/Carthage\/Checkouts\/GCDKit\/", + "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStore.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/CoreStore", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/GCDKit.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97" + } + ] +} \ No newline at end of file diff --git a/CoreStore/Info.plist b/CoreStore/Info.plist index 7c703e4..8bce5c7 100644 --- a/CoreStore/Info.plist +++ b/CoreStore/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.3.6 + 1.4.0 CFBundleSignature ???? CFBundleVersion diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj index b66c960..1354f03 100644 --- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj @@ -35,10 +35,10 @@ B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; }; B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; }; B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; }; - B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; }; - B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; }; - B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; }; + B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; }; + B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; }; B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; }; B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; }; @@ -47,58 +47,6 @@ B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - B5202CF11C044CC800DED140 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B52DD1741BE1F8CC00949AFE; - remoteInfo = "CoreStore OSX"; - }; - B5202CF31C044CC800DED140 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B52DD17D1BE1F8CC00949AFE; - remoteInfo = "CoreStoreTests OSX"; - }; - B56321C51BD65965006C9394 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B563216F1BD65082006C9394; - remoteInfo = "CoreStore watchOS"; - }; - B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2F03A53019C5C6DA005002A5; - remoteInfo = CoreStore; - }; - B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2F03A53B19C5C6DA005002A5; - remoteInfo = CoreStoreTests; - }; - B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; - remoteInfo = CoreStore; - }; - B583A9221AF5F542001F76AF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 2F03A52F19C5C6DA005002A5; - remoteInfo = CoreStore; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ B583A9241AF5F542001F76AF /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -106,8 +54,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */, - B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */, + B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */, + B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -145,8 +93,8 @@ B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = ""; }; B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = ""; }; B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = ""; }; - B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreStore.xcodeproj; path = ../CoreStore.xcodeproj; sourceTree = ""; }; - B5D9C9181B20AB1900E64F0E /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GCDKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CoreStore.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/CoreStore.framework"; sourceTree = ""; }; + B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = ""; }; B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; }; B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = ""; }; B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = ""; }; @@ -163,9 +111,9 @@ buildActionMask = 2147483647; files = ( B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */, + B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */, + B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */, B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */, - B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */, - B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -196,9 +144,9 @@ B52977E21B120F90003D50A5 /* Frameworks */ = { isa = PBXGroup; children = ( - B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */, - B5D9C9181B20AB1900E64F0E /* GCDKit.framework */, B52977E01B120F8A003D50A5 /* CoreLocation.framework */, + B5BDC9211C202429008147CD /* CoreStore.framework */, + B5BDC9241C202429008147CD /* GCDKit.framework */, B52977DE1B120F83003D50A5 /* MapKit.framework */, ); name = Frameworks; @@ -296,18 +244,6 @@ path = "Migrations Demo"; sourceTree = ""; }; - B583A9151AF5F4F3001F76AF /* Products */ = { - isa = PBXGroup; - children = ( - B583A91B1AF5F4F4001F76AF /* CoreStore.framework */, - B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */, - B56321C61BD65965006C9394 /* CoreStore.framework */, - B5202CF21C044CC800DED140 /* CoreStore.framework */, - B5202CF41C044CC800DED140 /* CoreStoreTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -323,8 +259,6 @@ buildRules = ( ); dependencies = ( - B583A91F1AF5F512001F76AF /* PBXTargetDependency */, - B583A9231AF5F542001F76AF /* PBXTargetDependency */, ); name = CoreStoreDemo; productName = CoreStoreDemo; @@ -357,12 +291,6 @@ mainGroup = B54AAD401AF4D26E00848AE0; productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = B583A9151AF5F4F3001F76AF /* Products */; - ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; - }, - ); projectRoot = ""; targets = ( B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */, @@ -370,44 +298,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - B5202CF21C044CC800DED140 /* CoreStore.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = CoreStore.framework; - remoteRef = B5202CF11C044CC800DED140 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B5202CF41C044CC800DED140 /* CoreStoreTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = CoreStoreTests.xctest; - remoteRef = B5202CF31C044CC800DED140 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B56321C61BD65965006C9394 /* CoreStore.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = CoreStore.framework; - remoteRef = B56321C51BD65965006C9394 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = CoreStore.framework; - remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = CoreStoreTests.xctest; - remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ B54AAD471AF4D26E00848AE0 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -460,19 +350,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - B583A91F1AF5F512001F76AF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = CoreStore; - targetProxy = B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */; - }; - B583A9231AF5F542001F76AF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = CoreStore; - targetProxy = B583A9221AF5F542001F76AF /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ B54AAD571AF4D26E00848AE0 /* Main.storyboard */ = { isa = PBXVariantGroup;