Merge pull request #555 from Wei18/fix/import-issue-on-spm

skywinder · Jan 30, 2024 · 35815d9 · 35815d9
2 parents 729fb72 + bb582cb
commit 35815d9
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 30 deletions.
diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetCustomPicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetCustomPicker.h
@@ -6,13 +6,8 @@
 //  Copyright (c) 2012 Club 15CC. All rights reserved.
 //
 #import <UIKit/UIKit.h>
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
 #import <ActionSheetCustomPickerDelegate.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#import <CoreActionSheetPicker/ActionSheetCustomPickerDelegate.h>
-#endif
 
 @interface ActionSheetCustomPicker : AbstractActionSheetPicker
 {

diff --git a/...ActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetCustomPickerDelegate.h b/...ActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetCustomPickerDelegate.h
@@ -7,11 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#endif
 
 @protocol ActionSheetCustomPickerDelegate <UIPickerViewDelegate, UIPickerViewDataSource>
 

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetDatePicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetDatePicker.h
@@ -25,11 +25,7 @@
 //SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#endif
 
 @class ActionSheetDatePicker;
 

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetDistancePicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetDistancePicker.h
@@ -25,13 +25,8 @@
 //SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
 #import <DistancePickerView.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#import <CoreActionSheetPicker/DistancePickerView.h>
-#endif
 
 @interface ActionSheetDistancePicker : AbstractActionSheetPicker <UIPickerViewDelegate, UIPickerViewDataSource>
 

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetLocalePicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetLocalePicker.h
@@ -25,11 +25,7 @@
 //SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#endif
 
 @class ActionSheetLocalePicker;
 typedef void(^ActionLocaleDoneBlock)(ActionSheetLocalePicker *picker, NSTimeZone * selectedValue);

diff --git a/...ActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetMultipleStringPicker.h b/...ActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetMultipleStringPicker.h
@@ -28,11 +28,7 @@
 //SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#endif
 
 @class ActionSheetMultipleStringPicker;
 typedef void(^ActionMultipleStringDoneBlock)(ActionSheetMultipleStringPicker *picker, NSArray *selectedIndexes, id selectedValues);

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetStringPicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/ActionSheetStringPicker.h
@@ -25,11 +25,7 @@
 //SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if COCOAPODS
 #import <AbstractActionSheetPicker.h>
-#else
-#import <CoreActionSheetPicker/AbstractActionSheetPicker.h>
-#endif
 
 @class ActionSheetStringPicker;
 typedef void(^ActionStringDoneBlock)(ActionSheetStringPicker *picker, NSInteger selectedIndex, id selectedValue);

diff --git a/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/CoreActionSheetPicker.h b/CoreActionSheetPicker/CoreActionSheetPicker/Pickers/include/CoreActionSheetPicker.h
@@ -43,3 +43,4 @@ FOUNDATION_EXPORT const unsigned char CoreActionSheetPickerVersionString[];
 #import "ActionSheetLocalePicker.h"
 #import "ActionSheetStringPicker.h"
 #import "ActionSheetMultipleStringPicker.h"
+#import "SWActionSheet.h"