Skip to content

Commit

Permalink
Refactored project so all dependencies are now pod dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
mwaterfall committed Jul 6, 2015
1 parent d68f9cd commit 9641f72
Show file tree
Hide file tree
Showing 592 changed files with 13,187 additions and 2,335 deletions.
53 changes: 20 additions & 33 deletions .gitignore
@@ -1,46 +1,33 @@
#
# Xcode
#
# OS X
.DS_Store

# Xcode
build/
*~.nib/
*.moved-aside
profile
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspective
!default.perspective
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xcodeproj/project.xcworkspace/
*.xcodeproj/xcuserdata/

#
# OS X noise
#

.DS_Store
Icon
.Spotlight-V100
.Trashes

#
# Misc
#

*~
*.bak
*.o
*.pyc
*.pyo
*.xccheckout
profile
*.moved-aside
DerivedData
*.hmap
*.ipa

#
# Tower
#
# Bundler
.bundle

/Icon.png
Carthage
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
#
# Pods/
15 changes: 15 additions & 0 deletions .travis.yml
@@ -0,0 +1,15 @@
# references:
# * http://www.objc.io/issue-6/travis-ci.html
# * https://github.com/supermarin/xcpretty#usage

language: objective-c
# cache: cocoapods
# podfile: Example/Podfile
# before_install:
# - gem install cocoapods # Since Travis is not always on latest version
# - pod install --project-directory=Example
install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
- set -o pipefail && xcodebuild test -workspace Example/MWPhotoBrowser.xcworkspace -scheme MWPhotoBrowser-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
- pod lib lint --quick
Binary file removed Demo/Default-568h@2x.png
Binary file not shown.
481 changes: 0 additions & 481 deletions Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj

This file was deleted.

14 changes: 0 additions & 14 deletions Demo/PhotoBrowserDemo/PhotoBrowserDemo-Prefix.pch

This file was deleted.

Binary file removed Demo/PhotoBrowserDemo/en.lproj/Localizable.strings
Binary file not shown.
17 changes: 0 additions & 17 deletions Demo/PhotoBrowserDemo/main.m

This file was deleted.

648 changes: 648 additions & 0 deletions Example/MWPhotoBrowser.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "MWPhotoBrowser_Example.app"
BlueprintName = "MWPhotoBrowser_Example"
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F5AD195388D20070C39A"
BuildableName = "MWPhotoBrowser_Tests.xctest"
BlueprintName = "MWPhotoBrowser_Tests"
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "MWPhotoBrowser_Example.app"
BlueprintName = "MWPhotoBrowser_Example"
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "MWPhotoBrowser_Example.app"
BlueprintName = "MWPhotoBrowser_Example"
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6003F589195388D20070C39A"
BuildableName = "MWPhotoBrowser_Example.app"
BlueprintName = "MWPhotoBrowser_Example"
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -12,6 +12,6 @@

@property (strong, nonatomic) UIWindow *window;

@property (strong, nonatomic) UIViewController *viewController;
//@property (strong, nonatomic) UIViewController *viewController;

@end
Expand Up @@ -7,22 +7,22 @@
//

#import "AppDelegate.h"
#import "Menu.h"
//#import "Menu.h"

@implementation AppDelegate

@synthesize window = _window;
@synthesize viewController = _viewController;
//@synthesize viewController = _viewController;


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];

Menu *menu = [[Menu alloc] initWithStyle:UITableViewStylePlain];
self.viewController = (UIViewController *)[[UINavigationController alloc] initWithRootViewController:menu];
self.window.rootViewController = self.viewController;
[self.window makeKeyAndVisible];
// self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
//
// Menu *menu = [[Menu alloc] initWithStyle:UITableViewStylePlain];
// self.viewController = (UIViewController *)[[UINavigationController alloc] initWithRootViewController:menu];
// self.window.rootViewController = self.viewController;
// [self.window makeKeyAndVisible];
return YES;
}

Expand Down
@@ -0,0 +1,58 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,51 @@
{
"images" : [
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"subtype" : "retina4",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

0 comments on commit 9641f72

Please sign in to comment.