diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b1207363..9764fac7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,16 +13,13 @@ concurrency: jobs: ios-unit-tests: name: iOS Unit Tests - runs-on: macos-12 + runs-on: macos-14 timeout-minutes: 30 steps: - # Checkout the repository uses: actions/checkout@v4 - - # Install dependencies - run: brew install xcbeautify - - - # Run Tests iOS + - # Run Tests name: Run Tests iOS run: | set -o pipefail && \ @@ -30,7 +27,7 @@ jobs: xcodebuild -workspace . \ -scheme "TPPDF" \ -sdk iphonesimulator \ - -destination "OS=16.2,name=iPhone 14 Pro" \ + -destination "OS=17.4,name=iPhone 15 Pro" \ -configuration Debug \ -enableCodeCoverage YES \ -derivedDataPath /tmp/DerivedData \ @@ -58,36 +55,15 @@ jobs: --instr-profile $PROFDATA_PATH \ --format="lcov" > integration-tests.coverage.lcov - - # Codecov Coverage - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.1 - with: - fail_ci_if_error: true - files: ./unit-tests.coverage.lcov,./integration-tests.coverage.lcov - flags: iOS - xcode_archive_path: test_output.xcresults - path_to_write_report: coverage_report.txt - - - # Upload the generated Codecov report to the GitHub artifacts - name: Upload coverage report - uses: actions/upload-artifact@v4 - if: success() - with: - name: coverage_report.txt - path: coverage_report.txt - macos-unit-tests: name: macOS Unit Tests - runs-on: macos-12 + runs-on: macos-14 timeout-minutes: 30 steps: - # Checkout the repository uses: actions/checkout@v4 - - # Install dependencies - run: brew install xcbeautify - - - # Run tests on macOS with coverage enabled + - # Run Tests name: Run tests run: swift test --parallel --enable-code-coverage @@ -97,12 +73,3 @@ jobs: .build/debug/TPPDFPackageTests.xctest/Contents/MacOS/TPPDFPackageTests \ --instr-profile .build/debug/codecov/default.profdata \ --format="lcov" > coverage.lcov - - - # Codecov Coverage - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.1 - with: - fail_ci_if_error: true - files: ./coverage.lcov - flags: macOS - path_to_write_report: coverage_report.txt diff --git a/Example iOS-SwiftPM/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example iOS-SwiftPM/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a7345b7e..e5921572 100644 --- a/Example iOS-SwiftPM/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example iOS-SwiftPM/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", "state": { "branch": null, - "revision": "f809deb30dc5c9d9b78c872e553261a61177721a", - "version": "2.0.0" + "revision": "3ef6999c73b6938cc0da422f2c912d0158abb0a0", + "version": "2.2.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", "state": { "branch": null, - "revision": "02b7a39a99c4da27abe03cab2053a9034379639f", - "version": "2.0.0" + "revision": "2ef56b2caf25f55fa7eef8784c30d5a767550f54", + "version": "2.2.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Quick/Nimble", "state": { "branch": null, - "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5", - "version": "9.0.0" + "revision": "c93f16c25af5770f0d3e6af27c9634640946b068", + "version": "9.2.1" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Quick/Quick", "state": { "branch": null, - "revision": "0038bcbab4292f3b028632556507c124e5ba69f3", - "version": "3.0.0" + "revision": "8cce6acd38f965f5baa3167b939f86500314022b", + "version": "3.1.2" } } ] diff --git a/Example macOS/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example macOS/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a7345b7e..e5921572 100644 --- a/Example macOS/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example macOS/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", "state": { "branch": null, - "revision": "f809deb30dc5c9d9b78c872e553261a61177721a", - "version": "2.0.0" + "revision": "3ef6999c73b6938cc0da422f2c912d0158abb0a0", + "version": "2.2.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", "state": { "branch": null, - "revision": "02b7a39a99c4da27abe03cab2053a9034379639f", - "version": "2.0.0" + "revision": "2ef56b2caf25f55fa7eef8784c30d5a767550f54", + "version": "2.2.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Quick/Nimble", "state": { "branch": null, - "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5", - "version": "9.0.0" + "revision": "c93f16c25af5770f0d3e6af27c9634640946b068", + "version": "9.2.1" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Quick/Quick", "state": { "branch": null, - "revision": "0038bcbab4292f3b028632556507c124e5ba69f3", - "version": "3.0.0" + "revision": "8cce6acd38f965f5baa3167b939f86500314022b", + "version": "3.1.2" } } ] diff --git a/Gemfile.lock b/Gemfile.lock index fd55a0ce..7641a443 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,12 +25,12 @@ GEM bigdecimal (3.1.7) claide (1.1.0) clamp (1.3.2) - cocoapods (1.13.0) + cocoapods (1.15.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.15.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -43,7 +43,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + cocoapods-core (1.15.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -54,7 +54,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -86,9 +86,9 @@ GEM sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.7.1) + json (2.7.2) liferaft (0.0.6) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) molinillo (0.8.0) mustache (1.1.1) @@ -97,7 +97,7 @@ GEM nap (1.1.0) netrc (0.11.0) nkf (0.2.0) - nokogiri (1.15.4) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) open4 (1.3.4) @@ -115,7 +115,7 @@ GEM clamp (~> 1.3) nokogiri (>= 1.14.3) xcodeproj (~> 1.21) - sqlite3 (1.6.6) + sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) typhoeus (1.4.1) ethon (>= 0.9.0) diff --git a/TPPDF.podspec b/TPPDF.podspec index 51bb7a24..e5afa3b7 100644 --- a/TPPDF.podspec +++ b/TPPDF.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/techprimate/TPPDF' s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'Philip Niedertscheider' => 'dev@philpri.me' } + s.author = { 'Philip Niedertscheider' => 'phil@techprimate.com' } s.source = { :git => 'https://github.com/techprimate/TPPDF.git', :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/techprimate'