Merge pull request #97 from eliburke/nestedFrameworkFix

Nested framework fix for Carthage build
m1entus · Jul 12, 2016 · 29e6459 · 29e6459
2 parents 5ffa440 + b34c93e
commit 29e6459
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/Framework/MZFormSheetPresentationControllerFramework.h b/Framework/MZFormSheetPresentationControllerFramework.h
@@ -17,6 +17,8 @@ FOUNDATION_EXPORT const unsigned char MZFormSheetPresentationControllerVersionSt
 
 #import <MZFormSheetPresentationController/MZFormSheetPresentationController.h>
 #import <MZFormSheetPresentationController/MZFormSheetPresentationViewController.h>
+#import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerSegue.h>
+#import <MZFormSheetPresentationController/MZFormSheetPresentationController Swift Example-Bridging-Header.h>
 
 #import <MZFormSheetPresentationController/MZTransition.h>
 
@@ -26,7 +28,8 @@ FOUNDATION_EXPORT const unsigned char MZFormSheetPresentationControllerVersionSt
 #import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerInteractiveTransitioning.h>
 
 #import <MZFormSheetPresentationController/MZFormSheetPresentationContentSizing.h>
-#import <MZFormSheetPresentationController/MZFormSheetPresentationViewControllerSegue.h>
+#import <MZFormSheetPresentationController/MZFormSheetContentSizingNavigationController.h>
+#import <MZFormSheetPresentationController/MZFormSheetContentSizingNavigationControllerAnimator.h>
 
 #import <MZFormSheetPresentationController/MZBlurEffectAdapter.h>
-#import <MZFormSheetPresentationController/MZFormSheetPresentationController Swift Example-Bridging-Header.h>
+#import <MZFormSheetPresentationController/UIViewController+TargetViewController.h>
diff --git a/MZFormSheetPresentationController.xcodeproj/project.pbxproj b/MZFormSheetPresentationController.xcodeproj/project.pbxproj
@@ -183,7 +183,6 @@
 				468A6BF51C4B2FAD00F84D81 /* Frameworks */,
 				468A6BF61C4B2FAD00F84D81 /* Headers */,
 				468A6BF71C4B2FAD00F84D81 /* Resources */,
-				AE0D4D1C1C90802100A82E3B /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -235,23 +234,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		AE0D4D1C1C90802100A82E3B /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/MZAppearance.framework",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		468A6BF41C4B2FAD00F84D81 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;