Bump XMLCoder dependency to 0.5, fix SharedStrings (#60)

* Bump XMLCoder dependency to 0.5.0
* Bump XMLCoder dependency to 0.5.1
* Reenable SwiftFormat in .travis.yml
* Fix formatting
* Update `richText` type in SharedStrings model

.travis.yml

@@ -16,12 +16,11 @@ jobs:
     language: swift
     before_install:
       - brew update
-      # - brew install swiftformat
+      - brew install swiftformat
       - brew outdated swiftlint || brew upgrade swiftlint
       - pod repo update
     script:
-      # temporarily disabled due to Swift ABI issues on Xcode 10.2, Mojave 10.14.4
-      # - swiftformat --lint --verbose .
+      - swiftformat --lint --verbose .
       - swiftlint
       - pod lib lint --verbose
   - &test

Cartfile

@@ -1,2 +1,2 @@
 github "weichsel/ZIPFoundation" ~> 0.9.9
-github "MaxDesiatov/XMLCoder" ~> 0.4.1
+github "MaxDesiatov/XMLCoder" ~> 0.5.1

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "MaxDesiatov/XMLCoder" "0.4.1"
+github "MaxDesiatov/XMLCoder" "0.5.1"
 github "weichsel/ZIPFoundation" "0.9.9"

CoreXLSX.podspec

@@ -43,5 +43,5 @@ Excel spreadsheet (XLSX) format support in pure Swift.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'ZIPFoundation', '~> 0.9.9'
-  s.dependency 'XMLCoder', '~> 0.4.1'
+  s.dependency 'XMLCoder', '~> 0.5.1'
 end

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/maxdesiatov/XMLCoder.git",
         "state": {
           "branch": null,
-          "revision": "5cd2ebbafe71e4d08c7f8e75f3c9591087cd2ff3",
-          "version": "0.4.1"
+          "revision": "80fdf8cd6845a2175ddbf3e03a652c27215960be",
+          "version": "0.5.1"
         }
       },
       {

Package.swift

@@ -10,7 +10,7 @@ let package = Package(
     .macOS(.v10_11),
     .iOS(.v9),
     .tvOS(.v9),
-    .watchOS(.v2)
+    .watchOS(.v2),
   ],
   products: [
     // Products define the executables and libraries produced by a package,
@@ -24,7 +24,7 @@ let package = Package(
     // Dependencies declare other packages that this package depends on.
     // .package(url: /* package url */, from: "1.0.0"),
     .package(url: "https://github.com/maxdesiatov/XMLCoder.git",
-             .upToNextMajor(from: "0.4.1")),
+             .upToNextMajor(from: "0.5.1")),
     .package(url: "https://github.com/weichsel/ZIPFoundation.git",
              .upToNextMajor(from: "0.9.9")),
   ],

Package@swift-4.2.swift

@@ -18,7 +18,7 @@ let package = Package(
     // Dependencies declare other packages that this package depends on.
     // .package(url: /* package url */, from: "1.0.0"),
     .package(url: "https://github.com/maxdesiatov/XMLCoder.git",
-             .upToNextMajor(from: "0.4.1")),
+             .upToNextMajor(from: "0.5.1")),
     .package(url: "https://github.com/weichsel/ZIPFoundation.git",
              .upToNextMajor(from: "0.9.9")),
   ],

Sources/CoreXLSX/SharedStrings.swift

@@ -9,10 +9,10 @@
 /// Attributes and nodes are documented in [Microsoft
 /// docs](https://docs.microsoft.com/en-us/office/open-xml/working-with-the-shared-string-table)
 public struct SharedStrings: Codable, Equatable {
-// swiftlint:enable line_length
+  // swiftlint:enable line_length
   public struct Item: Codable, Equatable {
     public let text: String?
-    public let richText: RichText?
+    public let richText: [RichText]
 
     enum CodingKeys: String, CodingKey {
       case text = "t"

Sources/CoreXLSX/Worksheet/Worksheet.swift

@@ -184,7 +184,7 @@ public typealias Col = Column
 /// [Microsoft
 /// docs](https://docs.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet.column?view=openxml-2.8.1)
 public struct Column: Codable, Equatable {
-// swiftlint:enable line_length
+  // swiftlint:enable line_length
   public let min: UInt32
   public let max: UInt32
   public let width: Double

Tests/CoreXLSXTests/Namespaces.swift

@@ -6,11 +6,10 @@
 //
 
 @testable import CoreXLSX
-import XMLCoder
 import XCTest
+import XMLCoder
 
-let namespaceXML =
-"""
+let namespaceXML = """
 <?xml version="1.0" encoding="utf-8"?>
 <x:worksheet \
 xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
@@ -132,12 +131,12 @@ xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
 """.data(using: .utf8)!
 
 final class NamespacesTests: XCTestCase {
-    private let decoder = XMLDecoder()
+  private let decoder = XMLDecoder()
 
-    func testNamespaces() throws {
-      decoder.shouldProcessNamespaces = true
+  func testNamespaces() throws {
+    decoder.shouldProcessNamespaces = true
 
-      let worksheet = try decoder.decode(Worksheet.self, from: namespaceXML)
-      XCTAssertEqual(worksheet.data?.rows[0].cells.count, 36)
-    }
+    let worksheet = try decoder.decode(Worksheet.self, from: namespaceXML)
+    XCTAssertEqual(worksheet.data?.rows[0].cells.count, 36)
+  }
 }

Tests/CoreXLSXTests/SharedStrings.swift

@@ -10,31 +10,30 @@ import XCTest
 import XMLCoder
 
 private let parsed = SharedStrings(uniqueCount: 18, items: [
-  SharedStrings.Item(text: "Table 1", richText: nil),
-  SharedStrings.Item(text: "Item", richText: nil),
-  SharedStrings.Item(text: "Name", richText: nil),
-  SharedStrings.Item(text: "Amount", richText: nil),
-  SharedStrings.Item(text: "Name:", richText: nil),
-  SharedStrings.Item(text: "Subtotal:", richText: nil),
-  SharedStrings.Item(text: "Andy", richText: nil),
-  SharedStrings.Item(text: "Item 1", richText: nil),
-  SharedStrings.Item(text: "Item 2", richText: nil),
-  SharedStrings.Item(text: "Item 3", richText: nil),
-  SharedStrings.Item(text: "Item 4", richText: nil),
-  SharedStrings.Item(text: "Item 5", richText: nil),
-  SharedStrings.Item(text: "Chloe", richText: nil),
-  SharedStrings.Item(text: "Item 6", richText: nil),
-  SharedStrings.Item(text: "Item 7", richText: nil),
-  SharedStrings.Item(text: "Item 8", richText: nil),
-  SharedStrings.Item(text: "Item 9", richText: nil),
-  SharedStrings.Item(text: "Item 10", richText: nil),
+  SharedStrings.Item(text: "Table 1", richText: []),
+  SharedStrings.Item(text: "Item", richText: []),
+  SharedStrings.Item(text: "Name", richText: []),
+  SharedStrings.Item(text: "Amount", richText: []),
+  SharedStrings.Item(text: "Name:", richText: []),
+  SharedStrings.Item(text: "Subtotal:", richText: []),
+  SharedStrings.Item(text: "Andy", richText: []),
+  SharedStrings.Item(text: "Item 1", richText: []),
+  SharedStrings.Item(text: "Item 2", richText: []),
+  SharedStrings.Item(text: "Item 3", richText: []),
+  SharedStrings.Item(text: "Item 4", richText: []),
+  SharedStrings.Item(text: "Item 5", richText: []),
+  SharedStrings.Item(text: "Chloe", richText: []),
+  SharedStrings.Item(text: "Item 6", richText: []),
+  SharedStrings.Item(text: "Item 7", richText: []),
+  SharedStrings.Item(text: "Item 8", richText: []),
+  SharedStrings.Item(text: "Item 9", richText: []),
+  SharedStrings.Item(text: "Item 10", richText: []),
 ])
 
 private let columnC = ["Name", "Andy", "Andy", "Andy", "Andy", "Andy",
                        "Chloe", "Chloe", "Chloe", "Chloe", "Chloe"]
 
-private let spacePreserveXML =
-"""
+private let spacePreserveXML = """
 <sst uniqueCount="1">
   <si>
     <r>