Enable modules for sample (but not for framework)

jonreid · Dec 23, 2015 · 8d5085e · 8d5085e
1 parent b69d0ca
commit 8d5085e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/Sample/MockUIAlertViewActionSheetSample.xcodeproj/project.pbxproj b/Sample/MockUIAlertViewActionSheetSample.xcodeproj/project.pbxproj
@@ -324,6 +324,7 @@
 			baseConfigurationReference = 0EF849A61C2A621B00862CC9 /* XcodeWarnings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -363,6 +364,7 @@
 			baseConfigurationReference = 0EF849A61C2A621B00862CC9 /* XcodeWarnings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;

diff --git a/Sample/SampleApp/AppDelegate.h b/Sample/SampleApp/AppDelegate.h
@@ -1,4 +1,5 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
+
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 @property (nonatomic, strong) UIWindow *window;

diff --git a/Sample/SampleApp/AppDelegate.m b/Sample/SampleApp/AppDelegate.m
@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
 
+
 @implementation AppDelegate
 @end
diff --git a/Sample/SampleApp/Base.lproj/Main.storyboard b/Sample/SampleApp/Base.lproj/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -25,7 +26,7 @@
                                     <action selector="showAlert:" destination="BYZ-38-t0r" eventType="touchUpInside" id="UH9-3D-wTB"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W0M-xH-y3m">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W0M-xH-y3m">
                                 <rect key="frame" x="193" y="285" width="215" height="30"/>
                                 <state key="normal" title="Show Deprecated Action Sheet">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>

diff --git a/Sample/SampleApp/ViewController.h b/Sample/SampleApp/ViewController.h
@@ -1,4 +1,5 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
+
 
 @interface ViewController : UIViewController <UIAlertViewDelegate, UIActionSheetDelegate>
 

diff --git a/Sample/SampleApp/ViewController.m b/Sample/SampleApp/ViewController.m
@@ -1,5 +1,6 @@
 #import "ViewController.h"
 
+
 @implementation ViewController
 
 - (IBAction)showAlert:(id)sender

diff --git a/Sample/Tests/ViewControllerTests-OCHamcrest.m b/Sample/Tests/ViewControllerTests-OCHamcrest.m
@@ -4,7 +4,7 @@
 // Test support
 #import <MockUIAlertViewActionSheet/QCOMockActionSheetVerifier.h>
 #import <MockUIAlertViewActionSheet/QCOMockAlertViewVerifier.h>
-#import <XCTest/XCTest.h>
+@import XCTest;
 
 #define HC_SHORTHAND
 #import <OCHamcrestIOS/OCHamcrestIOS.h>

diff --git a/Sample/Tests/ViewControllerTests-PlainXCTest.m b/Sample/Tests/ViewControllerTests-PlainXCTest.m
@@ -4,7 +4,7 @@
 // Test support
 #import <MockUIAlertViewActionSheet/QCOMockActionSheetVerifier.h>
 #import <MockUIAlertViewActionSheet/QCOMockAlertViewVerifier.h>
-#import <XCTest/XCTest.h>
+@import XCTest;
 
 
 @interface ViewControllerTests_PlainXCTest : XCTestCase