Skip to content

Commit 7e4f9f3

Browse files
nnsnodnbnnsnodnb
authored
Merge pull request #104 from nnsnodnb/develop
Release v1.1.1
2 parents e2df4b5 + 3e62506 commit 7e4f9f3

File tree

57 files changed

+363
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+363
-226
lines changed

‎.github/workflows/adhoc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
FASTLANE_SKIP_UPDATE_CHECK: 1
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- name: Setup Ruby
1919
uses: ruby/setup-ruby@v1
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Select Xcode
2525
run: |
26-
sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
26+
sudo xcode-select -s /Applications/Xcode_15.0.0.app/Contents/Developer
2727
xcodebuild -version
2828
2929
- name: Cache Swift Packages

‎.github/workflows/appstore.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contents: write
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Setup Ruby
2222
uses: ruby/setup-ruby@v1
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Select Xcode
2828
run: |
29-
sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
29+
sudo xcode-select -s /Applications/Xcode_15.0.0.app/Contents/Developer
3030
xcodebuild -version
3131
3232
- name: Cache Swift Packages

‎.github/workflows/danger.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Lint
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
danger:
8+
runs-on: macos-13
9+
10+
permissions:
11+
pull-requests: write
12+
issues: write
13+
statuses: write
14+
checks: write
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Cache SwiftLint
22+
uses: actions/cache@v3
23+
id: cache-swiftlint
24+
with:
25+
path: swiftlint
26+
key: ${{ runner.os }}-swiftlint-${{ hashFiles('swiftlint/swiftlint') }}
27+
28+
- name: Download SwiftLint
29+
if: steps.cache-swiftlint.outputs.cache-hit != 'true'
30+
run: |
31+
version=$(jq -r '.pins[] | select( .identity == "swiftlint" ) | .state.version' < WebSocketClient.xcworkspace/xcshareddata/swiftpm/Package.resolved)
32+
mkdir swiftlint
33+
cd swiftlint
34+
wget "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"
35+
unzip portable_swiftlint.zip
36+
cd -
37+
38+
- name: Setup Ruby
39+
uses: ruby/setup-ruby@v1
40+
with:
41+
ruby-version: "3.2"
42+
bundler-cache: true
43+
44+
- name: Danger
45+
env:
46+
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
run: bundle exec danger

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ on:
44
pull_request:
55
paths:
66
- .github/workflows/**
7-
- Dangerfile
8-
- scripts/danger/**
9-
- Gemfile
10-
- Gemfile.lock
117

128
jobs:
139
actionlint:
@@ -17,51 +13,9 @@ jobs:
1713
pull-requests: write
1814

1915
steps:
20-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
2117

2218
- uses: reviewdog/action-actionlint@v1
2319
with:
2420
reporter: github-pr-review
2521
level: warning
26-
27-
danger:
28-
runs-on: macos-13
29-
30-
permissions:
31-
pull-requests: write
32-
issues: write
33-
statuses: write
34-
checks: write
35-
36-
steps:
37-
- uses: actions/checkout@v3
38-
with:
39-
fetch-depth: 0
40-
41-
- name: Cache SwiftLint
42-
uses: actions/cache@v3
43-
id: cache-swiftlint
44-
with:
45-
path: swiftlint
46-
key: ${{ runner.os }}-swiftlint-${{ hashFiles('swiftlint/swiftlint') }}
47-
48-
- name: Download SwiftLint
49-
if: steps.cache-swiftlint.outputs.cache-hit != 'true'
50-
run: |
51-
version=$(jq -r '.pins[] | select( .identity == "swiftlint" ) | .state.version' < WebSocketClient.xcworkspace/xcshareddata/swiftpm/Package.resolved)
52-
mkdir swiftlint
53-
cd swiftlint
54-
wget "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"
55-
unzip portable_swiftlint.zip
56-
cd -
57-
58-
- name: Setup Ruby
59-
uses: ruby/setup-ruby@v1
60-
with:
61-
ruby-version: "3.2"
62-
bundler-cache: true
63-
64-
- name: Danger
65-
env:
66-
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67-
run: bundle exec danger

‎.github/workflows/renovate.yml‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
files_changes: ${{ steps.files_changes.outputs.files }}
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- uses: trilom/file-changes-action@v1.2.4
2323
id: files_changes
@@ -28,19 +28,39 @@ jobs:
2828
if: contains(fromJson(needs.precheck.outputs.files_changes), 'WebSocketClient.xcworkspace/xcshareddata/swiftpm/Package.resolved') == false
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: Cyberbeni/install-swift-tool@v2
32+
with:
33+
url: https://github.com/nnsnodnb/github-apps-token-swift
34+
version: '*'
35+
36+
- name: Configure Access Token for GitHub Apps
37+
id: get-github-app
38+
env:
39+
APP_ID: ${{ secrets.APP_ID }}
40+
PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
41+
run: |
42+
echo "${PRIVATE_KEY}" > /tmp/github-apps-private-key.pem
43+
token=$(github-apps-token create \
44+
-a "${APP_ID}" \
45+
-p /tmp/github-apps-private-key.pem \
46+
--owner nnsnodnb \
47+
-r websocket-client-ios \
48+
--contents write)
49+
echo "token=${token}" >> "${GITHUB_OUTPUT}"
50+
rm /tmp/github-apps-private-key.pem
51+
52+
- uses: actions/checkout@v4
3253
with:
3354
fetch-depth: 0
34-
token: ${{ secrets.FINE_GRAINED_PAT }}
55+
token: ${{ steps.get-github-app.outputs.token }}
3556

3657
- name: Select Xcode
3758
run: |
38-
sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
59+
sudo xcode-select -s /Applications/Xcode_15.0.0.app/Contents/Developer
3960
xcodebuild -version
4061
4162
- name: Cache Swift Packages
4263
uses: actions/cache@v3
43-
timeout-minutes: 20
4464
with:
4565
path: .swiftpm
4666
key: ${{ runner.os }}-swiftpm-${{ hashFiles('WebSocketClient.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
@@ -50,15 +70,21 @@ jobs:
5070

5171
- name: Git Config
5272
run: |
53-
git config --global user.email "nnsnodnb@users.noreply.github.com"
54-
git config --global user.name "nnsnodnb"
73+
git config --global user.email "aoi-chan-bot[bot]@users.noreply.github.com"
74+
git config --global user.name "aoi-chan-bot[bot]"
5575
5676
- name: Commit & Push
5777
env:
5878
HEAD_REF: ${{ github.head_ref }}
59-
GITHUB_TOKEN: ${{ secrets.FINE_GRAINED_PAT }}
6079
run: |
6180
git add WebSocketClient.xcworkspace/xcshareddata/swiftpm/Package.resolved
6281
if git commit -m "Resolve Swift Package"; then
6382
git push origin "HEAD:${HEAD_REF}"
6483
fi
84+
85+
- name: Revoke Access Token for GitHub Apps
86+
if: success() || failure()
87+
run: |
88+
if [[ -n "${{ steps.get-github-app.outputs.token }}" ]]; then
89+
github-apps-token revoke --token "${{ steps.get-github-app.outputs.token }}"
90+
fi

‎.github/workflows/test.yml‎

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

‎.swiftlint.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
included:
22
- WebSocketClient/Sources
3-
- WebSocketClientTests
4-
5-
excluded:
6-
- WebSocketClient/Generated
3+
- WebSocketClientPackage
74

85
opt_in_rules:
96
- array_init

Configurations/App/App.base.xcconfig renamed to App/Configurations/App/App.base.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ PRODUCT_BUNDLE_IDENTIFIER = moe.nnsnodnb.WebSocketClient
55

66
GENERATE_INFOPLIST_FILE = NO
77
INFOPLIST_FILE = WebSocketClient/Supporting Files/Info.plist
8-
MARKETING_VERSION = 1.1.0
9-
CURRENT_PROJECT_VERSION = 3
8+
MARKETING_VERSION = 1.1.1
9+
CURRENT_PROJECT_VERSION = 4
1010

1111
COPY_PHASE_STRIP = YES
1212
STRIP_INSTALLED_PRODUCT = YES

Configurations/App/App.debug.xcconfig renamed to App/Configurations/App/App.debug.xcconfig

File renamed without changes.

Configurations/App/App.release.xcconfig renamed to App/Configurations/App/App.release.xcconfig

File renamed without changes.

0 commit comments

Comments
 (0)