From 74fe81bfa7221282e789ff40ad5e05b25ad2c42a Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Mon, 2 May 2016 12:02:31 +0800 Subject: [PATCH] Fix problem when using carthage where the iOS7 framework overwrites the iOS 8 framework --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/GCDKit | 2 +- CoreStore.podspec | 4 ++-- CoreStore.xcodeproj/project.pbxproj | 10 ++++++---- CoreStore/Info.plist | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cartfile b/Cartfile index 8858845..3aee48e 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "JohnEstropia/GCDKit" == 1.2.2 +github "JohnEstropia/GCDKit" == 1.2.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5a1701e..13b3aef 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "JohnEstropia/GCDKit" "1.2.2" +github "JohnEstropia/GCDKit" "1.2.4" diff --git a/Carthage/Checkouts/GCDKit b/Carthage/Checkouts/GCDKit index 07866b9..822fe55 160000 --- a/Carthage/Checkouts/GCDKit +++ b/Carthage/Checkouts/GCDKit @@ -1 +1 @@ -Subproject commit 07866b93ee052e3becc7b79eb12b87786acdfc2e +Subproject commit 822fe55fc49fb39d6f9cf97b2f9c048fc6a74179 diff --git a/CoreStore.podspec b/CoreStore.podspec index 73ff5b3..e2bdccc 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CoreStore" - s.version = "1.6.3" + s.version = "1.6.4" 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" @@ -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.2" + s.dependency "GCDKit", "1.2.4" end \ No newline at end of file diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 10d86b3..bd7b837 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -409,7 +409,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 = ""; }; B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; }; - B5D9E3341CA2C317007A9D52 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B5D9E3341CA2C317007A9D52 /* CoreStore_iOS7.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore_iOS7.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDBlock.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDBlock.swift; sourceTree = ""; }; B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDGroup.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDGroup.swift; sourceTree = ""; }; B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDQueue.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDQueue.swift; sourceTree = ""; }; @@ -559,7 +559,7 @@ B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */, 82BA18891C4BBCBA00A0916E /* CoreStore.framework */, 82BA18921C4BBCBA00A0916E /* CoreStoreTests.xctest */, - B5D9E3341CA2C317007A9D52 /* CoreStore.framework */, + B5D9E3341CA2C317007A9D52 /* CoreStore_iOS7.framework */, ); name = Products; sourceTree = ""; @@ -971,7 +971,7 @@ ); name = "CoreStore iOS7"; productName = CoreStore; - productReference = B5D9E3341CA2C317007A9D52 /* CoreStore.framework */; + productReference = B5D9E3341CA2C317007A9D52 /* CoreStore_iOS7.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1020,8 +1020,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */, B5D9E2ED1CA2C317007A9D52 /* CoreStore iOS7 */, + 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */, 2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */, 82BA18881C4BBCBA00A0916E /* CoreStore tvOS */, 82BA18911C4BBCBA00A0916E /* CoreStoreTests tvOS */, @@ -1822,6 +1822,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = "-D DEBUG"; + PRODUCT_NAME = CoreStore_iOS7; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; @@ -1839,6 +1840,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; + PRODUCT_NAME = CoreStore_iOS7; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; diff --git a/CoreStore/Info.plist b/CoreStore/Info.plist index 2bd8f0d..f1ed6f9 100644 --- a/CoreStore/Info.plist +++ b/CoreStore/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.6.3 + 1.6.4 CFBundleSignature ???? CFBundleVersion