Merge remote-tracking branch 'refs/remotes/origin/master'

ShawnMoore · Oct 7, 2018 · 2b77a80 · 2b77a80
2 parents 34b0909 + d97c599
commit 2b77a80
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/Sources/XMLParsing/XMLStackParser.swift b/Sources/XMLParsing/XMLStackParser.swift
@@ -163,7 +163,15 @@ internal class _XMLElement {
         for childElement in children {
             for child in childElement.value {
                 if let content = child.value {
-                    node[childElement.key] = content
+                    if let oldContent = node[childElement.key] as? Array<Any> {
+                        node[childElement.key] = oldContent + [content]
+
+                    } else if let oldContent = node[childElement.key] {
+                        node[childElement.key] = [oldContent, content]
+
+                    } else {
+                        node[childElement.key] = content
+                    }
                 } else if !child.children.isEmpty || !child.attributes.isEmpty {
                     let newValue = child.flatten()
 

diff --git a/XMLParsing.podspec b/XMLParsing.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "XMLParsing"
-  s.version      = "0.0.1"
+  s.version      = "0.0.2"
   s.summary      = "XMLEncoder & XMLDecoder using the Codable protocol in Swift 4"
   s.description  = "XMLParsing allows Swift 4 Codable-conforming objects to be translated to and from XML"
   s.homepage     = "https://github.com/ShawnMoore/XMLParsing"
@@ -11,4 +11,4 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/ShawnMoore/XMLParsing.git", :tag => s.version.to_s }
   s.source_files = "Sources/XMLParsing/**/*.swift"
   s.requires_arc = true
-end
+end