Merge pull request #7 from tokorom/v1.0.0

V1.0.0
tokorom · Oct 3, 2015 · f5c2f09 · f5c2f09
2 parents 434ef98 + 6b9cb51
commit f5c2f09
Show file tree

Hide file tree

Showing 14 changed files with 272 additions and 220 deletions.
diff --git a/Example/ChildViewController.swift b/Example/ChildViewController.swift
@@ -5,6 +5,7 @@
 //
 
 import UIKit
+import SegueContext
 
 class ChildViewController: UIViewController {
 

diff --git a/Example/Info.plist b/Example/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.tokoro.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Example/SliderViewController.swift b/Example/SliderViewController.swift
@@ -5,6 +5,7 @@
 //
 
 import UIKit
+import SegueContext
 
 class SliderViewController: UIViewController {
 

diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -5,6 +5,7 @@
 //
 
 import UIKit
+import SegueContext
 
 class ViewController: UIViewController {
 

diff --git a/SegueContext.podspec b/SegueContext.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SegueContext"
-  s.version      = "0.2.0"
+  s.version      = "1.0.0"
   s.summary      = "You can pass the context to destination view controller easily"
   s.homepage     = "https://github.com/tokorom/SegueContext"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
 
-  s.source_files  = "Source"
+  s.source_files  = "SegueContext/Source"
 
    s.requires_arc = true
 end
diff --git a/SegueContext.xcodeproj/project.pbxproj b/SegueContext.xcodeproj/project.pbxproj
diff --git a/SegueContext.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/SegueContext.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,15 +38,18 @@
             ReferencedContainer = "container:SegueContext.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -62,10 +65,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

diff --git a/SegueContext.xcodeproj/xcshareddata/xcschemes/SegueContext.xcscheme b/SegueContext.xcodeproj/xcshareddata/xcschemes/SegueContext.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F30BD66A1BBF72DA00F8CF6C"
+               BuildableName = "SegueContext.framework"
+               BlueprintName = "SegueContext"
+               ReferencedContainer = "container:SegueContext.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F30BD66A1BBF72DA00F8CF6C"
+            BuildableName = "SegueContext.framework"
+            BlueprintName = "SegueContext"
+            ReferencedContainer = "container:SegueContext.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F30BD66A1BBF72DA00F8CF6C"
+            BuildableName = "SegueContext.framework"
+            BlueprintName = "SegueContext"
+            ReferencedContainer = "container:SegueContext.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SegueContextTests/Info.plist → SegueContext/Info.plist b/SegueContextTests/Info.plist → SegueContext/Info.plist
@@ -7,18 +7,20 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>me.tokoro.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>
diff --git a/SegueContext/SegueContext.h b/SegueContext/SegueContext.h
@@ -0,0 +1,19 @@
+//
+//  SegueContext.h
+//  SegueContext
+//
+//  Created by tokorom on 10/3/15.
+//  Copyright © 2015 tokoro. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for SegueContext.
+FOUNDATION_EXPORT double SegueContextVersionNumber;
+
+//! Project version string for SegueContext.
+FOUNDATION_EXPORT const unsigned char SegueContextVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <SegueContext/PublicHeader.h>
+
+
diff --git a/Source/SegueContext.swift → SegueContext/Source/SegueContext.swift b/Source/SegueContext.swift → SegueContext/Source/SegueContext.swift
@@ -241,11 +241,9 @@ extension UIViewController {
     }
 
     public func performSegueWithIdentifier(identifier: String, sender: AnyObject? = nil, context: Any?, callback: Any?) {
-#if !DISABLE_SWIZZLING
         objc_sync_enter(self.dynamicType)
 
         self.replacePrepareForSegueIfNeeded()
-#endif
 
         let customContext: Context
         if let context = context as? Context {
@@ -262,9 +260,7 @@ extension UIViewController {
 
         self.performSegueWithIdentifier(identifier, sender: sender)
 
-#if !DISABLE_SWIZZLING
         objc_sync_exit(self.dynamicType)
-#endif
     }
 
     public func presentViewControllerWithStoryboardName(storyboardName: String, identifier: String? = nil, bundle: NSBundle? = nil, animated: Bool = true, transitionStyle: UIModalTransitionStyle? = nil, context: Any? = nil, callback: Any? = nil) {
@@ -407,8 +403,6 @@ extension UIViewController {
 
 }
 
-#if !DISABLE_SWIZZLING
-
 // MARK: - Swizzling
 
 var swc_swizzled_already: UInt8 = 0
@@ -480,5 +474,3 @@ extension UIViewController {
     }
 
 }
-
-#endif
diff --git a/SegueContextTests/SegueContextTests.swift b/SegueContextTests/SegueContextTests.swift
diff --git a/Source/UIViewController+SegueContext.h b/Source/UIViewController+SegueContext.h
diff --git a/Source/UIViewController+SegueContext.m b/Source/UIViewController+SegueContext.m
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     //
     import UIKit
+    import SegueContext
     class ChildViewController: UIViewController {
@@ Expand Down @@