Skip to content

Commit a696b74

Browse files
authored
Merge pull request #19 from ra1028/chore/drop-support-for-cocoapods
chore: Drop support for CocoaPods
2 parents c936ea4 + 06f9b15 commit a696b74

File tree

11 files changed

+13
-178
lines changed

11 files changed

+13
-178
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
name: Publish
1+
name: publish
22
on:
33
release:
44
types: [published]
5+
56
jobs:
67
publish:
78
name: Publish
@@ -15,21 +16,8 @@ jobs:
1516
steps:
1617
- name: Checkout
1718
uses: actions/checkout@v2
18-
- name: Get Ruby Gem Cache
19-
uses: actions/cache@v1
20-
with:
21-
path: vendor/bundle
22-
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
23-
restore-keys: ${{ runner.os }}-gem-
24-
- name: Install Ruby Gem
25-
if: steps.cache.outputs.cache-hit != 'true'
26-
run: make gem-install
2719
- name: Upload Zip
2820
run: make upload-zip
2921
env:
3022
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3123
GITHUB_RELEASE_ID: ${{ github.event.release.id }}
32-
- name: CocoaPods Trunk Push
33-
run: make pod-trunk-push
34-
env:
35-
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.github/workflows/test.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
name: GitHub Actions
1+
name: test
22
on:
33
pull_request:
44
push:
55
branches:
66
- master
7+
workflow_dispatch:
78

89
jobs:
910
linux:
@@ -36,16 +37,5 @@ jobs:
3637
run: |
3738
swift --version
3839
xcodebuild -version
39-
- name: Get Ruby Gem Cache
40-
uses: actions/cache@v1
41-
with:
42-
path: vendor/bundle
43-
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
44-
restore-keys: ${{ runner.os }}-gem-
45-
- name: Install Ruby Gem
46-
if: steps.cache.outputs.cache-hit != 'true'
47-
run: make gem-install
4840
- name: Run Test
4941
run: make test
50-
- name: CocoaPods Lib Lint
51-
run: make pod-lib-lint

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
.build
33
/*.xcodeproj
44
xcuserdata/
5-
vendor/
6-
.bundle/
75
.tmp
86
.swiftpm/
97
swift-mod.zip

.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile

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

Gemfile.lock

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

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,13 @@ lint:
3737

3838
autocorrect: mod format lint
3939

40-
pod-lib-lint:
41-
bundle exec pod lib lint
42-
43-
pod-trunk-push:
44-
bundle exec pod trunk push --skip-tests --skip-import-validation swift-mod.podspec
45-
4640
ubuntu-deps:
4741
apt-get update --assume-yes
4842
apt-get install --assume-yes libsqlite3-dev libncurses-dev
4943

5044
docker-test:
5145
docker run -v `pwd`:`pwd` -w `pwd` --rm $(DOCKER_IMAGE_NAME) make ubuntu-deps test
5246

53-
gem-install:
54-
bundle config path vendor/bundle
55-
bundle config unset frozen
56-
bundle install --jobs 4 --retry 3
57-
5847
zip: build
5948
install_name_tool -add_rpath @loader_path -add_rpath $(XCODE_DEFAULT_TOOLCHAIN)/usr/lib/swift/macosx $(TOOL_BIN) 2>/dev/null || true
6049
rm -f $(TOOL_NAME).zip

README.md

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
A tool for Swift code modification intermediating between code generation and formatting.
44

5-
[![Swift5](https://img.shields.io/badge/language-Swift5-orange.svg)](https://developer.apple.com/swift)
6-
[![Release](https://img.shields.io/github/release/ra1028/swift-mod.svg)](https://github.com/ra1028/swift-mod/releases/latest)
7-
[![Swift Package Manager](https://img.shields.io/badge/SwiftPM-compatible-blue.svg)](https://swift.org/package-manager)
8-
[![CocoaPods](https://img.shields.io/cocoapods/v/swift-mod.svg)](https://cocoapods.org/pods/swift-mod)
9-
[![CI Status](https://github.com/ra1028/swift-mod/workflows/GitHub%20Actions/badge.svg)](https://github.com/ra1028/swift-mod/actions)
10-
[![Lincense](http://img.shields.io/badge/License-Apache%202.0-black.svg)](https://github.com/ra1028/swift-mod/blob/master/LICENSE)
5+
[![swift](https://img.shields.io/badge/language-Swift5-orange.svg)](https://developer.apple.com/swift)
6+
[![release](https://img.shields.io/github/release/ra1028/swift-mod.svg)](https://github.com/ra1028/swift-mod/releases/latest)
7+
[![test](https://github.com/ra1028/swift-mod/workflows/GitHub%20Actions/badge.svg)](https://github.com/ra1028/swift-mod/actions)
8+
[![lincense](http://img.shields.io/badge/License-Apache%202.0-black.svg)](https://github.com/ra1028/swift-mod/blob/master/LICENSE)
119

1210
---
1311

@@ -267,9 +265,7 @@ struct Avenger {
267265

268266
## Installation
269267

270-
`swift-mod` doesn't support [HomeBrew](http://brew.sh/) because it's hard to keep backward compatibility due to depended on the version of Swift toolchain you are using.
271-
272-
### Using [Swift Package Manager](https://github.com/apple/swift-package-manager)
268+
### [Swift Package Manager](https://github.com/apple/swift-package-manager)
273269

274270
Add the following to the dependencies of your `Package.swift`:
275271

@@ -285,7 +281,7 @@ Run command:
285281
swift run -c release swift-mod [COMMAND] [OPTIONS]
286282
```
287283

288-
### Using [Mint](https://github.com/yonaskolb/Mint)
284+
### [Mint](https://github.com/yonaskolb/Mint)
289285

290286
Install with Mint by following command:
291287

@@ -299,21 +295,9 @@ Run command:
299295
mint run ra1028/swift-mod [COMMAND] [OPTIONS]
300296
```
301297

302-
### Using [CocoaPods](https://github.com/CocoaPods/CocoaPods)
303-
304-
Add the following to your `Podfile`:
305-
306-
```sh
307-
pod 'swift-mod'
308-
```
309-
310-
Run command:
311-
312-
```sh
313-
Pods/swift-mod/swift-mod [COMMAND] [OPTIONS]
314-
```
298+
### Using a pre-built binary
315299

316-
\* If you have changed the name of `Xcode.app` used in toolchain (`xcode-select -p`), `swift-mod` via CocoaPods can't be excuted. Please set the Xcode name to `Xcode.app`. (See: <https://forums.swift.org/t/swiftsyntax-with-swift-5-1/29051>)
300+
You can also install swift-mod by downloading `swift-mod.zip` from the latest GitHub release.
317301

318302
### Swift Version Support
319303

Tools/Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ let package = Package(
66
name: "Tools",
77
dependencies: [
88
.package(url: "https://github.com/apple/swift-format.git", .upToNextMinor(from: "0.50600.0")),
9-
],
10-
targets: [.target(name: "Tools", path: "TargetStub")]
9+
]
1110
)

Tools/TargetStub/Stub.swift

Whitespace-only changes.

0 commit comments

Comments
 (0)