Merge pull request #13 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,7 +1,7 @@
-Complex.xcodeproj/project.xcworkspace
+Complex.xcodeproj/project.xcworkspace/xcuserdata
 Complex.xcodeproj/xcuserdata
 .swiftpm
 Carthage
 gyb.pyc
 .build
-Package.resolved
+IDEWorkspaceChecks.plist

.swiftlint.yml

@@ -58,7 +58,8 @@ opt_in_rules:
 reporter: "xcode"
 
 excluded:
-  - Carthage
+  - Tests/LinuxMain.swift
+  - Tests/ComplexTests/XCTestManifests.swift
 
 identifier_name:
   excluded:

.travis.yml

@@ -2,14 +2,8 @@ os: osx
 language: swift
 osx_image: xcode11.3
 xcode_project: Complex.xcodeproj
-addons:
-  homebrew:
-    packages:
-      carthage
 
 script:
-  - carthage bootstrap
-  
   - set -o pipefail && travis_retry xcodebuild -scheme "Complex" -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 "Complex macOS" -destination "platform=macOS" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test
   - set -o pipefail && travis_retry xcodebuild -scheme "Complex tvOS" -destination "platform=tvOS Simulator,name=Apple TV 4K" -configuration Debug ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES test

Cartfile.private

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Complex"
-  s.version      = "1.1.1"
+  s.version      = "1.2.0"
   s.summary      = "Swift Complex Number"
   s.description  = <<-DESC
                    A lightweight framework designed for representing and working with complex numbers for iOS, macOS, tvOS, and watchOS.
@@ -18,8 +18,17 @@ Pod::Spec.new do |s|
 
   s.source            = { :git => "https://github.com/SomeRandomiOSDev/Complex.git", :tag => s.version.to_s }
   s.source_files      = 'Sources/**/*.swift'
-  s.frameworks        = 'Foundation'
-  s.swift_versions    = ['4.0', '4.2', '5.0']
+  s.swift_versions    = ['4.2', '5.0']
   s.cocoapods_version = '>= 1.7.3'
+
+  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.dependency 'Half', '~> 1.2'
+    ts.source_files = 'Tests/ComplexTests/*Tests.swift',
+                      'Tests/ComplexTests/TestingBase.swift'
+  end
 
 end