Merge pull request #246 from drmohundro/fix/rename-to-avoid-conflict

Rename SWXMLHash class to XMLHash
drmohundro · Sep 29, 2021 · 19219b4 · 19219b4
2 parents 8fe82e1 + c61b98f
commit 19219b4
Show file tree

Hide file tree

Showing 23 changed files with 140 additions and 154 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,7 +1,7 @@
 // swift-tools-version:5.3
 
 //
-//  SWXMLHash.swift
+//  Package.swift
 //  SWXMLHash
 //
 //  Copyright (c) 2014 David Mohundro

diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ To set any of the configuration options, you use the `configure` method, like
 so:
 
 ```swift
-let xml = SWXMLHash.config {
+let xml = XMLHash.config {
               config in
               // set any config options here
           }.parse(xmlToParse)
@@ -162,7 +162,7 @@ All examples below can be found in the included
 ### Initialization
 
 ```swift
-let xml = SWXMLHash.parse(xmlToParse)
+let xml = XMLHash.parse(xmlToParse)
 ```
 
 Alternatively, if you're parsing a large XML file and need the best performance,
@@ -172,17 +172,17 @@ for performance reasons. See the error handling for one caveat regarding lazy
 loading.
 
 ```swift
-let xml = SWXMLHash.config {
+let xml = XMLHash.config {
               config in
               config.shouldProcessLazily = true
           }.parse(xmlToParse)
 ```
 
 The above approach uses the new config method, but there is also a `lazy` method
-directly off of `SWXMLHash`.
+directly off of `XMLHash`.
 
 ```swift
-let xml = SWXMLHash.lazy(xmlToParse)
+let xml = XMLHash.lazy(xmlToParse)
 ```
 
 ### Single Element Lookup

diff --git a/SWXMLHash.xcodeproj/project.pbxproj b/SWXMLHash.xcodeproj/project.pbxproj
diff --git a/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash OSX.xcscheme b/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD9D052B1A757D8B003CCB21"
+            BuildableName = "SWXMLHash.framework"
+            BlueprintName = "SWXMLHash OSX"
+            ReferencedContainer = "container:SWXMLHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CD9D052B1A757D8B003CCB21"
-            BuildableName = "SWXMLHash.framework"
-            BlueprintName = "SWXMLHash OSX"
-            ReferencedContainer = "container:SWXMLHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:SWXMLHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash iOS.xcscheme b/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD6083EE196CA106000B4F8D"
+            BuildableName = "SWXMLHash.framework"
+            BlueprintName = "SWXMLHash iOS"
+            ReferencedContainer = "container:SWXMLHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CD6083EE196CA106000B4F8D"
-            BuildableName = "SWXMLHash.framework"
-            BlueprintName = "SWXMLHash iOS"
-            ReferencedContainer = "container:SWXMLHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:SWXMLHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash tvOS.xcscheme b/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CDDEC74B1BF6311A00AB138B"
+            BuildableName = "SWXMLHash.framework"
+            BlueprintName = "SWXMLHash tvOS"
+            ReferencedContainer = "container:SWXMLHash.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CDDEC74B1BF6311A00AB138B"
-            BuildableName = "SWXMLHash.framework"
-            BlueprintName = "SWXMLHash tvOS"
-            ReferencedContainer = "container:SWXMLHash.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
             ReferencedContainer = "container:SWXMLHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash watchOS.xcscheme b/SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
             ReferencedContainer = "container:SWXMLHash.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SWXMLHashPlayground.playground/Pages/Introduction.xcplaygroundpage/Contents.swift b/SWXMLHashPlayground.playground/Pages/Introduction.xcplaygroundpage/Contents.swift
@@ -30,7 +30,7 @@ xmlns:f=\"http://www.w3schools.com/furniture\">
 </root>
 """
 
-var xml = SWXMLHash.parse(xmlWithNamespace)
+var xml = XMLHash.parse(xmlWithNamespace)
 
 // one root element
 let count = xml["root"].all.count
@@ -99,6 +99,6 @@ struct Book: XMLIndexerDeserializable {
     }
 }
 
-xml = SWXMLHash.parse(booksXML)
+xml = XMLHash.parse(booksXML)
 
 let books: [Book] = try xml["root"]["books"]["book"].value()