Skip to content

Commit 29e6459

Browse files
authored
Merge pull request #97 from eliburke/nestedFrameworkFix
Nested framework fix for Carthage build
2 parents 5ffa440 + b34c93e commit 29e6459

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

Framework/MZFormSheetPresentationControllerFramework.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ FOUNDATION_EXPORT const unsigned char MZFormSheetPresentationControllerVersionSt
1717

1818
#import <MZFormSheetPresentationController/MZFormSheetPresentationController.h>
1919
#import <MZFormSheetPresentationController/MZFormSheetPresentationViewController.h>
20+
#import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerSegue.h>
21+
#import <MZFormSheetPresentationController/MZFormSheetPresentationController Swift Example-Bridging-Header.h>
2022

2123
#import <MZFormSheetPresentationController/MZTransition.h>
2224

@@ -26,7 +28,8 @@ FOUNDATION_EXPORT const unsigned char MZFormSheetPresentationControllerVersionSt
2628
#import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerInteractiveTransitioning.h>
2729

2830
#import <MZFormSheetPresentationController/MZFormSheetPresentationContentSizing.h>
29-
#import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerSegue.h>
31+
#import <MZFormSheetPresentationController/MZFormSheetContentSizingNavigationController.h>
32+
#import <MZFormSheetPresentationController/MZFormSheetContentSizingNavigationControllerAnimator.h>
3033

3134
#import <MZFormSheetPresentationController/MZBlurEffectAdapter.h>
32-
#import <MZFormSheetPresentationController/MZFormSheetPresentationController Swift Example-Bridging-Header.h>
35+
#import <MZFormSheetPresentationController/UIViewController+TargetViewController.h>

MZFormSheetPresentationController.xcodeproj/project.pbxproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@
183183
468A6BF51C4B2FAD00F84D81 /* Frameworks */,
184184
468A6BF61C4B2FAD00F84D81 /* Headers */,
185185
468A6BF71C4B2FAD00F84D81 /* Resources */,
186-
AE0D4D1C1C90802100A82E3B /* ShellScript */,
187186
);
188187
buildRules = (
189188
);
@@ -235,23 +234,6 @@
235234
};
236235
/* End PBXResourcesBuildPhase section */
237236

238-
/* Begin PBXShellScriptBuildPhase section */
239-
AE0D4D1C1C90802100A82E3B /* ShellScript */ = {
240-
isa = PBXShellScriptBuildPhase;
241-
buildActionMask = 2147483647;
242-
files = (
243-
);
244-
inputPaths = (
245-
"$(SRCROOT)/Carthage/Build/iOS/MZAppearance.framework",
246-
);
247-
outputPaths = (
248-
);
249-
runOnlyForDeploymentPostprocessing = 0;
250-
shellPath = /bin/sh;
251-
shellScript = "/usr/local/bin/carthage copy-frameworks";
252-
};
253-
/* End PBXShellScriptBuildPhase section */
254-
255237
/* Begin PBXSourcesBuildPhase section */
256238
468A6BF41C4B2FAD00F84D81 /* Sources */ = {
257239
isa = PBXSourcesBuildPhase;

0 commit comments

Comments
 (0)