Merge pull request #1 from skywinder/master

from-skywinder-fork
skywinder · Apr 18, 2015 · d25e4ce · d25e4ce
2 parents 4c83f91 + bd8325b
commit d25e4ce
Show file tree

Hide file tree

Showing 154 changed files with 7,858 additions and 1,301 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+Example Projects/Carthage-example/Carthage/Checkouts
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,12 @@ language: objective-c
     # - brew update
     # - brew install xctool
 script:
-    - xcodebuild clean build test -workspace Example.xcworkspace -scheme ActionSheetPickerTests -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
+    - xcodebuild clean build test -workspace ActionSheetPicker-3.0.xcworkspace -scheme ActionSheetPickerTests -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
 
-# - xctool -workspace Example.xcworkspace -scheme CoreActionSheetPicker build
-# - xctool -workspace Example.xcworkspace -scheme ActionSheetPickerTests test
+# - xctool -workspace ActionSheetPicker-3.0.xcworkspace -scheme CoreActionSheetPicker build
+# - xctool -workspace ActionSheetPicker-3.0.xcworkspace -scheme ActionSheetPickerTests test
 
-# xcode_workspace: Example.xcworkspace
+# xcode_workspace: ActionSheetPicker-3.0.xcworkspace
 # xcode_scheme: ActionSheetPickerTests
 # xcode_sdk: iphonesimulator
 
@@ -17,4 +17,4 @@ notifications:
     recipients:
       - [email protected]
     on_success: never # [always|never|change]
-    on_failure: change # [always|never|change]
+    on_failure: change # [always|never|change]
diff --git a/ActionSheetPicker-3.0.podspec b/ActionSheetPicker-3.0.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do | s |
     s.name = 'ActionSheetPicker-3.0'
-    s.version = '1.5.1'
+    s.version = '1.6.1'
     s.summary = 'Better version of ActionSheetPicker with support iOS7 and other improvements.'
     s.homepage = 'http://skywinder.github.io/ActionSheetPicker-3.0'
     s.license = 'BSD'

diff --git a/ActionSheetPicker-3.0.xcworkspace/contents.xcworkspacedata b/ActionSheetPicker-3.0.xcworkspace/contents.xcworkspacedata
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,41 @@
 # Change Log
 
+## [1.6.1](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.6.1) (2015-04-17)
+
+[Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.6.0...1.6.1)
+
+**Implemented enhancements:**
+
+- Carthage support [\#171](https://github.com/skywinder/ActionSheetPicker-3.0/issues/171)
+
+## [1.6.0](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.6.0) (2015-04-17)
+
+[Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.5.1...1.6.0)
+
+**Implemented enhancements:**
+
+- Integration ActionSheetPicker as dynamic framework [\#170](https://github.com/skywinder/ActionSheetPicker-3.0/issues/170)
+
+- Cancel Action unknow for `ActionSheetDistancePicker` [\#166](https://github.com/skywinder/ActionSheetPicker-3.0/issues/166)
+
+**Merged pull requests:**
+
+- iOS 5.1.1 compatibility added [\#164](https://github.com/skywinder/ActionSheetPicker-3.0/pull/164) ([kashifhisam](https://github.com/kashifhisam))
+
+- Added "tag" to AbstractActionSheet [\#159](https://github.com/skywinder/ActionSheetPicker-3.0/pull/159) ([Jeepston](https://github.com/Jeepston))
+
 ## [1.5.1](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.5.1) (2015-03-27)
 
 [Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.5.0...1.5.1)
 
-**Closed issues:**
+**Fixed bugs:**
 
 - iOS 8 - iPad - UISplitViewController issue. [\#157](https://github.com/skywinder/ActionSheetPicker-3.0/issues/157)
 
+**Closed issues:**
+
+- iOS 7.1 done button requires long press [\#167](https://github.com/skywinder/ActionSheetPicker-3.0/issues/167)
+
 ## [1.5.0](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.5.0) (2015-03-05)
 
 [Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.4.0...1.5.0)
@@ -24,6 +52,10 @@
 
 [Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.3.13...1.4.0)
 
+**Implemented enhancements:**
+
+- ActionSheetDistancePicker + Swift usage [\#139](https://github.com/skywinder/ActionSheetPicker-3.0/issues/139)
+
 **Merged pull requests:**
 
 - Add additional showPickerWithTitle method [\#143](https://github.com/skywinder/ActionSheetPicker-3.0/pull/143) ([martinpfannemueller](https://github.com/martinpfannemueller))

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker.xcodeproj/project.pbxproj b/CoreActionSheetPicker/CoreActionSheetPicker.xcodeproj/project.pbxproj
diff --git a/...nSheetPicker/CoreActionSheetPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...nSheetPicker/CoreActionSheetPicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...ker/CoreActionSheetPicker.xcodeproj/xcshareddata/xcschemes/CoreActionSheetPicker.xcscheme b/...ker/CoreActionSheetPicker.xcodeproj/xcshareddata/xcschemes/CoreActionSheetPicker.xcscheme
@@ -1,31 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "0630"
    version = "1.3">
-   <BuildAction>
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForRunning = "YES">
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "1CA8086D1A25CE49004252BA"
+               BlueprintIdentifier = "1CCA90421AE0EFB000368F5E"
                BuildableName = "CoreActionSheetPicker.framework"
                BlueprintName = "CoreActionSheetPicker"
                ReferencedContainer = "container:CoreActionSheetPicker.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1CCA904D1AE0EFB000368F5E"
+               BuildableName = "CoreActionSheetPickerTests.xctest"
+               BlueprintName = "CoreActionSheetPickerTests"
+               ReferencedContainer = "container:CoreActionSheetPicker.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 = "1CCA904D1AE0EFB000368F5E"
+               BuildableName = "CoreActionSheetPickerTests.xctest"
+               BlueprintName = "CoreActionSheetPickerTests"
+               ReferencedContainer = "container:CoreActionSheetPicker.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1CCA90421AE0EFB000368F5E"
+            BuildableName = "CoreActionSheetPicker.framework"
+            BlueprintName = "CoreActionSheetPicker"
+            ReferencedContainer = "container:CoreActionSheetPicker.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
    <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug">
-      <BuildableProductRunnable>
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
-            BuildableName = "ActionSheetPicker-iOS6-7.app"
-            BlueprintName = "ActionSheetPicker-iOS6-7"
-            ReferencedContainer = "container:../Example-for-iOS-7-and-6/ActionSheetPicker-iOS6-7.xcodeproj">
+            BlueprintIdentifier = "1CCA90421AE0EFB000368F5E"
+            BuildableName = "CoreActionSheetPicker.framework"
+            BlueprintName = "CoreActionSheetPicker"
+            ReferencedContainer = "container:CoreActionSheetPicker.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1CCA90421AE0EFB000368F5E"
+            BuildableName = "CoreActionSheetPicker.framework"
+            BlueprintName = "CoreActionSheetPicker"
+            ReferencedContainer = "container:CoreActionSheetPicker.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>
diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/CoreActionSheetPicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/CoreActionSheetPicker.h
@@ -2,8 +2,8 @@
 //  CoreActionSheetPicker.h
 //  CoreActionSheetPicker
 //
-//  Created by Petr Korolev on 26/11/14.
-//  Copyright (c) 2014 Petr Korolev. All rights reserved.
+//  Created by Petr Korolev on 17/04/15.
+//  Copyright (c) 2015 Petr Korolev. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -15,6 +15,8 @@ FOUNDATION_EXPORT double CoreActionSheetPickerVersionNumber;
 FOUNDATION_EXPORT const unsigned char CoreActionSheetPickerVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <CoreActionSheetPicker/PublicHeader.h>
+
+
 #import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
 #import <CoreActionSheetPicker/ActionSheetCustomPicker.h>
 #import <CoreActionSheetPicker/ActionSheetDatePicker.h>

diff --git a/CoreActionSheetPicker/CoreActionSheetPickerTests/CoreActionSheetPickerTests.m b/CoreActionSheetPicker/CoreActionSheetPickerTests/CoreActionSheetPickerTests.m
@@ -2,8 +2,8 @@
 //  CoreActionSheetPickerTests.m
 //  CoreActionSheetPickerTests
 //
-//  Created by Petr Korolev on 26/11/14.
-//  Copyright (c) 2014 Petr Korolev. All rights reserved.
+//  Created by Petr Korolev on 17/04/15.
+//  Copyright (c) 2015 Petr Korolev. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Example Projects/Carthage-example/Cartfile b/Example Projects/Carthage-example/Cartfile
@@ -0,0 +1 @@
+github "skywinder/ActionSheetPicker-3.0"
diff --git a/Example Projects/Carthage-example/Cartfile.resolved b/Example Projects/Carthage-example/Cartfile.resolved
@@ -0,0 +1 @@
+github "skywinder/ActionSheetPicker-3.0" "1.6.1"