Skip to content

Commit ebe9d80

Browse files
authored
Pull in CwlCatchException and CwlPreconditionTesting transitively. (#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
1 parent c60d66d commit ebe9d80

26 files changed

Lines changed: 130 additions & 1888 deletions

File tree

.github/workflows/carthage.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Carthage
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- "*"
9+
pull_request:
10+
branches:
11+
- "*"
12+
13+
jobs:
14+
carthage:
15+
name: Carthage Build
16+
runs-on: macos-12
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: ruby/setup-ruby@v1
20+
with:
21+
ruby-version: 2.7
22+
bundler-cache: true
23+
- run: ./test carthage

.gitignore

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,7 @@ Nimble.xcframework.zip
1212
#
1313
# Add this line if you want to avoid checking in source code from Carthage dependencies.
1414
# Carthage/Checkouts
15-
Carthage/Checkouts/**/*.*
16-
Carthage/Checkouts/**/Cart*
17-
Carthage/Checkouts/**/Tests
18-
!Carthage/Checkouts/**/LICENSE.*
19-
!Carthage/Checkouts/**/*.md
20-
!Carthage/Checkouts/**/*.swift
21-
!Carthage/Checkouts/**/*.h
22-
!Carthage/Checkouts/**/*.m
23-
!Carthage/Checkouts/**/*.c
24-
Carthage/Build
15+
Carthage
2516

2617
# Swift Package Manager
2718
#

Carthage/Checkouts/CwlCatchException/LICENSE.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

Carthage/Checkouts/CwlCatchException/Package.swift

Lines changed: 0 additions & 14 deletions
This file was deleted.

Carthage/Checkouts/CwlCatchException/README.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

Lines changed: 0 additions & 35 deletions
This file was deleted.

Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m

Lines changed: 0 additions & 34 deletions
This file was deleted.

Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

Carthage/Checkouts/CwlPreconditionTesting/LICENSE.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

Carthage/Checkouts/CwlPreconditionTesting/Package.swift

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)