Make a bunch of stuff private that should be private

FLEXTool · Nov 19, 2021 · ffa658c · ffa658c
1 parent 6066de4
commit ffa658c
Show file tree

Hide file tree

Showing 36 changed files with 24 additions and 48 deletions.
diff --git a/Classes/FLEX-Core.h b/Classes/FLEX-Core.h
@@ -20,4 +20,3 @@
 #import <FLEXMultilineTableViewCell.h>
 #import <FLEXKeyValueTableViewCell.h>
 
-#import <FLEXScopeCarousel.h>
diff --git a/Classes/FLEX-ObjectExploring.h b/Classes/FLEX-ObjectExploring.h
@@ -12,15 +12,7 @@
 #import <FLEXObjectExplorer.h>
 
 #import <FLEXShortcut.h>
-#import <FLEXShortcutsFactory+Defaults.h>
 #import <FLEXShortcutsSection.h>
-#import <FLEXBlockShortcuts.h>
-#import <FLEXBundleShortcuts.h>
-#import <FLEXClassShortcuts.h>
-#import <FLEXImageShortcuts.h>
-#import <FLEXLayerShortcuts.h>
-#import <FLEXViewControllerShortcuts.h>
-#import <FLEXViewShortcuts.h>
 
 #import <FLEXCollectionContentSection.h>
 #import <FLEXColorPreviewSection.h>

diff --git a/Classes/Headers/FLEXArgumentInputColorView.h b/Classes/Headers/FLEXArgumentInputColorView.h
diff --git a/Classes/Headers/FLEXArgumentInputDateView.h b/Classes/Headers/FLEXArgumentInputDateView.h
diff --git a/Classes/Headers/FLEXArgumentInputFontView.h b/Classes/Headers/FLEXArgumentInputFontView.h
diff --git a/Classes/Headers/FLEXArgumentInputFontsPickerView.h b/Classes/Headers/FLEXArgumentInputFontsPickerView.h
diff --git a/Classes/Headers/FLEXArgumentInputNotSupportedView.h b/Classes/Headers/FLEXArgumentInputNotSupportedView.h
diff --git a/Classes/Headers/FLEXArgumentInputNumberView.h b/Classes/Headers/FLEXArgumentInputNumberView.h
diff --git a/Classes/Headers/FLEXArgumentInputObjectView.h b/Classes/Headers/FLEXArgumentInputObjectView.h
diff --git a/Classes/Headers/FLEXArgumentInputStringView.h b/Classes/Headers/FLEXArgumentInputStringView.h
diff --git a/Classes/Headers/FLEXArgumentInputStructView.h b/Classes/Headers/FLEXArgumentInputStructView.h
diff --git a/Classes/Headers/FLEXArgumentInputSwitchView.h b/Classes/Headers/FLEXArgumentInputSwitchView.h
diff --git a/Classes/Headers/FLEXArgumentInputTextView.h b/Classes/Headers/FLEXArgumentInputTextView.h
diff --git a/Classes/Headers/FLEXArgumentInputView.h b/Classes/Headers/FLEXArgumentInputView.h
diff --git a/Classes/Headers/FLEXArgumentInputViewFactory.h b/Classes/Headers/FLEXArgumentInputViewFactory.h
diff --git a/Classes/Headers/FLEXBlockShortcuts.h b/Classes/Headers/FLEXBlockShortcuts.h
diff --git a/Classes/Headers/FLEXBundleShortcuts.h b/Classes/Headers/FLEXBundleShortcuts.h
diff --git a/Classes/Headers/FLEXCarouselCell.h b/Classes/Headers/FLEXCarouselCell.h
diff --git a/Classes/Headers/FLEXClassShortcuts.h b/Classes/Headers/FLEXClassShortcuts.h
diff --git a/Classes/Headers/FLEXDefaultEditorViewController.h b/Classes/Headers/FLEXDefaultEditorViewController.h
diff --git a/Classes/Headers/FLEXFieldEditorView.h b/Classes/Headers/FLEXFieldEditorView.h
diff --git a/Classes/Headers/FLEXFieldEditorViewController.h b/Classes/Headers/FLEXFieldEditorViewController.h
diff --git a/Classes/Headers/FLEXImageShortcuts.h b/Classes/Headers/FLEXImageShortcuts.h
diff --git a/Classes/Headers/FLEXLayerShortcuts.h b/Classes/Headers/FLEXLayerShortcuts.h
diff --git a/Classes/Headers/FLEXMethodCallingViewController.h b/Classes/Headers/FLEXMethodCallingViewController.h
diff --git a/Classes/Headers/FLEXNSDataShortcuts.h b/Classes/Headers/FLEXNSDataShortcuts.h
diff --git a/Classes/Headers/FLEXNSStringShortcuts.h b/Classes/Headers/FLEXNSStringShortcuts.h
diff --git a/Classes/Headers/FLEXScopeCarousel.h b/Classes/Headers/FLEXScopeCarousel.h
diff --git a/Classes/Headers/FLEXShortcutsFactory+Defaults.h b/Classes/Headers/FLEXShortcutsFactory+Defaults.h
diff --git a/Classes/Headers/FLEXUIAppShortcuts.h b/Classes/Headers/FLEXUIAppShortcuts.h
diff --git a/Classes/Headers/FLEXVariableEditorViewController.h b/Classes/Headers/FLEXVariableEditorViewController.h
diff --git a/Classes/Headers/FLEXViewControllerShortcuts.h b/Classes/Headers/FLEXViewControllerShortcuts.h
diff --git a/Classes/Headers/FLEXViewShortcuts.h b/Classes/Headers/FLEXViewShortcuts.h
diff --git 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
@@ -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
@@ -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