Support SPM installation

wordpress-mobile · Dec 5, 2023 · aaeb244 · aaeb244
1 parent 006acea
commit aaeb244
Show file tree

Hide file tree

Showing 22 changed files with 390 additions and 169 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Aztec.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Aztec.xcscheme
@@ -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 = "Aztec"
+               BuildableName = "Aztec"
+               BlueprintName = "Aztec"
+               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 = "Aztec"
+            BuildableName = "Aztec"
+            BlueprintName = "Aztec"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WordPress-AztecEditor-iOS-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WordPress-AztecEditor-iOS-Package.xcscheme
@@ -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>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WordPressEditor.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WordPressEditor.xcscheme
@@ -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>
diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
@@ -967,8 +967,7 @@
 				F1DC21B22199D58B007C189E /* ElementToAttributedString */,
 				F1E75630215B0C9E004BC254 /* StringAttributesToAttributes */,
 			);
-			name = Converters;
-			path = "New Group";
+			path = Converters;
 			sourceTree = "<group>";
 		};
 		F126ADC521553E25008F7DD1 /* AttributesToStringAttributes */ = {

diff --git a/Aztec/Classes/Extensions/NSBundle+AztecBundle.swift b/Aztec/Classes/Extensions/NSBundle+AztecBundle.swift
@@ -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,
@@ -10,5 +13,6 @@ extension Bundle {
         }
         // Otherwise, the default bundle is used for resources
         return defaultBundle
+#endif
     }
 }
diff --git a/AztecTests/BaseConverters/CLinkedListToArrayConverterTests.swift b/AztecTests/BaseConverters/CLinkedListToArrayConverterTests.swift
diff --git a/.../BoldElementAttributeConverterTests.swift → .../BoldElementAttributeConverterTests.swift b/.../BoldElementAttributeConverterTests.swift → .../BoldElementAttributeConverterTests.swift
diff --git a/...talicElementAttributeConverterTests.swift → ...talicElementAttributeConverterTests.swift b/...talicElementAttributeConverterTests.swift → ...talicElementAttributeConverterTests.swift
diff --git a/...rlineElementAttributeConverterTests.swift → ...rlineElementAttributeConverterTests.swift b/...rlineElementAttributeConverterTests.swift → ...rlineElementAttributeConverterTests.swift
diff --git a/...String/GenericElementConverterTests.swift → ...String/GenericElementConverterTests.swift b/...String/GenericElementConverterTests.swift → ...String/GenericElementConverterTests.swift
diff --git a/...s/BoldStringAttributeConverterTests.swift → ...s/BoldStringAttributeConverterTests.swift b/...s/BoldStringAttributeConverterTests.swift → ...s/BoldStringAttributeConverterTests.swift
diff --git a/...ItalicStringAttributeConverterTests.swift → ...ItalicStringAttributeConverterTests.swift b/...ItalicStringAttributeConverterTests.swift → ...ItalicStringAttributeConverterTests.swift
diff --git a/...erlineStringAttributeConverterTests.swift → ...erlineStringAttributeConverterTests.swift b/...erlineStringAttributeConverterTests.swift → ...erlineStringAttributeConverterTests.swift
diff --git a/AztecTests/Extensions/UIImageResizeTests.swift b/AztecTests/Extensions/UIImageResizeTests.swift
@@ -14,7 +14,7 @@ class UIImageResizeTests: XCTestCase {
     }
 
     func testResizingImageWorks() {
-        let bundle = Bundle(for: type(of: self))
+        let bundle = Bundle.aztecTestsBundle
 
         guard let image = UIImage(named: "aztec", in: bundle, compatibleWith: nil) else {
             XCTFail()
@@ -52,7 +52,7 @@ class UIImageResizeTests: XCTestCase {
     }
 
     func testResizingImageWorks2() {
-        let bundle = Bundle(for: type(of: self))
+        let bundle = Bundle.aztecTestsBundle
 
         guard let image = UIImage(named: "aztec", in: bundle, compatibleWith: nil) else {
             XCTFail()
@@ -90,9 +90,8 @@ class UIImageResizeTests: XCTestCase {
     }
 
     func testResizingImageWithoutSizeChangeReturnsSameImage() {
-        let bundle = Bundle(for: type(of: self))
-
-        guard let image = UIImage(named: "aztec", in: bundle, compatibleWith: nil) else {
+
+        guard let image = UIImage(named: "aztec", in: .aztecTestsBundle, compatibleWith: nil) else {
             XCTFail()
             return
         }

diff --git a/AztecTests/TestingSupport/NSBundle+AztecTestsBundle.swift b/AztecTests/TestingSupport/NSBundle+AztecTestsBundle.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+extension Bundle {
+    @objc public class var aztecTestsBundle: Bundle {
+#if SPM
+        return .module
+#else
+        return Bundle(for: TextViewStub.self)
+#endif
+    }
+}