Merge pull request #11 from SomeRandomiOSDev/1.2.0

1.2.0

Author: SomeRandomiOSDev

.github/workflows/swift.yml

@@ -1,15 +1,28 @@
 name: Swift
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
-
-    runs-on: macOS-latest
-
+    strategy:
+      matrix:
+        os: [macOS-latest, ubuntu-latest]
+        swift: ["5.1"]
+    runs-on: ${{ matrix.os }}
+    env:
+      SWIFT_VERSION: ${{ matrix.swift }}
+      SWIFT_EXEC: .swiftenv/shims/swift
     steps:
     - uses: actions/checkout@v2
+    - name: Install Swift
+      run: |
+        git clone https://github.com/kylef/swiftenv.git ~/.swiftenv
+        ~/.swiftenv/bin/swiftenv install $SWIFT_VERSION --skip-existing
+        ~/.swiftenv/bin/swiftenv rehash
     - name: Build
-      run: swift build -v
-    - name: Run Tests
-      run: swift test -v
+      run: |
+        ~/$SWIFT_EXEC --version
+        ~/$SWIFT_EXEC build -v
+    - name: Test
+      run: |
+        ~/$SWIFT_EXEC test -v

.gitignore

@@ -1,4 +1,4 @@
-CBORCoding.xcodeproj/project.xcworkspace
+CBORCoding.xcodeproj/project.xcworkspace/xcuserdata
 CBORCoding.xcodeproj/xcuserdata
 CBORCoding.xcworkspace/xcuserdata
 .build

.swiftlint.yml

@@ -44,7 +44,6 @@ opt_in_rules:
   - multiple_closures_with_trailing_closure
   - nesting
   - notification_center_detachment
-  - number_separator
   - object_literal
   - operator_usage_whitespace
   - override_in_extension
@@ -60,8 +59,9 @@ opt_in_rules:
   - yoda_condition
 
 excluded:
-  - Pods
-  - Carthage
+  - .build
+  - Tests/LinuxMain.swift
+  - Tests/CBORCodingTests/XCTestManifests.swift
 
 reporter: "xcode"
 

.travis.yml

@@ -2,14 +2,8 @@ os: osx
 language: swift
 osx_image: xcode11.3
 xcode_project: CBORCoding.xcodeproj
-addons:
-  homebrew:
-    packages:
-      carthage
 
 script:
-  - carthage bootstrap
-
   - set -o pipefail && travis_retry xcodebuild -scheme "CBORCodingTests" -destination "platform=iOS Simulator,name=iPhone 11 Pro Max" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
   - set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding macOS Tests" -destination "platform=macOS" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
   - set -o pipefail && travis_retry xcodebuild -scheme "CBORCoding tvOS Tests" -destination "platform=tvOS Simulator,name=Apple TV 4K" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test

CBORCoding.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "CBORCoding"
-  s.version      = "1.1.0"
+  s.version      = "1.2.0"
   s.summary      = "A CBOR Encoder and Decoder"
   s.description  = <<-DESC
                    A lightweight framework containing a coder pair for encoding and decoding `Codable` conforming types to and from CBOR document format for iOS, macOS, tvOS, and watchOS.
@@ -16,12 +16,19 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target    = '9.0'
   s.watchos.deployment_target = '2.0'
 
-  s.source        = { :git => "https://github.com/SomeRandomiOSDev/CBORCoding.git", :tag => s.version.to_s }
-  s.source_files  = 'CBORCoding/**/*.swift'
-  s.frameworks    = 'Foundation'
-  s.swift_version = '5.0'
-  s.requires_arc  = true
+  s.source            = { :git => "https://github.com/SomeRandomiOSDev/CBORCoding.git", :tag => s.version.to_s }
+  s.source_files      = 'Sources/**/*.swift'
+  s.swift_versions    = ['4.2', '5.0']
+  s.cocoapods_version = '>= 1.7.3'
 
-  s.dependency 'Half', '~> 1.0'
+  s.dependency 'Half', '~> 1.2'
+
+  s.test_spec 'Tests' do |ts|
+    ts.ios.deployment_target   = '8.0'
+    ts.macos.deployment_target = '10.10'
+    ts.tvos.deployment_target  = '9.0'
+
+    ts.source_files            = 'Tests/CBORCodingTests/*Tests.swift'
+  end
 
 end

CBORCoding.xcodeproj/project.pbxproj

@@ -16,11 +16,13 @@ let package = Package(
     ],
 
     dependencies: [
-        .package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.0.0")
+        .package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.2.0")
     ],
 
     targets: [
-        .target(name: "CBORCoding", dependencies: ["Half"], path: "CBORCoding"),
-        .testTarget(name: "CBORCodingTests", dependencies: ["CBORCoding"], path: "CBORCodingTests")
-    ]
+        .target(name: "CBORCoding", dependencies: ["Half"]),
+        .testTarget(name: "CBORCodingTests", dependencies: ["CBORCoding", "Half"])
+    ],
+
+    swiftLanguageVersions: [.version("4.2"), .version("5")]
 )

CBORCoding.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,21 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let package = Package(
+    name: "CBORCoding",
+
+    products: [
+        .library(name: "CBORCoding", targets: ["CBORCoding"])
+    ],
+
+    dependencies: [
+        .package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.2.0")
+    ],
+
+    targets: [
+        .target(name: "CBORCoding", dependencies: ["Half"]),
+        .testTarget(name: "CBORCodingTests", dependencies: ["CBORCoding", "Half"])
+    ],
+
+    swiftLanguageVersions: [.v4_2]
+)

CBORCoding.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,6 +5,7 @@ CBORCoding
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/CBORCoding.svg)](https://cocoapods.org/pods/CBORCoding) 
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) 
 [![Platform](https://img.shields.io/cocoapods/p/CBORCoding.svg)](https://cocoapods.org/pods/CBORCoding)
+![Linux](https://img.shields.io/badge/platform-linux-lightgrey)
 [![Build](https://travis-ci.com/SomeRandomiOSDev/CBORCoding.svg?branch=master)](https://travis-ci.com/SomeRandomiOSDev/CBORCoding)
 [![Code Coverage](https://codecov.io/gh/SomeRandomiOSDev/CBORCoding/branch/master/graph/badge.svg)](https://codecov.io/gh/SomeRandomiOSDev/CBORCoding)
 [![Codacy](https://api.codacy.com/project/badge/Grade/8ad52c117e4a46d9aa4699d22fc0bf49)](https://app.codacy.com/app/SomeRandomiOSDev/CBORCoding?utm_source=github.com&utm_medium=referral&utm_content=SomeRandomiOSDev/CBORCoding&utm_campaign=Badge_Grade_Dashboard)
@@ -94,8 +95,6 @@ Contributing
 
 If you have need for a specific feature or you encounter a bug, please open an issue. If you extend the functionality of **CBORCoding** yourself or you feel like fixing a bug yourself, please submit a pull request.
 
-Note: You'll need to run `carthage bootstrap` upon downloading to resolve and build **CBORCoding**'s dependencies before being able to develop locally. Please look [here](https://github.com/Carthage/Carthage) for more info on installing Carthage on your local machine.
-
 Author
 --------
 

Cartfile

@@ -43,7 +43,7 @@ extension CBOR.Bignum: Equatable {
 
 // MARK: - CBOR.DecimalFraction Extension
 
-extension CBOR.DecimalFraction: Equatable where I1: Equatable, I2: Equatable {
+extension CBOR.DecimalFraction: Equatable {
 
     public static func == (lhs: CBOR.DecimalFraction<I1, I2>, rhs: CBOR.DecimalFraction<I1, I2>) -> Bool {
         return lhs.exponent == rhs.exponent && lhs.mantissa == rhs.mantissa
@@ -52,7 +52,7 @@ extension CBOR.DecimalFraction: Equatable where I1: Equatable, I2: Equatable {
 
 // MARK: - CBOR.Bigfloat Extension
 
-extension CBOR.Bigfloat: Equatable where I1: Equatable, I2: Equatable {
+extension CBOR.Bigfloat: Equatable {
 
     public static func == (lhs: CBOR.Bigfloat<I1, I2>, rhs: CBOR.Bigfloat<I1, I2>) -> Bool {
         return lhs.exponent == rhs.exponent && lhs.mantissa == rhs.mantissa

Cartfile.resolved

@@ -757,8 +757,8 @@ private struct __CBORKeyedDecodingContainer<K: CodingKey>: KeyedDecodingContaine
             throw DecodingError._typeMismatch(at: codingPath, expectation: [String: Any].self, reality: value)
         }
 
-        let container = __CBORKeyedDecodingContainer<NestedKey>(referencing: decoder, wrapping: dictionary)
-        return KeyedDecodingContainer(container)
+        let keyedContainer = __CBORKeyedDecodingContainer<NestedKey>(referencing: decoder, wrapping: dictionary)
+        return KeyedDecodingContainer(keyedContainer)
     }
 
     func nestedUnkeyedContainer(forKey key: Key) throws -> UnkeyedDecodingContainer {

Package.resolved

@@ -965,8 +965,8 @@ private struct __CBORKeyedEncodingContainer<K>: KeyedEncodingContainerProtocol w
         self.codingPath.append(key)
         defer { self.codingPath.removeLast() }
 
-        let container = __CBORKeyedEncodingContainer<NestedKey>(referencing: encoder, codingPath: codingPath, wrapping: dictionary)
-        return KeyedEncodingContainer<NestedKey>(container)
+        let keyedContainer = __CBORKeyedEncodingContainer<NestedKey>(referencing: encoder, codingPath: codingPath, wrapping: dictionary)
+        return KeyedEncodingContainer<NestedKey>(keyedContainer)
     }
 
     mutating func nestedUnkeyedContainer(forKey key: Key) -> UnkeyedEncodingContainer {
@@ -1046,8 +1046,8 @@ private struct __CBORUnkeyedEncodingContainer: UnkeyedEncodingContainer {
         let dictionary = CodingKeyDictionary<Any>(indefiniteLength: encoder.newContainerLength.contains(.indefinite))
         container.append(dictionary)
 
-        let container = __CBORKeyedEncodingContainer<NestedKey>(referencing: encoder, codingPath: codingPath, wrapping: dictionary)
-        return KeyedEncodingContainer<NestedKey>(container)
+        let keyedContainer = __CBORKeyedEncodingContainer<NestedKey>(referencing: encoder, codingPath: codingPath, wrapping: dictionary)
+        return KeyedEncodingContainer<NestedKey>(keyedContainer)
     }
 
     mutating func nestedUnkeyedContainer() -> UnkeyedEncodingContainer {
@@ -1117,7 +1117,7 @@ private class __CBORReferencingEncoder: __CBOREncoder {
         }
 
         switch reference {
-        case .array(var array, let index):
+        case let .array(array, index):
             array.insert(value, at: index)
 
         case let .dictionary(dictionary, key):

Package.swift

@@ -1065,7 +1065,7 @@ internal class CBORParser {
 
                 let index = containers.count - 1
 
-                if var array = containers[index] as? (container: ArrayWrapper<Any>, length: UInt64?) {
+                if let array = containers[index] as? (container: ArrayWrapper<Any>, length: UInt64?) {
                     array.container.append(value)
                     containers[index].length -= 1
                 } else if let dictionary = containers[index] as? (container: CodingKeyDictionary<Any>, length: UInt64?) {
@@ -1207,7 +1207,7 @@ internal class CBORParser {
 
 // MARK: - Optional Extension
 
-extension Optional where Wrapped: AdditiveArithmetic {
+extension Optional where Wrapped == UInt64 {
 
     fileprivate static func -= (lhs: inout Wrapped?, rhs: Wrapped) {
         if let value = lhs {

[email protected]

@@ -71,6 +71,14 @@ internal class ArrayWrapper<Element>: MutableCollection, RandomAccessCollection,
     func replaceSubrange<C, R>(_ subrange: R, with newElements: __owned C) where C: Collection, R: RangeExpression, Element == C.Element, Index == R.Bound {
         array.replaceSubrange(subrange, with: newElements)
     }
+
+    func insert(_ newElement: __owned Element, at i: Int) {
+        array.insert(newElement, at: i)
+    }
+
+    func append(_ newElement: __owned Element) {
+        array.append(newElement)
+    }
 }
 
 // MARK: - CodingKeyDictionary Definition
@@ -151,7 +159,6 @@ internal class CodingKeyDictionary<Value>: Sequence, ExpressibleByDictionaryLite
     // MARK: - ExpressibleByDictionaryLiteral Protocol Requirements
 
     typealias Key = CodingKey
-    typealias Value = Value
 
     required init(dictionaryLiteral elements: (Key, Value)...) {
         self.keyValuePairs = elements

CBORCoding/Info.plist renamed to Plists/CBORCoding-Info.plist

@@ -33,7 +33,7 @@ class CBOREncoderTests: XCTestCase {
             (try! encoder.encode(UInt64(1000)),                               "0x1903E8"),
             (try! encoder.encode(UInt64(1000000)),                            "0x1A000F4240"),
             (try! encoder.encode(UInt64(1000000000000)),                      "0x1B000000E8D4A51000"),
-            (try! encoder.encode(UInt64(18446744073709551615)),               "0x1BFFFFFFFFFFFFFFFF"),
+            (try! encoder.encode(18446744073709551615 as UInt64),             "0x1BFFFFFFFFFFFFFFFF"),
             (try! encoder.encode(CBOR.Bignum(isPositive: true,
                                              content: Data([UInt8(0x01), 0x00, 0x00, 0x00,
                                                             0x00, 0x00, 0x00, 0x00, 0x00]))), "0xC249010000000000000000"), // 18446744073709551616