Skip to content

Commit

Permalink
Pull in CwlCatchException and CwlPreconditionTesting transitively. (#…
Browse files Browse the repository at this point in the history
…1108)

* CwlCatchException and CwlPreconditionTesting dropped carthage support

Stop embedding them, and pull them in through SPM or Cocoapods transitively.

* Avoid checking in the carthage directory

* Fix podspec lint errors

* Add specific error messaging when trying to use throwAssertion on watchOS/tvOS and cocoapods

* Add github action to verify that carthage still builds

* (re)add verbose logging to podspec and carthage tests
  • Loading branch information
younata authored Dec 20, 2023
1 parent c60d66d commit ebe9d80
Show file tree
Hide file tree
Showing 26 changed files with 130 additions and 1,888 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/carthage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Carthage

on:
push:
branches:
- main
tags:
- "*"
pull_request:
branches:
- "*"

jobs:
carthage:
name: Carthage Build
runs-on: macos-12
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
bundler-cache: true
- run: ./test carthage
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@ Nimble.xcframework.zip
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Checkouts/**/*.*
Carthage/Checkouts/**/Cart*
Carthage/Checkouts/**/Tests
!Carthage/Checkouts/**/LICENSE.*
!Carthage/Checkouts/**/*.md
!Carthage/Checkouts/**/*.swift
!Carthage/Checkouts/**/*.h
!Carthage/Checkouts/**/*.m
!Carthage/Checkouts/**/*.c
Carthage/Build
Carthage

# Swift Package Manager
#
Expand Down
15 changes: 0 additions & 15 deletions Carthage/Checkouts/CwlCatchException/LICENSE.txt

This file was deleted.

14 changes: 0 additions & 14 deletions Carthage/Checkouts/CwlCatchException/Package.swift

This file was deleted.

18 changes: 0 additions & 18 deletions Carthage/Checkouts/CwlCatchException/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions Carthage/Checkouts/CwlPreconditionTesting/LICENSE.txt

This file was deleted.

27 changes: 0 additions & 27 deletions Carthage/Checkouts/CwlPreconditionTesting/Package.swift

This file was deleted.

59 changes: 0 additions & 59 deletions Carthage/Checkouts/CwlPreconditionTesting/README.md

This file was deleted.

This file was deleted.

Loading

0 comments on commit ebe9d80

Please sign in to comment.