Skip to content

Commit 641a264

Browse files
authored
Merge pull request #46 from akkyie/drop-carthage-support
Drop Carthage support
2 parents 548a83d + 48f7afe commit 641a264

File tree

12 files changed

+12
-902
lines changed

12 files changed

+12
-902
lines changed

.github/workflows/cocoapods.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
deploy:
9-
runs-on: macOS-10.14
9+
runs-on: macos-latest
1010

1111
steps:
1212
- uses: actions/checkout@v1

.github/workflows/test.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,3 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v2
3434
- run: make test/spm
35-
36-
lint_xcodeproj:
37-
runs-on: macos-11
38-
steps:
39-
- uses: actions/checkout@v2
40-
with:
41-
submodules: true
42-
- uses: actions/cache@v2
43-
with:
44-
path: .build
45-
key: ${{ runner.os }}-${{ hashFiles('Package.resolved') }}
46-
- uses: mxcl/xcodebuild@v1
47-
with:
48-
xcode: 12.5.1
49-
action: none
50-
- run: make xcodeproj && make lint/xcodeproj

Makefile

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
PROJECT = Tablier.xcodeproj
2-
XCCONFIG = Configs/SwiftPM.xcconfig
3-
SCHEME = Tablier-Package
1+
SCHEME = Tablier
42

53
.PHONY: build
64
build: build/spm
@@ -11,7 +9,9 @@ build/spm:
119

1210
.PHONY: build/xcode
1311
build/xcode:
14-
xcodebuild build -project $(PROJECT) -scheme $(SCHEME)
12+
xcodebuild build \
13+
-scheme $(SCHEME) \
14+
-destination 'platform=macOS'
1515

1616
.PHONY: test
1717
test: test/spm
@@ -22,7 +22,10 @@ test/spm:
2222

2323
.PHONY: test/xcode
2424
test/xcode:
25-
xcodebuild test -project $(PROJECT) -scheme $(SCHEME) -parallel-testing-enabled YES
25+
xcodebuild test \
26+
-scheme $(SCHEME) \
27+
-destination 'platform=macOS'\
28+
-parallel-testing-enabled YES
2629

2730
.PHONY: test/examples
2831
test/examples:
@@ -32,22 +35,10 @@ test/examples:
3235
test/docker: clean/spm linuxmain
3336
docker run -it --rm -v `pwd`:/tablier -w /tablier swift:5.0 swift test
3437

35-
.PHONY: xcodeproj
36-
xcodeproj: $(PROJECT)
37-
$(PROJECT): .FORCE
38-
swift package generate-xcodeproj \
39-
--enable-code-coverage \
40-
--skip-extra-files \
41-
--xcconfig-overrides $(XCCONFIG)
42-
4338
.PHONY: linuxmain
4439
linuxmain:
4540
swift test --generate-linuxmain
4641

47-
.PHONY: lint/xcodeproj
48-
lint/xcodeproj:
49-
./Scripts/check_xcodeproj_diff.sh
50-
5142
LATEST_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`)
5243

5344
.PHONY: clean
@@ -56,7 +47,7 @@ clean: clean/xcode clean/spm
5647

5748
.PHONY: clean/xcode
5849
clean/xcode:
59-
xcodebuild clean -project $(PROJECT) -scheme $(SCHEME)
50+
xcodebuild clean -scheme $(SCHEME)
6051

6152
.PHONY: clean/spm
6253
clean/spm:

Package.resolved

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

Package.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ let package = Package(
1010
targets: ["Tablier"]
1111
),
1212
],
13-
dependencies: [
14-
.package(url: "https://github.com/bloomberg/xcdiff", .upToNextMinor(from: "0.7.0")),
15-
],
13+
dependencies: [],
1614
targets: [
1715
.target(
1816
name: "Tablier",

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A micro-framework for [_Table Driven Tests_](https://github.com/golang/go/wiki/T
2626
### Swift Package Manager
2727

2828
```swift
29-
.package(url: "https://github.com/akkyie/Tablier", from: "0.4.0")
29+
.package(url: "https://github.com/akkyie/Tablier", from: <#version#>)
3030
```
3131

3232
### Cocoapods
@@ -38,12 +38,6 @@ target 'YourTests' do
3838
end
3939
```
4040

41-
### Carthage
42-
43-
```ruby
44-
github "akkyie/Tablier"
45-
```
46-
4741
## Usage
4842

4943
### Synchronous Recipe

Tablier.xcodeproj/TablierTests_Info.plist

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

Tablier.xcodeproj/Tablier_Info.plist

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

0 commit comments

Comments
 (0)