Fixes spm compatibility

Signed-off-by: Markus Mueller <mmlr@gmx.net>
futuretap · Oct 28, 2020 · f2ccb12 · f2ccb12
1 parent 8e60f2d
commit f2ccb12
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 30 deletions.
diff --git a/Configurations/Base/Common.xcconfig b/Configurations/Base/Common.xcconfig
@@ -99,7 +99,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
 CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES
 
 // Warns when a quoted include is used instead of a framework style include in a framework header.
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 
 // Warn about ranged-based for loops.
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES

diff --git a/Configurations/Base/Targets/StaticLibrary.xcconfig b/Configurations/Base/Targets/StaticLibrary.xcconfig
@@ -30,3 +30,5 @@ SKIP_INSTALL = YES
 // that have not been built with this setting enabled.
 APPLICATION_EXTENSION_API_ONLY = YES
 
+// Warns when a quoted include is used instead of a framework style include in a framework header.
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
diff --git a/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h b/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h
@@ -17,11 +17,7 @@
 #import <UIKit/UIKit.h>
 #import <MessageUI/MessageUI.h>
 
-#ifdef SWIFT_PACKAGE
 #import "IASKViewController.h"
-#else
-#import <InAppSettingsKit/IASKViewController.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
@@ -16,22 +16,21 @@
 
 
 #import "IASKAppSettingsViewController.h"
+#import "IASKSwitch.h"
+#import "IASKDatePicker.h"
+#import "IASKTextView.h"
 #import "IASKSettingsReader.h"
+#import "IASKMultipleValueSelection.h"
 #import "IASKSettingsStoreUserDefaults.h"
-#import "IASKSettingsStoreInMemory.h"
-#import "IASKPSSliderSpecifierViewCell.h"
-#import "IASKPSTextFieldSpecifierViewCell.h"
-#import "IASKSwitch.h"
-#import "IASKSlider.h"
 #import "IASKSpecifier.h"
-#import "IASKSpecifierValuesViewController.h"
+#import "IASKSlider.h"
+#import "IASKEmbeddedDatePickerViewCell.h"
+#import "IASKPSTextFieldSpecifierViewCell.h"
 #import "IASKTextField.h"
 #import "IASKTextViewCell.h"
-#import "IASKMultipleValueSelection.h"
-#import "IASKDatePicker.h"
-#import "IASKDatePickerViewCell.h"
-#import "IASKEmbeddedDatePickerViewCell.h"
-#import "IASKTextView.h"
+#import "IASKPSSliderSpecifierViewCell.h"
+#import "IASKSpecifierValuesViewController.h"
+#import "IASKSettingsStoreInMemory.h"
 
 #if !__has_feature(objc_arc)
 #error "IASK needs ARC"

diff --git a/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.h b/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.h
@@ -16,11 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifdef SWIFT_PACKAGE
 #import "IASKViewController.h"
-#else
-#import <InAppSettingsKit/IASKViewController.h>
-#endif
 
 @class IASKSpecifier;
 

diff --git a/InAppSettingsKit/Models/IASKSettingsStoreFile.h b/InAppSettingsKit/Models/IASKSettingsStoreFile.h
@@ -16,11 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef SWIFT_PACKAGE
 #import "IASKSettingsStore.h"
-#else
-#import <InAppSettingsKit/IASKSettingsStore.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.h b/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.h
@@ -16,11 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef SWIFT_PACKAGE
 #import "IASKSettingsStore.h"
-#else
-#import <InAppSettingsKit/IASKSettingsStore.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/InAppSettingsKitSampleApp/CustomSubviewController.m b/InAppSettingsKitSampleApp/CustomSubviewController.m
@@ -15,7 +15,7 @@
 //
 
 #import "CustomSubviewController.h"
-#import <InAppSettingsKit/InAppSettingsKit.h>
+#import "InAppSettingsKit/IASKSpecifier.h"
 
 @implementation CustomSubviewController
 

diff --git a/InAppSettingsKitSampleApp/IASKSampleAppStaticLibrary-Bridging-Header.h b/InAppSettingsKitSampleApp/IASKSampleAppStaticLibrary-Bridging-Header.h
@@ -2,5 +2,11 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import <InAppSettingsKit/InAppSettingsKit.h>
+//#import <InAppSettingsKit/InAppSettingsKit.h>
 #import "CustomViewCell.h"
+#import "InAppSettingsKit/IASKAppSettingsViewController.h"
+#import "InAppSettingsKit/IASKSpecifier.h"
+#import "InAppSettingsKit/IASKTextField.h"
+#import "InAppSettingsKit/IASKSettingsReader.h"
+#import "InAppSettingsKit/IASKViewController.h"
+#import "InAppSettingsKit/IASKSettingsStore.h"