moving example project to main xcworkspace

shimastripe · Nov 3, 2016 · d5790cf · d5790cf
1 parent c6236fa
commit d5790cf
Show file tree

Hide file tree

Showing 75 changed files with 1,568 additions and 1,727 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,5 +9,5 @@ language: objective-c
 # - gem install cocoapods # Since Travis is not always on latest version
 # - pod install --project-directory=Example
 script:
-- set -o pipefail && xcodebuild test -workspace Example/SideMenu.xcworkspace -scheme SideMenu-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
+- set -o pipefail && xcodebuild test -workspace SideMenu.xcworkspace -scheme Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
 - pod lib lint
diff --git a/Example/SideMenu/AppDelegate.swift → Example/AppDelegate.swift b/Example/SideMenu/AppDelegate.swift → Example/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...le/SideMenu/Assets.xcassets/Contents.json → Example/Assets.xcassets/Contents.json b/...le/SideMenu/Assets.xcassets/Contents.json → Example/Assets.xcassets/Contents.json
diff --git a/...cassets/background.imageset/Contents.json → ...cassets/background.imageset/Contents.json b/...cassets/background.imageset/Contents.json → ...cassets/background.imageset/Contents.json
diff --git a/...ts.xcassets/background.imageset/stars.png → ...ts.xcassets/background.imageset/stars.png b/...ts.xcassets/background.imageset/stars.png → ...ts.xcassets/background.imageset/stars.png
diff --git a/...ts.xcassets/saturn.imageset/Contents.json → ...ts.xcassets/saturn.imageset/Contents.json b/...ts.xcassets/saturn.imageset/Contents.json → ...ts.xcassets/saturn.imageset/Contents.json
diff --git a/...ssets.xcassets/saturn.imageset/saturn.png → ...ssets.xcassets/saturn.imageset/saturn.png b/...ssets.xcassets/saturn.imageset/saturn.png → ...ssets.xcassets/saturn.imageset/saturn.png
diff --git a/Example/SideMenu/Base.lproj/LaunchScreen.xib → Example/Base.lproj/LaunchScreen.xib b/Example/SideMenu/Base.lproj/LaunchScreen.xib → Example/Base.lproj/LaunchScreen.xib
diff --git a/Example/SideMenu/Info.plist → Example/Info.plist b/Example/SideMenu/Info.plist → Example/Info.plist
@@ -22,8 +22,6 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

diff --git a/Example/SideMenu/Main.storyboard → Example/Main.storyboard b/Example/SideMenu/Main.storyboard → Example/Main.storyboard
diff --git a/Example/SideMenu/MainViewController.swift → Example/MainViewController.swift b/Example/SideMenu/MainViewController.swift → Example/MainViewController.swift
diff --git a/Example/Podfile b/Example/Podfile
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
diff --git a/Example/Pods/Local Podspecs/SideMenu.podspec.json b/Example/Pods/Local Podspecs/SideMenu.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Info.plist b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Info.plist
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-dummy.m b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-dummy.m
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-resources.sh b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-umbrella.h b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example-umbrella.h
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.modulemap b/Example/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.modulemap
diff --git a/...le/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.release.xcconfig b/...le/Pods/Target Support Files/Pods-SideMenu_Example/Pods-SideMenu_Example.release.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Info.plist b/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Info.plist
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-dummy.m b/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-dummy.m
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-umbrella.h b/Example/Pods/Target Support Files/Pods-SideMenu_Tests/Pods-SideMenu_Tests-umbrella.h