From e7a193c631876385df195471f1f8a1be2302a20b Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 12:58:24 +0300 Subject: [PATCH 01/22] update badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e1987016..b881e00ba 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Version](http://img.shields.io/cocoapods/v/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0) +[![Build Status](https://travis-ci.org/skywinder/ActionSheetPicker-3.0.svg?branch=master)](https://travis-ci.org/skywinder/ActionSheetPicker-3.0) [![License](https://img.shields.io/cocoapods/l/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0) [![Platform](https://img.shields.io/cocoapods/p/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0) [![Issues](http://img.shields.io/github/issues/skywinder/ActionSheetPicker-3.0.svg)](https://github.com/skywinder/ActionSheetPicker-3.0/issues?state=open) From bec52f8fdaefd1a2e188e31dcbbe8b3da55b0d1b Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:04:03 +0300 Subject: [PATCH 02/22] rename scheme --- ...SheetPicker Tests.xcscheme => ActionSheetPickerTests.xcscheme} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/{ActionSheetPicker Tests.xcscheme => ActionSheetPickerTests.xcscheme} (100%) diff --git a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker Tests.xcscheme b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme similarity index 100% rename from ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker Tests.xcscheme rename to ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme From f9cb349d8ed52927882734e85d8dad4ca3e0cd44 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:04:39 +0300 Subject: [PATCH 03/22] add tests scheme --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b8f912e6..a56a213e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ language: objective-c -# script: xcodebuild -workspace ActionSheetPicker.xcworkspace -scheme ActionSheetPicker -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO \ No newline at end of file +xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder +xcode_scheme: ActionSheetPickerTests \ No newline at end of file From 8f6aafbe1ebce4978e2bff48565ee87e6852f7cf Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:16:04 +0300 Subject: [PATCH 04/22] rename tests --- ActionSheetPicker.xcodeproj/project.pbxproj | 10 ++++---- .../xcschemes/ActionSheetPicker.xcscheme | 4 +-- .../xcschemes/ActionSheetPickerTests.xcscheme | 25 ++++++------------- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/project.pbxproj b/ActionSheetPicker.xcodeproj/project.pbxproj index 4cfea9ce6..a33eff513 100755 --- a/ActionSheetPicker.xcodeproj/project.pbxproj +++ b/ActionSheetPicker.xcodeproj/project.pbxproj @@ -279,9 +279,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1C9444B4197B1C2F005F495B /* ActionSheetPicker Tests */ = { + 1C9444B4197B1C2F005F495B /* ActionSheetPickerTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 1C9444C7197B1C2F005F495B /* Build configuration list for PBXNativeTarget "ActionSheetPicker Tests" */; + buildConfigurationList = 1C9444C7197B1C2F005F495B /* Build configuration list for PBXNativeTarget "ActionSheetPickerTests" */; buildPhases = ( 1C9444B1197B1C2F005F495B /* Sources */, 1C9444B2197B1C2F005F495B /* Frameworks */, @@ -292,7 +292,7 @@ dependencies = ( 1C9444C4197B1C2F005F495B /* PBXTargetDependency */, ); - name = "ActionSheetPicker Tests"; + name = ActionSheetPickerTests; productName = "ActionSheetPicker Tests"; productReference = 1C9444B5197B1C2F005F495B /* ActionSheetPicker Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -344,7 +344,7 @@ projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* ActionSheetPicker */, - 1C9444B4197B1C2F005F495B /* ActionSheetPicker Tests */, + 1C9444B4197B1C2F005F495B /* ActionSheetPickerTests */, ); }; /* End PBXProject section */ @@ -596,7 +596,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1C9444C7197B1C2F005F495B /* Build configuration list for PBXNativeTarget "ActionSheetPicker Tests" */ = { + 1C9444C7197B1C2F005F495B /* Build configuration list for PBXNativeTarget "ActionSheetPickerTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 1C9444C5197B1C2F005F495B /* Debug */, diff --git a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker.xcscheme b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker.xcscheme index a0436f4fd..f013c2128 100644 --- a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker.xcscheme +++ b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPicker.xcscheme @@ -33,8 +33,8 @@ diff --git a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme index c0ce009a3..0d9edfcce 100644 --- a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme +++ b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme @@ -15,8 +15,8 @@ @@ -33,8 +33,8 @@ @@ -43,8 +43,8 @@ @@ -62,8 +62,8 @@ @@ -76,15 +76,6 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> - - - - From b5dfc871482add8145cc7e36b6f10f003f049f8f Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:34:36 +0300 Subject: [PATCH 05/22] add sdk key --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a56a213e7..6f84ef665 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: objective-c xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder -xcode_scheme: ActionSheetPickerTests \ No newline at end of file +xcode_scheme: ActionSheetPickerTests +xcode_sdk: iphonesimulator \ No newline at end of file From d060743ec853b1c70fb3cceb996d29cc49b269af Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:40:44 +0300 Subject: [PATCH 06/22] remove margins --- Storyboard.storyboard | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Storyboard.storyboard b/Storyboard.storyboard index df2b7b78c..302201556 100644 --- a/Storyboard.storyboard +++ b/Storyboard.storyboard @@ -2,7 +2,6 @@ - @@ -252,11 +251,11 @@ - + - + From 00ab9f9743277b6d03d615d56f9852265d1f5c20 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:45:59 +0300 Subject: [PATCH 07/22] update constraints --- Storyboard.storyboard | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Storyboard.storyboard b/Storyboard.storyboard index 302201556..97a7e90a1 100644 --- a/Storyboard.storyboard +++ b/Storyboard.storyboard @@ -251,11 +251,11 @@ - + - + From 4f08113941709aff4e73cb8c98b65b67984dcb1f Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:47:07 +0300 Subject: [PATCH 08/22] cleanup --- Example/Classes/TestTableViewController.m | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Example/Classes/TestTableViewController.m b/Example/Classes/TestTableViewController.m index b3796579d..4f46b6245 100644 --- a/Example/Classes/TestTableViewController.m +++ b/Example/Classes/TestTableViewController.m @@ -36,19 +36,19 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath { UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; UILabel * sender = cell.detailTextLabel; - ActionStringDoneBlock done = ^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) { - if ([sender respondsToSelector:@selector(setText:)]) { - [sender performSelector:@selector(setText:) withObject:selectedValue]; - } - }; - ActionStringCancelBlock cancel = ^(ActionSheetStringPicker *picker) { - NSLog(@"Block Picker Canceled"); - }; - NSArray *colors = @[@"Red", @"Green", @"Blue", @"Orange"]; +// ActionStringDoneBlock done = ^(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue) { +// if ([sender respondsToSelector:@selector(setText:)]) { +// [sender performSelector:@selector(setText:) withObject:selectedValue]; +// } +// }; +// ActionStringCancelBlock cancel = ^(ActionSheetStringPicker *picker) { +// NSLog(@"Block Picker Canceled"); +// }; +// NSArray *colors = @[@"Red", @"Green", @"Blue", @"Orange"]; +// [ActionSheetStringPicker showPickerWithTitle:@"Select a Block" rows:colors initialSelection:0 doneBlock:done cancelBlock:cancel origin:sender]; ActionSheetDatePicker *datePicker = [[ActionSheetDatePicker alloc] initWithTitle:@"Select a time" datePickerMode:UIDatePickerModeTime selectedDate:[NSDate date] target:self action:@selector(timeWasSelected:element:) origin:sender]; datePicker.minuteInterval = 5; [datePicker showActionSheetPicker]; -// [ActionSheetStringPicker showPickerWithTitle:@"Select a Block" rows:colors initialSelection:0 doneBlock:done cancelBlock:cancel origin:sender]; } -(void)timeWasSelected:(NSDate *)selectedTime element:(id)element { From 0861e2c0625043463af89c3935fc2ce56d06fe73 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:52:23 +0300 Subject: [PATCH 09/22] add backward compatability with xcode 5 --- Pickers/AbstractActionSheetPicker.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Pickers/AbstractActionSheetPicker.m b/Pickers/AbstractActionSheetPicker.m index 0ab4f14c4..fe9d0eabc 100755 --- a/Pickers/AbstractActionSheetPicker.m +++ b/Pickers/AbstractActionSheetPicker.m @@ -391,6 +391,7 @@ - (CGSize)viewSize return CGSizeMake(320, 320); } + #if defined(__IPHONE_8_0) if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_7_1) { //iOS 7.1 or earlier if ( [self isViewPortrait] ) @@ -401,6 +402,11 @@ - (CGSize)viewSize //iOS 8 or later return [[UIScreen mainScreen] bounds].size; } + #elif + if ( [self isViewPortrait] ) + return CGSizeMake(320 , IS_WIDESCREEN ? 568 : 480); + return CGSizeMake(IS_WIDESCREEN ? 568 : 480, 320); + #endif } - (BOOL)isViewPortrait From f8e6a35f2232edccb5a5d97e8702ee33f9ba738d Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 13:56:21 +0300 Subject: [PATCH 10/22] fix tpo --- ActionSheetPicker.xcodeproj/project.pbxproj | 6 +++--- Pickers/AbstractActionSheetPicker.m | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/project.pbxproj b/ActionSheetPicker.xcodeproj/project.pbxproj index a33eff513..dff976282 100755 --- a/ActionSheetPicker.xcodeproj/project.pbxproj +++ b/ActionSheetPicker.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ 1C6EE732192BB4F600A27994 /* DistancePickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DistancePickerView.m; sourceTree = ""; }; 1C7A57A8199DEDD5007B9B70 /* cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cancel.png; sourceTree = ""; }; 1C7A57AB199DF30B007B9B70 /* ok.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ok.png; sourceTree = ""; }; - 1C9444B5197B1C2F005F495B /* ActionSheetPicker Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ActionSheetPicker Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1C9444B5197B1C2F005F495B /* ActionSheetPickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ActionSheetPickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1C9444B6197B1C2F005F495B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 1C9444BC197B1C2F005F495B /* ActionSheetPicker Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ActionSheetPicker Tests-Info.plist"; sourceTree = ""; }; 1C9444BE197B1C2F005F495B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -237,7 +237,7 @@ isa = PBXGroup; children = ( 1CD15A2F192C7A0A00B28881 /* ActionSheetPicker.app */, - 1C9444B5197B1C2F005F495B /* ActionSheetPicker Tests.xctest */, + 1C9444B5197B1C2F005F495B /* ActionSheetPickerTests.xctest */, ); name = Products; sourceTree = ""; @@ -294,7 +294,7 @@ ); name = ActionSheetPickerTests; productName = "ActionSheetPicker Tests"; - productReference = 1C9444B5197B1C2F005F495B /* ActionSheetPicker Tests.xctest */; + productReference = 1C9444B5197B1C2F005F495B /* ActionSheetPickerTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; 1D6058900D05DD3D006BFB54 /* ActionSheetPicker */ = { diff --git a/Pickers/AbstractActionSheetPicker.m b/Pickers/AbstractActionSheetPicker.m index fe9d0eabc..923773bdc 100755 --- a/Pickers/AbstractActionSheetPicker.m +++ b/Pickers/AbstractActionSheetPicker.m @@ -402,7 +402,7 @@ - (CGSize)viewSize //iOS 8 or later return [[UIScreen mainScreen] bounds].size; } - #elif + #else if ( [self isViewPortrait] ) return CGSizeMake(320 , IS_WIDESCREEN ? 568 : 480); return CGSizeMake(IS_WIDESCREEN ? 568 : 480, 320); From e0ddb79207eeeaa372a50be887683f4c6ff48e6c Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:06:03 +0300 Subject: [PATCH 11/22] update scheme --- .../xcschemes/ActionSheetPickerTests.xcscheme | 21 ++- Storyboard.storyboard | 124 ++++++------------ 2 files changed, 50 insertions(+), 95 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme index 0d9edfcce..a03ec42d1 100644 --- a/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme +++ b/ActionSheetPicker.xcodeproj/xcshareddata/xcschemes/ActionSheetPickerTests.xcscheme @@ -1,7 +1,7 @@ + version = "1.7"> @@ -37,14 +37,18 @@ BlueprintName = "ActionSheetPickerTests" ReferencedContainer = "container:ActionSheetPicker.xcodeproj"> + + @@ -58,15 +62,6 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> - - - - diff --git a/Storyboard.storyboard b/Storyboard.storyboard index 97a7e90a1..a46e0e579 100644 --- a/Storyboard.storyboard +++ b/Storyboard.storyboard @@ -1,10 +1,11 @@ - + - + + - + @@ -13,13 +14,13 @@ - + - - + + - + @@ -28,7 +29,7 @@ - + @@ -37,7 +38,7 @@ - + @@ -46,7 +47,7 @@ - + @@ -58,7 +59,7 @@ - + @@ -67,7 +68,7 @@ - + @@ -76,7 +77,7 @@ - + @@ -85,7 +86,7 @@ - @@ -167,9 +157,7 @@ - - - + @@ -177,19 +165,13 @@ - - - - - - + + - - - + @@ -205,14 +187,10 @@ - - - + - - - + @@ -220,9 +198,7 @@ - - - + @@ -234,17 +210,6 @@ - - - - - - - - - - - @@ -260,16 +225,6 @@ - - - - - - - - - - @@ -293,7 +248,7 @@ - + @@ -341,11 +296,11 @@ - + - + @@ -355,19 +310,19 @@ - + @@ -376,13 +331,13 @@ - + - + @@ -448,4 +403,9 @@ + + + + + From 33fba8f6de6436d4a608d0d3ea9eb54011e44520 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:10:10 +0300 Subject: [PATCH 12/22] update yml --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f84ef665..d4e67521d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: objective-c -xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder -xcode_scheme: ActionSheetPickerTests -xcode_sdk: iphonesimulator \ No newline at end of file +# xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder +# xcode_scheme: ActionSheetPickerTests +# xcode_sdk: iphonesimulator +script: + - xctool -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator + - xctool test -workspace TravisExample.xcworkspace -scheme TravisExampleTests -sdk iphonesimulator \ No newline at end of file From 4f199918e87f30d4d8da2ef2141142665bad86fe Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:21:36 +0300 Subject: [PATCH 13/22] change deployment target --- ActionSheetPicker.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/project.pbxproj b/ActionSheetPicker.xcodeproj/project.pbxproj index dff976282..655f7ccda 100755 --- a/ActionSheetPicker.xcodeproj/project.pbxproj +++ b/ActionSheetPicker.xcodeproj/project.pbxproj @@ -574,7 +574,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -587,7 +587,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; From 22aef9e6dff628e16c5c4c36e1f0c5138d30bf07 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:25:07 +0300 Subject: [PATCH 14/22] fix yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d4e67521d..68b27a68c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: objective-c # xcode_sdk: iphonesimulator script: - xctool -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator - - xctool test -workspace TravisExample.xcworkspace -scheme TravisExampleTests -sdk iphonesimulator \ No newline at end of file + - xctool test -workspace ActionSheetPicker.xcworkspace -scheme ActionSheetPickerTests -sdk iphonesimulator \ No newline at end of file From 7712ed52ee20f8aa7872184031cfd4e1f330124c Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:27:46 +0300 Subject: [PATCH 15/22] typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68b27a68c..1f1e76e62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: objective-c # xcode_sdk: iphonesimulator script: - xctool -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator - - xctool test -workspace ActionSheetPicker.xcworkspace -scheme ActionSheetPickerTests -sdk iphonesimulator \ No newline at end of file + - xctool test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPickerTests -sdk iphonesimulator \ No newline at end of file From 9b8dd2851842e9df5433c725f331fee667ff8dab Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:33:18 +0300 Subject: [PATCH 16/22] update deployment target to 7.1 --- ActionSheetPicker.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/project.pbxproj b/ActionSheetPicker.xcodeproj/project.pbxproj index 655f7ccda..2ea8b17e6 100755 --- a/ActionSheetPicker.xcodeproj/project.pbxproj +++ b/ActionSheetPicker.xcodeproj/project.pbxproj @@ -574,7 +574,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -587,7 +587,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; From c862281e5f102a17dc460082da8476929c6f5cb9 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 14:35:42 +0300 Subject: [PATCH 17/22] update yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1f1e76e62..0438cafce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: objective-c # xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder # xcode_scheme: ActionSheetPickerTests # xcode_sdk: iphonesimulator +before_install: + - brew update + - brew upgrade xctool + script: - xctool -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator - xctool test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPickerTests -sdk iphonesimulator \ No newline at end of file From c51154059ff48d98f8df554438adf00178db84d2 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 15:18:37 +0300 Subject: [PATCH 18/22] update yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0438cafce..a9385e288 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,6 @@ language: objective-c # xcode_project: ActionSheetPicker.xcodeproj # path to your xcodeproj folder # xcode_scheme: ActionSheetPickerTests # xcode_sdk: iphonesimulator -before_install: - - brew update - - brew upgrade xctool script: - - xctool -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator - - xctool test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPickerTests -sdk iphonesimulator \ No newline at end of file + - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator \ No newline at end of file From cbb76873797fbc3368847c5a3521e8bc5dce5081 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 15:33:42 +0300 Subject: [PATCH 19/22] update simulator to 7.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9385e288..9f478fb1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: objective-c # xcode_sdk: iphonesimulator script: - - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator \ No newline at end of file + - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator7.1 \ No newline at end of file From fd3896a318d7cbebb27bf2d6f730190c2ce29e01 Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 15:34:57 +0300 Subject: [PATCH 20/22] update accorsing http://codeslingers.co.uk/2014/05/20/travis-failing-to-build-xctest/ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f478fb1c..fa5f43b35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: objective-c # xcode_sdk: iphonesimulator script: - - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator7.1 \ No newline at end of file + - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch),OS=7.0' \ No newline at end of file From 8c9e44f60c88bb74d4367be5a4cd66e4703501fc Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 15:47:26 +0300 Subject: [PATCH 21/22] fx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa5f43b35..ac2cee29b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ language: objective-c # xcode_sdk: iphonesimulator script: - - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch),OS=7.0' \ No newline at end of file + - xctool clean build test -project ActionSheetPicker.xcodeproj -scheme ActionSheetPicker -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone Retina (4-inch),OS=7.1' \ No newline at end of file From e34f5dd0f9d335408fb713da81b284d08ce27c9c Mon Sep 17 00:00:00 2001 From: Petr Korolev Date: Thu, 18 Sep 2014 16:10:53 +0300 Subject: [PATCH 22/22] back to 6.1 support --- ActionSheetPicker.xcodeproj/project.pbxproj | 4 ++-- README.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ActionSheetPicker.xcodeproj/project.pbxproj b/ActionSheetPicker.xcodeproj/project.pbxproj index 2ea8b17e6..dff976282 100755 --- a/ActionSheetPicker.xcodeproj/project.pbxproj +++ b/ActionSheetPicker.xcodeproj/project.pbxproj @@ -574,7 +574,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -587,7 +587,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; diff --git a/README.md b/README.md index b881e00ba..f4728e792 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Version](http://img.shields.io/cocoapods/v/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0) [![Build Status](https://travis-ci.org/skywinder/ActionSheetPicker-3.0.svg?branch=master)](https://travis-ci.org/skywinder/ActionSheetPicker-3.0) [![License](https://img.shields.io/cocoapods/l/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0) [![Platform](https://img.shields.io/cocoapods/p/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0)