Skip to content

Commit

Permalink
Merge pull request #46 from akkyie/drop-carthage-support
Browse files Browse the repository at this point in the history
Drop Carthage support
  • Loading branch information
akkyie authored Jun 14, 2022
2 parents 548a83d + 48f7afe commit 641a264
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 902 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
deploy:
runs-on: macOS-10.14
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,3 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: make test/spm

lint_xcodeproj:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions/cache@v2
with:
path: .build
key: ${{ runner.os }}-${{ hashFiles('Package.resolved') }}
- uses: mxcl/xcodebuild@v1
with:
xcode: 12.5.1
action: none
- run: make xcodeproj && make lint/xcodeproj
27 changes: 9 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
PROJECT = Tablier.xcodeproj
XCCONFIG = Configs/SwiftPM.xcconfig
SCHEME = Tablier-Package
SCHEME = Tablier

.PHONY: build
build: build/spm
Expand All @@ -11,7 +9,9 @@ build/spm:

.PHONY: build/xcode
build/xcode:
xcodebuild build -project $(PROJECT) -scheme $(SCHEME)
xcodebuild build \
-scheme $(SCHEME) \
-destination 'platform=macOS'

.PHONY: test
test: test/spm
Expand All @@ -22,7 +22,10 @@ test/spm:

.PHONY: test/xcode
test/xcode:
xcodebuild test -project $(PROJECT) -scheme $(SCHEME) -parallel-testing-enabled YES
xcodebuild test \
-scheme $(SCHEME) \
-destination 'platform=macOS'\
-parallel-testing-enabled YES

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

.PHONY: xcodeproj
xcodeproj: $(PROJECT)
$(PROJECT): .FORCE
swift package generate-xcodeproj \
--enable-code-coverage \
--skip-extra-files \
--xcconfig-overrides $(XCCONFIG)

.PHONY: linuxmain
linuxmain:
swift test --generate-linuxmain

.PHONY: lint/xcodeproj
lint/xcodeproj:
./Scripts/check_xcodeproj_diff.sh

LATEST_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`)

.PHONY: clean
Expand All @@ -56,7 +47,7 @@ clean: clean/xcode clean/spm

.PHONY: clean/xcode
clean/xcode:
xcodebuild clean -project $(PROJECT) -scheme $(SCHEME)
xcodebuild clean -scheme $(SCHEME)

.PHONY: clean/spm
clean/spm:
Expand Down
61 changes: 0 additions & 61 deletions Package.resolved

This file was deleted.

4 changes: 1 addition & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ let package = Package(
targets: ["Tablier"]
),
],
dependencies: [
.package(url: "https://github.com/bloomberg/xcdiff", .upToNextMinor(from: "0.7.0")),
],
dependencies: [],
targets: [
.target(
name: "Tablier",
Expand Down
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ A micro-framework for [_Table Driven Tests_](https://github.com/golang/go/wiki/T
### Swift Package Manager

```swift
.package(url: "https://github.com/akkyie/Tablier", from: "0.4.0")
.package(url: "https://github.com/akkyie/Tablier", from: <#version#>)
```

### Cocoapods
Expand All @@ -38,12 +38,6 @@ target 'YourTests' do
end
```

### Carthage

```ruby
github "akkyie/Tablier"
```

## Usage

### Synchronous Recipe
Expand Down
25 changes: 0 additions & 25 deletions Tablier.xcodeproj/TablierTests_Info.plist

This file was deleted.

25 changes: 0 additions & 25 deletions Tablier.xcodeproj/Tablier_Info.plist

This file was deleted.

Loading

0 comments on commit 641a264

Please sign in to comment.