Skip to content

Commit ffa658c

Browse files
committed
Make a bunch of stuff private that should be private
1 parent 6066de4 commit ffa658c

36 files changed

+24
-48
lines changed

Classes/FLEX-Core.h

-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@
2020
#import <FLEXMultilineTableViewCell.h>
2121
#import <FLEXKeyValueTableViewCell.h>
2222

23-
#import <FLEXScopeCarousel.h>

Classes/FLEX-ObjectExploring.h

-8
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@
1212
#import <FLEXObjectExplorer.h>
1313

1414
#import <FLEXShortcut.h>
15-
#import <FLEXShortcutsFactory+Defaults.h>
1615
#import <FLEXShortcutsSection.h>
17-
#import <FLEXBlockShortcuts.h>
18-
#import <FLEXBundleShortcuts.h>
19-
#import <FLEXClassShortcuts.h>
20-
#import <FLEXImageShortcuts.h>
21-
#import <FLEXLayerShortcuts.h>
22-
#import <FLEXViewControllerShortcuts.h>
23-
#import <FLEXViewShortcuts.h>
2416

2517
#import <FLEXCollectionContentSection.h>
2618
#import <FLEXColorPreviewSection.h>

Classes/Headers/FLEXArgumentInputColorView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputDateView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputFontView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputFontsPickerView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputNotSupportedView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputNumberView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputObjectView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputStringView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputStructView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputSwitchView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputTextView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputView.h

-1
This file was deleted.

Classes/Headers/FLEXArgumentInputViewFactory.h

-1
This file was deleted.

Classes/Headers/FLEXBlockShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXBundleShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXCarouselCell.h

-1
This file was deleted.

Classes/Headers/FLEXClassShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXDefaultEditorViewController.h

-1
This file was deleted.

Classes/Headers/FLEXFieldEditorView.h

-1
This file was deleted.

Classes/Headers/FLEXFieldEditorViewController.h

-1
This file was deleted.

Classes/Headers/FLEXImageShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXLayerShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXMethodCallingViewController.h

-1
This file was deleted.

Classes/Headers/FLEXNSDataShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXNSStringShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXScopeCarousel.h

-1
This file was deleted.

Classes/Headers/FLEXShortcutsFactory+Defaults.h

-1
This file was deleted.

Classes/Headers/FLEXUIAppShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXVariableEditorViewController.h

-1
This file was deleted.

Classes/Headers/FLEXViewControllerShortcuts.h

-1
This file was deleted.

Classes/Headers/FLEXViewShortcuts.h

-1
This file was deleted.

FLEX.podspec

+13-5
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,18 @@ Pod::Spec.new do |spec|
3838
spec.requires_arc = true
3939
spec.compiler_flags = "-Wno-unsupported-availability-guard"
4040
spec.public_header_files = [ "Classes/*.h", "Classes/Manager/*.h", "Classes/Toolbar/*.h",
41-
"Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h",
42-
"Classes/Core/**/*.h", "Classes/Utility/Runtime/Objc/**/*.h",
43-
"Classes/ObjectExplorers/**/*.h", "Classes/Editing/**/*.h",
44-
"Classes/Utility/Categories/*.h", "Classes/Utility/FLEXAlert.h",
41+
"Classes/Core/Controllers/*.h", "Classes/Core/Views/*.h",
42+
"Classes/Core/Views/Cells/*.h", "Classes/Core/*.h",
43+
"Classes/Utility/Categories/*.h",
44+
"Classes/Utility/Runtime/Objc/**/*.h",
45+
"Classes/ObjectExplorers/*.h",
46+
"Classes/ObjectExplorers/Sections/*.h",
47+
4548
"Classes/Utility/FLEXMacros.h",
46-
"Classes/Utility/FLEXResources.h" ]
49+
"Classes/Utility/FLEXAlert.h",
50+
"Classes/Utility/FLEXResources.h",
51+
"Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h",
52+
"Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.h",
53+
"Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
54+
]
4755
end

Package.swift

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ extension Array where Element == CSetting {
4747
return []
4848
}
4949

50+
/// These are the header search paths needed for FLEX to compile, not
51+
/// the headers used by projects linking against FLEX.
52+
///
5053
/// Do not modify the contents of this property by hand;
5154
/// Instead, run `bash generate-spm-headers.sh | grep headerSearchPath | pbcopy`
5255
/// and paste (and indent) the result below. Do this any time new folders are added.

generate-spm-headers.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,21 @@ generate_headers "" # Top-level headers
4242
generate_headers "Manager"
4343
generate_headers "Toolbar"
4444
generate_headers "Utility/Categories"
45-
generate_headers_recursive "Core"
45+
generate_headers "Core"
46+
generate_headers "Core/Controllers"
47+
generate_headers "Core/Views"
48+
generate_headers "Core/Views/Cells"
49+
generate_headers "ObjectExplorers"
50+
generate_headers "ObjectExplorers/Sections"
4651
generate_headers_recursive "Utility/Runtime/Objc"
47-
generate_headers_recursive "ObjectExplorers"
48-
generate_headers_recursive "Editing"
4952

5053
# Include only headers in these specific folders,
5154
# such as those with subfolders that should not be linked
5255
makeheader "Classes/Utility/FLEXMacros.h"
5356
makeheader "Classes/Utility/FLEXAlert.h"
5457
makeheader "Classes/Utility/FLEXResources.h"
58+
makeheader "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcut.h"
59+
makeheader "Classes/ObjectExplorers/Sections/Shortcuts/FLEXShortcutsSection.h"
5560
makeheader "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
5661

5762
# Print all folders in Classes for use in Package.swift

0 commit comments

Comments
 (0)