diff --git a/.travis.yml b/.travis.yml index d43e73b8..273b4e36 100644 --- a/.travis.yml +++ b/.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 diff --git a/Cartfile b/Cartfile index 882f7a60..5cdda08f 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "weichsel/ZIPFoundation" ~> 0.9.9 -github "MaxDesiatov/XMLCoder" ~> 0.4.1 +github "MaxDesiatov/XMLCoder" ~> 0.5.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1131f3f8..a9888124 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "MaxDesiatov/XMLCoder" "0.4.1" +github "MaxDesiatov/XMLCoder" "0.5.1" github "weichsel/ZIPFoundation" "0.9.9" diff --git a/CoreXLSX.podspec b/CoreXLSX.podspec index 1f4ca089..5ca902a7 100644 --- a/CoreXLSX.podspec +++ b/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 diff --git a/Package.resolved b/Package.resolved index ecdaccb0..208d854a 100644 --- a/Package.resolved +++ b/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" } }, { diff --git a/Package.swift b/Package.swift index 535fa962..eb0549f0 100644 --- a/Package.swift +++ b/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")), ], diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index 51b3bab3..b91f6000 100644 --- a/Package@swift-4.2.swift +++ b/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")), ], diff --git a/Sources/CoreXLSX/SharedStrings.swift b/Sources/CoreXLSX/SharedStrings.swift index d1a3e32e..b994eed8 100644 --- a/Sources/CoreXLSX/SharedStrings.swift +++ b/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" diff --git a/Sources/CoreXLSX/Worksheet/Worksheet.swift b/Sources/CoreXLSX/Worksheet/Worksheet.swift index 1a3944b2..cb795ea3 100644 --- a/Sources/CoreXLSX/Worksheet/Worksheet.swift +++ b/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 diff --git a/Tests/CoreXLSXTests/Namespaces.swift b/Tests/CoreXLSXTests/Namespaces.swift index a7a52223..6e33ff0a 100644 --- a/Tests/CoreXLSXTests/Namespaces.swift +++ b/Tests/CoreXLSXTests/Namespaces.swift @@ -6,11 +6,10 @@ // @testable import CoreXLSX -import XMLCoder import XCTest +import XMLCoder -let namespaceXML = -""" +let namespaceXML = """ @@ -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) + } } diff --git a/Tests/CoreXLSXTests/SharedStrings.swift b/Tests/CoreXLSXTests/SharedStrings.swift index bbc202a1..5f0c2b06 100644 --- a/Tests/CoreXLSXTests/SharedStrings.swift +++ b/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 = """