Skip to content

Commit

Permalink
Merge pull request #76 from mikaoj/hotfix/carthage_ios8
Browse files Browse the repository at this point in the history
Added platform target to Podfile
  • Loading branch information
mikaoj committed Jun 1, 2016
2 parents 2131b72 + fbae42c commit 894c522
Show file tree
Hide file tree
Showing 7 changed files with 247 additions and 186 deletions.
7 changes: 2 additions & 5 deletions Example/BSImagePicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
TestTargetID = 607FACCF1AFB9204008FA782;
};
};
};
Expand Down Expand Up @@ -606,6 +605,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = BSImagePicker_Example.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = BSImagePicker/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down Expand Up @@ -637,7 +637,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 48917209F1528320CD70D7F6 /* Pods-BSImagePicker_Tests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand All @@ -646,20 +645,17 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BSImagePicker_Example.app/BSImagePicker_Example";
};
name = Debug;
};
607FACF41AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BA97266BA17B3090F26F6971 /* Pods-BSImagePicker_Tests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BSImagePicker_Example.app/BSImagePicker_Example";
};
name = Release;
};
Expand All @@ -673,6 +669,7 @@
55E273F01BE004F2006006A7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "BSImagePicker" */ = {
isa = XCConfigurationList;
Expand Down
1 change: 1 addition & 0 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!
platform :ios, '8.0'

target 'BSImagePicker_Example', :exclusive => true do
pod "BSImagePicker", :path => "../"
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- BSGridCollectionViewLayout (1.1.0)
- BSGridCollectionViewLayout (1.1.1)
- BSImagePicker (2.3.0):
- BSGridCollectionViewLayout (~> 1.1)
- UIImageViewModeScaleAspect (~> 1.3)
Expand All @@ -13,7 +13,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
BSGridCollectionViewLayout: 5fd85b2d944426e5c1ed824ae46eb8da44606cf8
BSGridCollectionViewLayout: d7304dcb35c6b3b4420c527e9f9b77ff322250f3
BSImagePicker: 591b28ce4994c44cbc4ac896717c1db9f9fadd18
UIImageViewModeScaleAspect: ec78901acfc20d3782154111a21d34390f8f71ad

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 894c522

Please sign in to comment.