Skip to content

Commit 9641f72

Browse files
mwaterfallmwaterfall
committed
Refactored project so all dependencies are now pod dependencies.
1 parent d68f9cd commit 9641f72

File tree

592 files changed

+13187
-2335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+13187
-2335
lines changed

‎.gitignore

+20-33
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,33 @@
1-
#
2-
# Xcode
3-
#
1+
# OS X
2+
.DS_Store
43

4+
# Xcode
55
build/
6-
*~.nib/
7-
*.moved-aside
8-
profile
96
*.pbxuser
107
!default.pbxuser
118
*.mode1v3
129
!default.mode1v3
1310
*.mode2v3
1411
!default.mode2v3
15-
*.perspective
16-
!default.perspective
1712
*.perspectivev3
1813
!default.perspectivev3
1914
xcuserdata
20-
*.xcodeproj/project.xcworkspace/
21-
*.xcodeproj/xcuserdata/
22-
23-
#
24-
# OS X noise
25-
#
26-
27-
.DS_Store
28-
Icon
29-
.Spotlight-V100
30-
.Trashes
31-
32-
#
33-
# Misc
34-
#
35-
36-
*~
37-
*.bak
38-
*.o
39-
*.pyc
40-
*.pyo
15+
*.xccheckout
16+
profile
17+
*.moved-aside
18+
DerivedData
19+
*.hmap
20+
*.ipa
4121

42-
#
43-
# Tower
44-
#
22+
# Bundler
23+
.bundle
4524

46-
/Icon.png
25+
Carthage
26+
# We recommend against adding the Pods directory to your .gitignore. However
27+
# you should judge for yourself, the pros and cons are mentioned at:
28+
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
29+
#
30+
# Note: if you ignore the Pods directory, make sure to uncomment
31+
# `pod install` in .travis.yml
32+
#
33+
# Pods/

‎.travis.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# references:
2+
# * http://www.objc.io/issue-6/travis-ci.html
3+
# * https://github.com/supermarin/xcpretty#usage
4+
5+
language: objective-c
6+
# cache: cocoapods
7+
# podfile: Example/Podfile
8+
# before_install:
9+
# - gem install cocoapods # Since Travis is not always on latest version
10+
# - pod install --project-directory=Example
11+
install:
12+
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
13+
script:
14+
- set -o pipefail && xcodebuild test -workspace Example/MWPhotoBrowser.xcworkspace -scheme MWPhotoBrowser-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
15+
- pod lib lint --quick

‎Demo/[email protected]

-18.2 KB
Binary file not shown.

‎Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj

-481
This file was deleted.

‎Demo/PhotoBrowserDemo/PhotoBrowserDemo-Prefix.pch

-14
This file was deleted.

‎Demo/PhotoBrowserDemo/en.lproj/Localizable.strings

-2.29 KB
Binary file not shown.

‎Demo/PhotoBrowserDemo/main.m

-17
This file was deleted.

‎Example/MWPhotoBrowser.xcodeproj/project.pbxproj

+648
Large diffs are not rendered by default.

‎MWPhotoBrowser/MWPhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata ‎Example/MWPhotoBrowser.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎Example/MWPhotoBrowser.xcodeproj/xcshareddata/xcschemes/MWPhotoBrowser-Example.xcscheme

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0600"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "6003F589195388D20070C39A"
18+
BuildableName = "MWPhotoBrowser_Example.app"
19+
BlueprintName = "MWPhotoBrowser_Example"
20+
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "6003F5AD195388D20070C39A"
36+
BuildableName = "MWPhotoBrowser_Tests.xctest"
37+
BlueprintName = "MWPhotoBrowser_Tests"
38+
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "6003F589195388D20070C39A"
46+
BuildableName = "MWPhotoBrowser_Example.app"
47+
BlueprintName = "MWPhotoBrowser_Example"
48+
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
</TestAction>
52+
<LaunchAction
53+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
54+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
55+
launchStyle = "0"
56+
useCustomWorkingDirectory = "NO"
57+
buildConfiguration = "Debug"
58+
ignoresPersistentStateOnLaunch = "NO"
59+
debugDocumentVersioning = "YES"
60+
allowLocationSimulation = "YES">
61+
<BuildableProductRunnable
62+
runnableDebuggingMode = "0">
63+
<BuildableReference
64+
BuildableIdentifier = "primary"
65+
BlueprintIdentifier = "6003F589195388D20070C39A"
66+
BuildableName = "MWPhotoBrowser_Example.app"
67+
BlueprintName = "MWPhotoBrowser_Example"
68+
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
69+
</BuildableReference>
70+
</BuildableProductRunnable>
71+
<AdditionalOptions>
72+
</AdditionalOptions>
73+
</LaunchAction>
74+
<ProfileAction
75+
shouldUseLaunchSchemeArgsEnv = "YES"
76+
savedToolIdentifier = ""
77+
useCustomWorkingDirectory = "NO"
78+
buildConfiguration = "Release"
79+
debugDocumentVersioning = "YES">
80+
<BuildableProductRunnable
81+
runnableDebuggingMode = "0">
82+
<BuildableReference
83+
BuildableIdentifier = "primary"
84+
BlueprintIdentifier = "6003F589195388D20070C39A"
85+
BuildableName = "MWPhotoBrowser_Example.app"
86+
BlueprintName = "MWPhotoBrowser_Example"
87+
ReferencedContainer = "container:MWPhotoBrowser.xcodeproj">
88+
</BuildableReference>
89+
</BuildableProductRunnable>
90+
</ProfileAction>
91+
<AnalyzeAction
92+
buildConfiguration = "Debug">
93+
</AnalyzeAction>
94+
<ArchiveAction
95+
buildConfiguration = "Release"
96+
revealArchiveInOrganizer = "YES">
97+
</ArchiveAction>
98+
</Scheme>

‎MWPhotoBrowser.xcworkspace/contents.xcworkspacedata ‎Example/MWPhotoBrowser.xcworkspace/contents.xcworkspacedata

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/PhotoBrowserDemo/AppDelegate.h ‎Example/MWPhotoBrowser/AppDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
@property (strong, nonatomic) UIWindow *window;
1414

15-
@property (strong, nonatomic) UIViewController *viewController;
15+
//@property (strong, nonatomic) UIViewController *viewController;
1616

1717
@end

‎Demo/PhotoBrowserDemo/AppDelegate.m ‎Example/MWPhotoBrowser/AppDelegate.m

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
//
88

99
#import "AppDelegate.h"
10-
#import "Menu.h"
10+
//#import "Menu.h"
1111

1212
@implementation AppDelegate
1313

1414
@synthesize window = _window;
15-
@synthesize viewController = _viewController;
15+
//@synthesize viewController = _viewController;
1616

1717

1818
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
1919
{
20-
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
21-
22-
Menu *menu = [[Menu alloc] initWithStyle:UITableViewStylePlain];
23-
self.viewController = (UIViewController *)[[UINavigationController alloc] initWithRootViewController:menu];
24-
self.window.rootViewController = self.viewController;
25-
[self.window makeKeyAndVisible];
20+
// self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
21+
//
22+
// Menu *menu = [[Menu alloc] initWithStyle:UITableViewStylePlain];
23+
// self.viewController = (UIViewController *)[[UINavigationController alloc] initWithRootViewController:menu];
24+
// self.window.rootViewController = self.viewController;
25+
// [self.window makeKeyAndVisible];
2626
return YES;
2727
}
2828

‎Example/MWPhotoBrowser/Images.xcassets/AppIcon.appiconset/Contents.json

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "29x29",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "40x40",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "iphone",
15+
"size" : "60x60",
16+
"scale" : "2x"
17+
},
18+
{
19+
"idiom" : "iphone",
20+
"size" : "60x60",
21+
"scale" : "3x"
22+
},
23+
{
24+
"idiom" : "ipad",
25+
"size" : "29x29",
26+
"scale" : "1x"
27+
},
28+
{
29+
"idiom" : "ipad",
30+
"size" : "29x29",
31+
"scale" : "2x"
32+
},
33+
{
34+
"idiom" : "ipad",
35+
"size" : "40x40",
36+
"scale" : "1x"
37+
},
38+
{
39+
"idiom" : "ipad",
40+
"size" : "40x40",
41+
"scale" : "2x"
42+
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "76x76",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "76x76",
51+
"scale" : "2x"
52+
}
53+
],
54+
"info" : {
55+
"version" : 1,
56+
"author" : "xcode"
57+
}
58+
}

‎Example/MWPhotoBrowser/Images.xcassets/LaunchImage.launchimage/Contents.json

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"images" : [
3+
{
4+
"orientation" : "portrait",
5+
"idiom" : "iphone",
6+
"extent" : "full-screen",
7+
"minimum-system-version" : "7.0",
8+
"scale" : "2x"
9+
},
10+
{
11+
"orientation" : "portrait",
12+
"idiom" : "iphone",
13+
"subtype" : "retina4",
14+
"extent" : "full-screen",
15+
"minimum-system-version" : "7.0",
16+
"scale" : "2x"
17+
},
18+
{
19+
"orientation" : "portrait",
20+
"idiom" : "ipad",
21+
"extent" : "full-screen",
22+
"minimum-system-version" : "7.0",
23+
"scale" : "1x"
24+
},
25+
{
26+
"orientation" : "landscape",
27+
"idiom" : "ipad",
28+
"extent" : "full-screen",
29+
"minimum-system-version" : "7.0",
30+
"scale" : "1x"
31+
},
32+
{
33+
"orientation" : "portrait",
34+
"idiom" : "ipad",
35+
"extent" : "full-screen",
36+
"minimum-system-version" : "7.0",
37+
"scale" : "2x"
38+
},
39+
{
40+
"orientation" : "landscape",
41+
"idiom" : "ipad",
42+
"extent" : "full-screen",
43+
"minimum-system-version" : "7.0",
44+
"scale" : "2x"
45+
}
46+
],
47+
"info" : {
48+
"version" : 1,
49+
"author" : "xcode"
50+
}
51+
}

0 commit comments

Comments
 (0)