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