Skip to content

Commit

Permalink
Merge pull request #4 from ktakayama/fix-carthage-installation
Browse files Browse the repository at this point in the history 
O wow, I am not a Carthage user as you can tell. Thanks for contributing!
  • Loading branch information
@PiXeL16
PiXeL16 committed Aug 17, 2016
2 parents 2d42ec0 + 7fdddb5 commit 607f924
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 72 deletions.
70 changes: 14 additions & 56 deletions IBLocalizable.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
07FF07F1B4B4314DBD409B45 /* Pods_IBLocalizableTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DABE2F0B620C734942B5DC /* Pods_IBLocalizableTests.framework */; };
19EE8C74616DD139106E6FDA /* Pods_IBLocalizable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DFB8540D86C267E30CDDD8A /* Pods_IBLocalizable.framework */; };
837CE40D1D4C50B000EC3FDA /* IBLocalizable.h in Headers */ = {isa = PBXBuildFile; fileRef = 837CE40C1D4C50B000EC3FDA /* IBLocalizable.h */; settings = {ATTRIBUTES = (Public, ); }; };
837CE4141D4C50B000EC3FDA /* IBLocalizable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 837CE4091D4C50B000EC3FDA /* IBLocalizable.framework */; };
837CE4191D4C50B000EC3FDA /* IBLocalizableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837CE4181D4C50B000EC3FDA /* IBLocalizableTests.swift */; };
Expand Down Expand Up @@ -44,6 +42,7 @@
837CE4771D4D33F200EC3FDA /* LocalizableUIBarItemsSpecs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837CE4761D4D33F200EC3FDA /* LocalizableUIBarItemsSpecs.swift */; };
83E6590C1D565DF9002023B7 /* LocalizableUISearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83E6590B1D565DF9002023B7 /* LocalizableUISearchBar.swift */; };
83E6590D1D565DF9002023B7 /* LocalizableUISearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83E6590B1D565DF9002023B7 /* LocalizableUISearchBar.swift */; };
ADFED2D18CD13E0722ED1D23 /* Pods_IBLocalizableTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16E96AD49A81D2E27DEEA385 /* Pods_IBLocalizableTests.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -57,9 +56,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
40A20B272AC4DC65C69EDBEE /* Pods-IBLocalizable.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizable.release.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizable/Pods-IBLocalizable.release.xcconfig"; sourceTree = "<group>"; };
5C7A5E9C736037A905BDAE9A /* Pods-IBLocalizableTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizableTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizableTests/Pods-IBLocalizableTests.release.xcconfig"; sourceTree = "<group>"; };
6DFB8540D86C267E30CDDD8A /* Pods_IBLocalizable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IBLocalizable.framework; sourceTree = BUILT_PRODUCTS_DIR; };
16E96AD49A81D2E27DEEA385 /* Pods_IBLocalizableTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IBLocalizableTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
837CE4091D4C50B000EC3FDA /* IBLocalizable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IBLocalizable.framework; sourceTree = BUILT_PRODUCTS_DIR; };
837CE40C1D4C50B000EC3FDA /* IBLocalizable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IBLocalizable.h; sourceTree = "<group>"; };
837CE40E1D4C50B000EC3FDA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -91,17 +88,15 @@
837CE4761D4D33F200EC3FDA /* LocalizableUIBarItemsSpecs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizableUIBarItemsSpecs.swift; sourceTree = "<group>"; };
837CE4BF1D4DA00200EC3FDA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
83E6590B1D565DF9002023B7 /* LocalizableUISearchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizableUISearchBar.swift; sourceTree = "<group>"; };
93DABE2F0B620C734942B5DC /* Pods_IBLocalizableTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IBLocalizableTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BAC76A85E9EDC9C8090DEAF5 /* Pods-IBLocalizable.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizable.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizable/Pods-IBLocalizable.debug.xcconfig"; sourceTree = "<group>"; };
C1DEC4FD786CBE2B9BFF0A5F /* Pods-IBLocalizableTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizableTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizableTests/Pods-IBLocalizableTests.debug.xcconfig"; sourceTree = "<group>"; };
86CE7994702C8B7A8DAEBAA5 /* Pods-IBLocalizableTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizableTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizableTests/Pods-IBLocalizableTests.debug.xcconfig"; sourceTree = "<group>"; };
C00D6BD9C13E38A9D3BC6D26 /* Pods-IBLocalizableTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBLocalizableTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-IBLocalizableTests/Pods-IBLocalizableTests.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
837CE4051D4C50B000EC3FDA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
19EE8C74616DD139106E6FDA /* Pods_IBLocalizable.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -110,7 +105,7 @@
buildActionMask = 2147483647;
files = (
837CE4141D4C50B000EC3FDA /* IBLocalizable.framework in Frameworks */,
07FF07F1B4B4314DBD409B45 /* Pods_IBLocalizableTests.framework in Frameworks */,
ADFED2D18CD13E0722ED1D23 /* Pods_IBLocalizableTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -124,24 +119,23 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1EBC4FED80B7499A008D18F9 /* Frameworks */ = {
6F044DD1BC3C9653D0C18E6E /* Frameworks */ = {
isa = PBXGroup;
children = (
6DFB8540D86C267E30CDDD8A /* Pods_IBLocalizable.framework */,
93DABE2F0B620C734942B5DC /* Pods_IBLocalizableTests.framework */,
16E96AD49A81D2E27DEEA385 /* Pods_IBLocalizableTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
837CE3FF1D4C50B000EC3FDA = {
isa = PBXGroup;
children = (
1EBC4FED80B7499A008D18F9 /* Frameworks */,
837CE40B1D4C50B000EC3FDA /* IBLocalizable */,
837CE4311D4C5B6900EC3FDA /* IBLocalizableSample */,
837CE4171D4C50B000EC3FDA /* IBLocalizableTests */,
D9B63D86D6FCE9EAE756C87A /* Pods */,
837CE40A1D4C50B000EC3FDA /* Products */,
A3076322B6645EFE106CB053 /* Pods */,
6F044DD1BC3C9653D0C18E6E /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -251,13 +245,11 @@
path = Protocol;
sourceTree = "<group>";
};
D9B63D86D6FCE9EAE756C87A /* Pods */ = {
A3076322B6645EFE106CB053 /* Pods */ = {
isa = PBXGroup;
children = (
BAC76A85E9EDC9C8090DEAF5 /* Pods-IBLocalizable.debug.xcconfig */,
40A20B272AC4DC65C69EDBEE /* Pods-IBLocalizable.release.xcconfig */,
C1DEC4FD786CBE2B9BFF0A5F /* Pods-IBLocalizableTests.debug.xcconfig */,
5C7A5E9C736037A905BDAE9A /* Pods-IBLocalizableTests.release.xcconfig */,
86CE7994702C8B7A8DAEBAA5 /* Pods-IBLocalizableTests.debug.xcconfig */,
C00D6BD9C13E38A9D3BC6D26 /* Pods-IBLocalizableTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -280,12 +272,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 837CE41D1D4C50B000EC3FDA /* Build configuration list for PBXNativeTarget "IBLocalizable" */;
buildPhases = (
1189DD71CB36FC0E0D9C1A2A /* [CP] Check Pods Manifest.lock */,
837CE4041D4C50B000EC3FDA /* Sources */,
837CE4051D4C50B000EC3FDA /* Frameworks */,
837CE4061D4C50B000EC3FDA /* Headers */,
837CE4071D4C50B000EC3FDA /* Resources */,
10C779E6A8297F2A6118AADA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -406,36 +396,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
10C779E6A8297F2A6118AADA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IBLocalizable/Pods-IBLocalizable-resources.sh\"\n";
showEnvVarsInLog = 0;
};
1189DD71CB36FC0E0D9C1A2A /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
9753B7E90B56AE10A2A6AD96 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -668,7 +628,6 @@
};
837CE41E1D4C50B000EC3FDA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BAC76A85E9EDC9C8090DEAF5 /* Pods-IBLocalizable.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
Expand All @@ -687,7 +646,6 @@
};
837CE41F1D4C50B000EC3FDA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40A20B272AC4DC65C69EDBEE /* Pods-IBLocalizable.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
Expand All @@ -705,7 +663,7 @@
};
837CE4211D4C50B000EC3FDA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C1DEC4FD786CBE2B9BFF0A5F /* Pods-IBLocalizableTests.debug.xcconfig */;
baseConfigurationReference = 86CE7994702C8B7A8DAEBAA5 /* Pods-IBLocalizableTests.debug.xcconfig */;
buildSettings = {
INFOPLIST_FILE = IBLocalizableTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -716,7 +674,7 @@
};
837CE4221D4C50B000EC3FDA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5C7A5E9C736037A905BDAE9A /* Pods-IBLocalizableTests.release.xcconfig */;
baseConfigurationReference = C00D6BD9C13E38A9D3BC6D26 /* Pods-IBLocalizableTests.release.xcconfig */;
buildSettings = {
INFOPLIST_FILE = IBLocalizableTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
19 changes: 4 additions & 15 deletions Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'

def test_pods
pod 'Quick'
pod 'Nimble'
end

target 'IBLocalizable' do
# Comment this line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

# Pods for IBLocalizable

target 'IBLocalizableTests' do
inherit! :search_paths
test_pods
end

target 'IBLocalizableTests' do
use_frameworks!
pod 'Quick'
pod 'Nimble'
end
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ SPEC CHECKSUMS:
Nimble: 97a0a4cae5124c117115634b2d055d8c97d0af19
Quick: 13a2a2b19a5d8e3ed4fd0c36ee46597fd77ebf71

PODFILE CHECKSUM: adbfd638e6fbb9e675098840cb9d8c674104c999
PODFILE CHECKSUM: a87e09186218a6be7ffaffeb52996042c335da9a

COCOAPODS: 1.0.1

0 comments on commit 607f924

Please sign in to comment.