Skip to content

Commit

Permalink
Fixes Carthage support in Morgan
Browse files Browse the repository at this point in the history
  • Loading branch information
@RamonGilabert
RamonGilabert committed Sep 9, 2016
1 parent 677a89a commit 5383cdc
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 16 deletions.
1 change: 1 addition & 0 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "RamonGilabert/Walker" "master"
1 change: 1 addition & 0 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "RamonGilabert/Walker" "2b98a312810756f4c92c8f7cf1c8cb3a5c800e84"
72 changes: 56 additions & 16 deletions Morgan.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
292D71E91C94A82600CFC060 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 292D71E81C94A82600CFC060 /* Info.plist */; };
29BB21A71D82B5C400FA2D92 /* Morgan+UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BB21A41D82B5C400FA2D92 /* Morgan+UIButton.swift */; };
29BB21A81D82B5C400FA2D92 /* Morgan+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BB21A51D82B5C400FA2D92 /* Morgan+UIView.swift */; };
29BB21A91D82B5C400FA2D92 /* Morgan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BB21A61D82B5C400FA2D92 /* Morgan.swift */; };
29BB21B71D82B69000FA2D92 /* Walker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29BB21B31D82B69000FA2D92 /* Walker.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
292D71E81C94A82600CFC060 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29BB21A41D82B5C400FA2D92 /* Morgan+UIButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Morgan+UIButton.swift"; sourceTree = "<group>"; };
29BB21A51D82B5C400FA2D92 /* Morgan+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Morgan+UIView.swift"; sourceTree = "<group>"; };
29BB21A61D82B5C400FA2D92 /* Morgan.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Morgan.swift; sourceTree = "<group>"; };
29BB21AB1D82B5D400FA2D92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29BB21B31D82B69000FA2D92 /* Walker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Walker.framework; path = Carthage/Build/iOS/Walker.framework; sourceTree = "<group>"; };
D5B2E89F1C3A780C00C0327D /* Morgan.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Morgan.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -20,25 +27,37 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
29BB21B71D82B69000FA2D92 /* Walker.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
292D71E71C94A82600CFC060 /* Others */ = {
29BB21A31D82B5C400FA2D92 /* Sources */ = {
isa = PBXGroup;
children = (
292D71E81C94A82600CFC060 /* Info.plist */,
29BB21A41D82B5C400FA2D92 /* Morgan+UIButton.swift */,
29BB21A51D82B5C400FA2D92 /* Morgan+UIView.swift */,
29BB21A61D82B5C400FA2D92 /* Morgan.swift */,
);
path = Sources;
sourceTree = "<group>";
};
29BB21AA1D82B5D400FA2D92 /* Others */ = {
isa = PBXGroup;
children = (
29BB21AB1D82B5D400FA2D92 /* Info.plist */,
);
path = Others;
sourceTree = "<group>";
};
D5B2E8951C3A780C00C0327D = {
isa = PBXGroup;
children = (
D5C629691C3A809D007F7B7C /* Sources */,
292D71E71C94A82600CFC060 /* Others */,
29BB21B31D82B69000FA2D92 /* Walker.framework */,
29BB21AA1D82B5D400FA2D92 /* Others */,
29BB21A31D82B5C400FA2D92 /* Sources */,
D5B2E8A01C3A780C00C0327D /* Products */,
);
sourceTree = "<group>";
Expand All @@ -51,13 +70,6 @@
name = Products;
sourceTree = "<group>";
};
D5C629691C3A809D007F7B7C /* Sources */ = {
isa = PBXGroup;
children = (
);
path = Sources;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand All @@ -79,6 +91,7 @@
D5B2E89B1C3A780C00C0327D /* Frameworks */,
D5B2E89C1C3A780C00C0327D /* Headers */,
D5B2E89D1C3A780C00C0327D /* Resources */,
29BB21B91D82B6B000FA2D92 /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -126,17 +139,36 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
292D71E91C94A82600CFC060 /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
29BB21B91D82B6B000FA2D92 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/Walker.framework",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D5B2E89A1C3A780C00C0327D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
29BB21A81D82B5C400FA2D92 /* Morgan+UIView.swift in Sources */,
29BB21A71D82B5C400FA2D92 /* Morgan+UIButton.swift in Sources */,
29BB21A91D82B5C400FA2D92 /* Morgan.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -180,7 +212,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -222,7 +254,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -240,6 +272,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "$(SRCROOT)/Others/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -259,6 +295,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "$(SRCROOT)/Others/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand Down

0 comments on commit 5383cdc

Please sign in to comment.