Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support SPM installation - PR to run CI #1403

Closed
wants to merge 8 commits into from
Closed

Support SPM installation - PR to run CI #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1719ce9
Support SPM installation
allenhumphreys Dec 4, 2023
88bac1b
Add `NSBundle+AztecTestsBundle.swift` to Aztec project/workspace
mokagio Jan 17, 2025
2a1da1f
Address crashes in tests for range conversion
mokagio Jan 17, 2025
1a08d0c
Merge branch 'develop' into test/ah/spm
mokagio Jan 17, 2025
75c2bdb
Update deployment target for WordPressEditor to match others
mokagio Jan 17, 2025
47b0a09
Delete unused "Carthage Update" scheme
mokagio Jan 17, 2025
87a6dac
Merge branch 'mokagio-olivier/xcode-16.2' into test/ah/spm
mokagio Jan 17, 2025
074ee6b
Merge remote-tracking branch 'origin/develop' into test/ah/spm
mokagio Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 12 additions & 22 deletions ...eddata/xcschemes/Carthage Update.xcscheme → ...ode/xcshareddata/xcschemes/Aztec.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
version = "1.3">
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
BuildableName = "Carthage Update"
BlueprintName = "Carthage Update"
ReferencedContainer = "container:Aztec.xcodeproj">
BlueprintIdentifier = "Aztec"
BuildableName = "Aztec"
BlueprintName = "Aztec"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -26,9 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -40,15 +39,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
BuildableName = "Carthage Update"
BlueprintName = "Carthage Update"
ReferencedContainer = "container:Aztec.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -59,10 +49,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
BuildableName = "Carthage Update"
BlueprintName = "Carthage Update"
ReferencedContainer = "container:Aztec.xcodeproj">
BlueprintIdentifier = "Aztec"
BuildableName = "Aztec"
BlueprintName = "Aztec"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
130 changes: 130 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/WordPress-AztecEditor-iOS-Package.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Aztec"
BuildableName = "Aztec"
BlueprintName = "Aztec"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WordPressEditor"
BuildableName = "WordPressEditor"
BlueprintName = "WordPressEditor"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AztecTests"
BuildableName = "AztecTests"
BlueprintName = "AztecTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WordPressEditorTests"
BuildableName = "WordPressEditorTests"
BlueprintName = "WordPressEditorTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AztecTests"
BuildableName = "AztecTests"
BlueprintName = "AztecTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WordPressEditorTests"
BuildableName = "WordPressEditorTests"
BlueprintName = "WordPressEditorTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "Aztec"
BuildableName = "Aztec"
BlueprintName = "Aztec"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
66 changes: 66 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/WordPressEditor.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WordPressEditor"
BuildableName = "WordPressEditor"
BlueprintName = "WordPressEditor"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "WordPressEditor"
BuildableName = "WordPressEditor"
BlueprintName = "WordPressEditor"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
7 changes: 5 additions & 2 deletions Aztec.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A830345228583B200798076 /* NSBundle+AztecBundle.swift */; };
247D2C662AF5B90900301B71 /* UIKit+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247D2C652AF5B90900301B71 /* UIKit+Extensions.swift */; };
3FE650A22D3AFC5500862F57 /* NSBundle+AztecTestsBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE650A12D3AFC5500862F57 /* NSBundle+AztecTestsBundle.swift */; };
40359F261FD88A5F00B1C1D2 /* HRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */; };
40359F281FD88A7900B1C1D2 /* BRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */; };
40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
Expand Down Expand Up @@ -285,6 +286,7 @@
/* Begin PBXFileReference section */
1A830345228583B200798076 /* NSBundle+AztecBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecBundle.swift"; sourceTree = "<group>"; };
247D2C652AF5B90900301B71 /* UIKit+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIKit+Extensions.swift"; sourceTree = "<group>"; };
3FE650A12D3AFC5500862F57 /* NSBundle+AztecTestsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecTestsBundle.swift"; sourceTree = "<group>"; };
40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HRElementConverter.swift; sourceTree = "<group>"; };
40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRElementConverter.swift; sourceTree = "<group>"; };
40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -969,8 +971,7 @@
F1DC21B22199D58B007C189E /* ElementToAttributedString */,
F1E75630215B0C9E004BC254 /* StringAttributesToAttributes */,
);
name = Converters;
path = "New Group";
path = Converters;
sourceTree = "<group>";
};
F126ADC521553E25008F7DD1 /* AttributesToStringAttributes */ = {
Expand Down Expand Up @@ -1052,6 +1053,7 @@
F15415F7213447970096D18E /* TestingSupport */ = {
isa = PBXGroup;
children = (
3FE650A12D3AFC5500862F57 /* NSBundle+AztecTestsBundle.swift */,
F15415F8213447D70096D18E /* TextViewStub.swift */,
B5D575851F2288E2003A62F6 /* TextViewStubAttachmentDelegate.swift */,
B52220D21F86A05400D7E092 /* TextViewStubDelegate.swift */,
Expand Down Expand Up @@ -1713,6 +1715,7 @@
B52220D31F86A05400D7E092 /* TextViewStubDelegate.swift in Sources */,
F15415FB213454AC0096D18E /* HTMLStorageTests.swift in Sources */,
F185A5B92123C0DA00DDFAB1 /* StringParagraphTests.swift in Sources */,
3FE650A22D3AFC5500862F57 /* NSBundle+AztecTestsBundle.swift in Sources */,
F17BC8B51F4E517100398E2B /* AttributedStringParserTests.swift in Sources */,
F1E7562A215B01A2004BC254 /* ItalicElementAttributeConverterTests.swift in Sources */,
F17BC8A31F4E4F5A00398E2B /* ElementNodeTests.swift in Sources */,
Expand Down
4 changes: 4 additions & 0 deletions Aztec/Classes/Extensions/NSBundle+AztecBundle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import Foundation

extension Bundle {
@objc public class var aztecBundle: Bundle {
#if SPM
return .module
#else
let defaultBundle = Bundle(for: EditorView.self)
// If installed with CocoaPods, resources will be in WordPress-Aztec-iOS.bundle
if let bundleURL = defaultBundle.resourceURL,
Expand All @@ -10,5 +13,6 @@ extension Bundle {
}
// Otherwise, the default bundle is used for resources
return defaultBundle
#endif
}
}
56 changes: 0 additions & 56 deletions AztecTests/BaseConverters/CLinkedListToArrayConverterTests.swift
View file
Open in desktop

This file was deleted.

0 .../BoldElementAttributeConverterTests.swift → .../BoldElementAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...talicElementAttributeConverterTests.swift → ...talicElementAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...rlineElementAttributeConverterTests.swift → ...rlineElementAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...String/GenericElementConverterTests.swift → ...String/GenericElementConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...s/BoldStringAttributeConverterTests.swift → ...s/BoldStringAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...ItalicStringAttributeConverterTests.swift → ...ItalicStringAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
0 ...erlineStringAttributeConverterTests.swift → ...erlineStringAttributeConverterTests.swift
View file
Open in desktop
File renamed without changes.
Loading