diff --git a/Example/AppDelegate.h b/Example/AppDelegate.h index f6d30d0..9523696 100644 --- a/Example/AppDelegate.h +++ b/Example/AppDelegate.h @@ -12,6 +12,5 @@ @property (strong, nonatomic) UIWindow *window; - @end diff --git a/Example/AppDelegate.m b/Example/AppDelegate.m index a05c3d2..2be598e 100644 --- a/Example/AppDelegate.m +++ b/Example/AppDelegate.m @@ -8,38 +8,10 @@ #import "AppDelegate.h" -@interface AppDelegate () - -@end - @implementation AppDelegate - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. return YES; } -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - @end diff --git a/Example/ViewController.h b/Example/ViewController.h index 515abce..9b9de6d 100644 --- a/Example/ViewController.h +++ b/Example/ViewController.h @@ -10,7 +10,5 @@ #import @interface ViewController : UIViewController - - @end diff --git a/ZipArchive.xcodeproj/project.pbxproj b/ZipArchive.xcodeproj/project.pbxproj index 1c34b21..4e6462c 100644 --- a/ZipArchive.xcodeproj/project.pbxproj +++ b/ZipArchive.xcodeproj/project.pbxproj @@ -29,9 +29,9 @@ A527EDD91B52809700CA3DAF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A527EDD71B52808900CA3DAF /* Foundation.framework */; }; A527EDDA1B52809700CA3DAF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A527EDD51B52808400CA3DAF /* CoreGraphics.framework */; }; A53101811B5284E200FA26EA /* Main.h in Headers */ = {isa = PBXBuildFile; fileRef = A5D15D181B51A4D000929105 /* Main.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A53101831B528EE100FA26EA /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5D15CBD1B51A38C00929105 /* ZipArchive.framework */; }; + A53101841B528EF200FA26EA /* ZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D15CCF1B51A38C00929105 /* ZipArchiveTests.m */; }; A5D15CC31B51A38C00929105 /* ZipArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = A5D15CC21B51A38C00929105 /* ZipArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A5D15CC91B51A38C00929105 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5D15CBD1B51A38C00929105 /* ZipArchive.framework */; }; - A5D15CD01B51A38C00929105 /* ZipArchiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D15CCF1B51A38C00929105 /* ZipArchiveTests.m */; }; A5D15CE21B51A3A400929105 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D15CE11B51A3A400929105 /* main.m */; }; A5D15CE51B51A3A400929105 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D15CE41B51A3A400929105 /* AppDelegate.m */; }; A5D15CE81B51A3A400929105 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D15CE71B51A3A400929105 /* ViewController.m */; }; @@ -136,7 +136,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A5D15CC91B51A38C00929105 /* ZipArchive.framework in Frameworks */, + A53101831B528EE100FA26EA /* ZipArchive.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -226,13 +226,9 @@ A5D15CDE1B51A3A400929105 /* Example */ = { isa = PBXGroup; children = ( - A5D15CE31B51A3A400929105 /* AppDelegate.h */, - A5D15CE41B51A3A400929105 /* AppDelegate.m */, A5D15CE61B51A3A400929105 /* ViewController.h */, A5D15CE71B51A3A400929105 /* ViewController.m */, A5D15CE91B51A3A400929105 /* Main.storyboard */, - A5D15CEC1B51A3A400929105 /* Images.xcassets */, - A5D15CEE1B51A3A400929105 /* LaunchScreen.xib */, A5D15CDF1B51A3A400929105 /* Supporting Files */, ); path = Example; @@ -241,6 +237,10 @@ A5D15CDF1B51A3A400929105 /* Supporting Files */ = { isa = PBXGroup; children = ( + A5D15CE31B51A3A400929105 /* AppDelegate.h */, + A5D15CE41B51A3A400929105 /* AppDelegate.m */, + A5D15CEC1B51A3A400929105 /* Images.xcassets */, + A5D15CEE1B51A3A400929105 /* LaunchScreen.xib */, A5D15CE01B51A3A400929105 /* Info.plist */, A5D15CE11B51A3A400929105 /* main.m */, ); @@ -476,9 +476,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + A53101841B528EF200FA26EA /* ZipArchiveTests.m in Sources */, A5D15D441B51CF2900929105 /* Main.m in Sources */, A5D15D461B51D68600929105 /* CollectingDelegate.m in Sources */, - A5D15CD01B51A38C00929105 /* ZipArchiveTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -613,6 +613,7 @@ A5D15CD41B51A38C00929105 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -628,6 +629,7 @@ A5D15CD51B51A38C00929105 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -643,6 +645,7 @@ A5D15CD71B51A38C00929105 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -660,6 +663,7 @@ A5D15CD81B51A38C00929105 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", diff --git a/ZipArchive.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/ZipArchive.xcodeproj/xcshareddata/xcschemes/Example.xcscheme deleted file mode 100644 index 22707f2..0000000 --- a/ZipArchive.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ZipArchiveTests/ZipArchiveTests.m b/ZipArchiveTests/ZipArchiveTests.m index 74327a5..4e34f4b 100644 --- a/ZipArchiveTests/ZipArchiveTests.m +++ b/ZipArchiveTests/ZipArchiveTests.m @@ -6,7 +6,7 @@ // Copyright (c) 2015 ZipArchive. All rights reserved. // -#import "Main.h" +#import "ZipArchive/Main.h" #import "CollectingDelegate.h" #import #import