diff --git a/Classes/FLEX-Core.h b/Classes/FLEX-Core.h index f55a5cdab8..eef0c0cdba 100644 --- a/Classes/FLEX-Core.h +++ b/Classes/FLEX-Core.h @@ -20,4 +20,3 @@ #import #import -#import diff --git a/Classes/FLEX-ObjectExploring.h b/Classes/FLEX-ObjectExploring.h index 5fbe5486f4..3586a75066 100644 --- a/Classes/FLEX-ObjectExploring.h +++ b/Classes/FLEX-ObjectExploring.h @@ -12,15 +12,7 @@ #import #import -#import #import -#import -#import -#import -#import -#import -#import -#import #import #import diff --git a/Classes/Headers/FLEXArgumentInputColorView.h b/Classes/Headers/FLEXArgumentInputColorView.h deleted file mode 120000 index 08e1d4e04c..0000000000 --- a/Classes/Headers/FLEXArgumentInputColorView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputDateView.h b/Classes/Headers/FLEXArgumentInputDateView.h deleted file mode 120000 index c11d736c64..0000000000 --- a/Classes/Headers/FLEXArgumentInputDateView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputFontView.h b/Classes/Headers/FLEXArgumentInputFontView.h deleted file mode 120000 index be394c0e0b..0000000000 --- a/Classes/Headers/FLEXArgumentInputFontView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputFontsPickerView.h b/Classes/Headers/FLEXArgumentInputFontsPickerView.h deleted file mode 120000 index 9c586fcc00..0000000000 --- a/Classes/Headers/FLEXArgumentInputFontsPickerView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputNotSupportedView.h b/Classes/Headers/FLEXArgumentInputNotSupportedView.h deleted file mode 120000 index 9960ec904d..0000000000 --- a/Classes/Headers/FLEXArgumentInputNotSupportedView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputNumberView.h b/Classes/Headers/FLEXArgumentInputNumberView.h deleted file mode 120000 index 362f7e374e..0000000000 --- a/Classes/Headers/FLEXArgumentInputNumberView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputObjectView.h b/Classes/Headers/FLEXArgumentInputObjectView.h deleted file mode 120000 index 2f219b3fce..0000000000 --- a/Classes/Headers/FLEXArgumentInputObjectView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputStringView.h b/Classes/Headers/FLEXArgumentInputStringView.h deleted file mode 120000 index da7c1e5487..0000000000 --- a/Classes/Headers/FLEXArgumentInputStringView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputStructView.h b/Classes/Headers/FLEXArgumentInputStructView.h deleted file mode 120000 index 263d016300..0000000000 --- a/Classes/Headers/FLEXArgumentInputStructView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputSwitchView.h b/Classes/Headers/FLEXArgumentInputSwitchView.h deleted file mode 120000 index bdc896335a..0000000000 --- a/Classes/Headers/FLEXArgumentInputSwitchView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputTextView.h b/Classes/Headers/FLEXArgumentInputTextView.h deleted file mode 120000 index 5c524e20a3..0000000000 --- a/Classes/Headers/FLEXArgumentInputTextView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputView.h b/Classes/Headers/FLEXArgumentInputView.h deleted file mode 120000 index 24473053f3..0000000000 --- a/Classes/Headers/FLEXArgumentInputView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXArgumentInputViewFactory.h b/Classes/Headers/FLEXArgumentInputViewFactory.h deleted file mode 120000 index ce10476381..0000000000 --- a/Classes/Headers/FLEXArgumentInputViewFactory.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXArgumentInputViewFactory.h \ No newline at end of file diff --git a/Classes/Headers/FLEXBlockShortcuts.h b/Classes/Headers/FLEXBlockShortcuts.h deleted file mode 120000 index 32d831621c..0000000000 --- a/Classes/Headers/FLEXBlockShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXBlockShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXBundleShortcuts.h b/Classes/Headers/FLEXBundleShortcuts.h deleted file mode 120000 index 2483bb0166..0000000000 --- a/Classes/Headers/FLEXBundleShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXBundleShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXCarouselCell.h b/Classes/Headers/FLEXCarouselCell.h deleted file mode 120000 index 052315c455..0000000000 --- a/Classes/Headers/FLEXCarouselCell.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Core/Views/Carousel/FLEXCarouselCell.h \ No newline at end of file diff --git a/Classes/Headers/FLEXClassShortcuts.h b/Classes/Headers/FLEXClassShortcuts.h deleted file mode 120000 index 0fe54a2d25..0000000000 --- a/Classes/Headers/FLEXClassShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXClassShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXDefaultEditorViewController.h b/Classes/Headers/FLEXDefaultEditorViewController.h deleted file mode 120000 index 7a21cdc1df..0000000000 --- a/Classes/Headers/FLEXDefaultEditorViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXDefaultEditorViewController.h \ No newline at end of file diff --git a/Classes/Headers/FLEXFieldEditorView.h b/Classes/Headers/FLEXFieldEditorView.h deleted file mode 120000 index eaa047b19a..0000000000 --- a/Classes/Headers/FLEXFieldEditorView.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXFieldEditorView.h \ No newline at end of file diff --git a/Classes/Headers/FLEXFieldEditorViewController.h b/Classes/Headers/FLEXFieldEditorViewController.h deleted file mode 120000 index f231e771e3..0000000000 --- a/Classes/Headers/FLEXFieldEditorViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXFieldEditorViewController.h \ No newline at end of file diff --git a/Classes/Headers/FLEXImageShortcuts.h b/Classes/Headers/FLEXImageShortcuts.h deleted file mode 120000 index e5e60b8062..0000000000 --- a/Classes/Headers/FLEXImageShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXImageShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXLayerShortcuts.h b/Classes/Headers/FLEXLayerShortcuts.h deleted file mode 120000 index 618a151666..0000000000 --- a/Classes/Headers/FLEXLayerShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXLayerShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXMethodCallingViewController.h b/Classes/Headers/FLEXMethodCallingViewController.h deleted file mode 120000 index 83eac78af6..0000000000 --- a/Classes/Headers/FLEXMethodCallingViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXMethodCallingViewController.h \ No newline at end of file diff --git a/Classes/Headers/FLEXNSDataShortcuts.h b/Classes/Headers/FLEXNSDataShortcuts.h deleted file mode 120000 index 0a32b7fd43..0000000000 --- a/Classes/Headers/FLEXNSDataShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSDataShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXNSStringShortcuts.h b/Classes/Headers/FLEXNSStringShortcuts.h deleted file mode 120000 index ea5b7260bf..0000000000 --- a/Classes/Headers/FLEXNSStringShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXNSStringShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXScopeCarousel.h b/Classes/Headers/FLEXScopeCarousel.h deleted file mode 120000 index eb772455f3..0000000000 --- a/Classes/Headers/FLEXScopeCarousel.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Core/Views/Carousel/FLEXScopeCarousel.h \ No newline at end of file diff --git a/Classes/Headers/FLEXShortcutsFactory+Defaults.h b/Classes/Headers/FLEXShortcutsFactory+Defaults.h deleted file mode 120000 index a1072ec87f..0000000000 --- a/Classes/Headers/FLEXShortcutsFactory+Defaults.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsFactory+Defaults.h \ No newline at end of file diff --git a/Classes/Headers/FLEXUIAppShortcuts.h b/Classes/Headers/FLEXUIAppShortcuts.h deleted file mode 120000 index 6b31343686..0000000000 --- a/Classes/Headers/FLEXUIAppShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXUIAppShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXVariableEditorViewController.h b/Classes/Headers/FLEXVariableEditorViewController.h deleted file mode 120000 index 0eb338dc93..0000000000 --- a/Classes/Headers/FLEXVariableEditorViewController.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/Editing/FLEXVariableEditorViewController.h \ No newline at end of file diff --git a/Classes/Headers/FLEXViewControllerShortcuts.h b/Classes/Headers/FLEXViewControllerShortcuts.h deleted file mode 120000 index 87b701a0b1..0000000000 --- a/Classes/Headers/FLEXViewControllerShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewControllerShortcuts.h \ No newline at end of file diff --git a/Classes/Headers/FLEXViewShortcuts.h b/Classes/Headers/FLEXViewShortcuts.h deleted file mode 120000 index 96024b7afb..0000000000 --- a/Classes/Headers/FLEXViewShortcuts.h +++ /dev/null @@ -1 +0,0 @@ -../../Classes/ObjectExplorers/Sections/Shortcuts/FLEXViewShortcuts.h \ No newline at end of file diff --git a/FLEX.podspec b/FLEX.podspec index fc75810bef..97e81d7ea3 100644 --- a/FLEX.podspec +++ b/FLEX.podspec @@ -38,10 +38,18 @@ Pod::Spec.new do |spec| spec.requires_arc = true spec.compiler_flags = "-Wno-unsupported-availability-guard" spec.public_header_files = [ "Classes/*.h", "Classes/Manager/*.h", "Classes/Toolbar/*.h", - "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h", - "Classes/Core/**/*.h", "Classes/Utility/Runtime/Objc/**/*.h", - "Classes/ObjectExplorers/**/*.h", "Classes/Editing/**/*.h", - "Classes/Utility/Categories/*.h", "Classes/Utility/FLEXAlert.h", + "Classes/Core/Controllers/*.h", "Classes/Core/Views/*.h", + "Classes/Core/Views/Cells/*.h", "Classes/Core/*.h", + "Classes/Utility/Categories/*.h", + "Classes/Utility/Runtime/Objc/**/*.h", + "Classes/ObjectExplorers/*.h", + "Classes/ObjectExplorers/Sections/*.h", + "Classes/Utility/FLEXMacros.h", - "Classes/Utility/FLEXResources.h" ] + "Classes/Utility/FLEXAlert.h", + "Classes/Utility/FLEXResources.h", + "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h", + "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.h", + "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h" + ] end diff --git a/Package.swift b/Package.swift index 7f3efdf19d..9e95236c32 100644 --- a/Package.swift +++ b/Package.swift @@ -47,6 +47,9 @@ extension Array where Element == CSetting { return [] } + /// These are the header search paths needed for FLEX to compile, not + /// the headers used by projects linking against FLEX. + /// /// Do not modify the contents of this property by hand; /// Instead, run `bash generate-spm-headers.sh | grep headerSearchPath | pbcopy` /// and paste (and indent) the result below. Do this any time new folders are added. diff --git a/generate-spm-headers.sh b/generate-spm-headers.sh index 40797690a9..d0b2732704 100755 --- a/generate-spm-headers.sh +++ b/generate-spm-headers.sh @@ -42,16 +42,21 @@ generate_headers "" # Top-level headers generate_headers "Manager" generate_headers "Toolbar" generate_headers "Utility/Categories" -generate_headers_recursive "Core" +generate_headers "Core" +generate_headers "Core/Controllers" +generate_headers "Core/Views" +generate_headers "Core/Views/Cells" +generate_headers "ObjectExplorers" +generate_headers "ObjectExplorers/Sections" generate_headers_recursive "Utility/Runtime/Objc" -generate_headers_recursive "ObjectExplorers" -generate_headers_recursive "Editing" # Include only headers in these specific folders, # such as those with subfolders that should not be linked makeheader "Classes/Utility/FLEXMacros.h" makeheader "Classes/Utility/FLEXAlert.h" makeheader "Classes/Utility/FLEXResources.h" +makeheader "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h" +makeheader "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.h" makeheader "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h" # Print all folders in Classes for use in Package.swift