Skip to content

Commit 11f085d

Browse files
committed
Merge branch 'release/1.3.0'
2 parents f2a8120 + 81fb80d commit 11f085d

40 files changed

+642
-198
lines changed

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ coverage:
55
default:
66
target: 90%
77
comment:
8-
layout: "diff, files"
8+
layout: "files"
99
ignore:
1010
- "Carthage/**/*"
1111
- "Example*/**/*"

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: bcylin

.github/stale.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 14
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- discussion
8+
- help wanted
9+
- pinned
10+
- security
11+
# Label to use when marking an issue as stale
12+
staleLabel: invalid
13+
# Comment to post when marking an issue as stale. Set to `false` to disable
14+
markComment: >
15+
This issue has been automatically marked as stale because it has not had
16+
recent activity. It will be closed if no further activity occurs. Thank you
17+
for your contributions.
18+
# Comment to post when closing a stale issue. Set to `false` to disable
19+
closeComment: false

.github/workflows/run_tests.yml renamed to .github/workflows/ci.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,45 @@
1-
name: Tests
1+
name: CI
22
on: [push, pull_request]
33

44
jobs:
55
run-tests:
66
name: Run tests
77
runs-on: macOS-latest
8+
if: contains(github.event.head_commit.message, '[ci skip]') == false
9+
env:
10+
BUNDLE_PATH: vendor/bundle
11+
POD_PATH: Pods
812
steps:
913
- uses: actions/checkout@master
10-
- uses: actions/setup-ruby@v1
14+
- uses: actions/setup-ruby@v1.1.2
1115
with:
1216
ruby-version: '2.6.x'
13-
- uses: actions/cache@v1
17+
18+
# Cache
19+
- name: Cache ${{ env.BUNDLE_PATH }}
20+
uses: actions/[email protected]
1421
with:
15-
path: vendor/bundle
22+
path: ${{ env.BUNDLE_PATH }}
1623
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
1724
restore-keys: ${{ runner.os }}-gems-
18-
- uses: actions/cache@v1
25+
- name: Cache ${{ env.POD_PATH }}
26+
uses: actions/[email protected]
1927
with:
20-
path: Pods
28+
path: ${{ env.POD_PATH }}
2129
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
2230
restore-keys: ${{ runner.os }}-pods-
31+
32+
# Dependencies
2333
- name: Bundle install
2434
run: |
25-
gem install bundler:2.1.4
26-
bundle config path vendor/bundle
35+
gem install bundler -v `tail -1 Gemfile.lock`
36+
bundle config path ${{ env.BUNDLE_PATH }}
2737
bundle install --jobs 4 --retry 3
2838
- name: Pod install
2939
run: |
3040
bundle exec pod install
41+
42+
# Tests
3143
- run: |
3244
bundle exec fastlane ios unit_tests
3345
- run: |

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ Pods/
3434

3535
## Carthage
3636
Carthage/
37+
38+
## Swift Package tests
39+
Package.xcodeproj

.jazzy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ clean: true
22
author: bcylin
33
author_url: https://github.com/bcylin
44
github_url: https://github.com/bcylin/QuickTableViewController
5-
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.4
5+
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.3.0
66
xcodebuild_arguments: [
77
-project, QuickTableViewController.xcodeproj,
88
-scheme, QuickTableViewController-iOS,
99
-sdk, iphonesimulator
1010
]
1111
module: QuickTableViewController
12-
module_version: 1.2.4
12+
module_version: 1.3.0
1313
output: docs/output
1414
theme: fullwidth
1515
skip_undocumented: true

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
language: objective-c
22
osx_image: xcode11.3
33
cache:
4-
- bundler
4+
directories:
5+
- vendor/bundle
6+
- vendor/mint
57
before_install:
68
- export LANG=en_US.UTF-8
79
- xcrun instruments -s devices
810
install:
11+
- bundle config path vendor/bundle
912
- bundle install --without development --deployment --jobs=3 --retry=3
13+
- brew list mint > /dev/null || brew install mint
14+
- mint bootstrap
1015
script:
1116
- set -e
17+
- mint run yonaskolb/XcodeGen xcodegen generate --project Package --spec Package/Package.yml
18+
- bundler exec fastlane swift_package
1219
- make -B carthage
1320
- make -B docs
1421
after_success:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## v1.3.0
4+
5+
* Use SF Symbols as icon images, [#41](https://github.com/bcylin/QuickTableViewController/pull/41) by [@ezfe](https://github.com/ezfe)
6+
* Make `init(style:)` a designated initializer
7+
* Add an option to override table view for style configuration, [#74](https://github.com/bcylin/QuickTableViewController/pull/74) by [@Tobisaninfo](https://github.com/Tobisaninfo)
8+
* Set IPHONEOS_DEPLOYMENT_TARGET to 9.0
9+
310
## v1.2.4
411

512
* Fix an issue where the same identifier is used for different cell types [#50](https://github.com/bcylin/QuickTableViewController/issues/50)

Example-iOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.2.4</string>
20+
<string>1.3.0</string>
2121
<key>CFBundleVersion</key>
2222
<string>101</string>
2323
<key>LSRequiresIPhoneOS</key>

Example-iOS/ViewControllers/AppearanceViewController.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@ import QuickTableViewController
2929

3030
internal final class AppearanceViewController: QuickTableViewController {
3131

32+
init() {
33+
if #available(iOS 13.0, *) {
34+
super.init(style: .insetGrouped)
35+
} else {
36+
super.init(style: .grouped)
37+
}
38+
}
39+
40+
required init?(coder: NSCoder) {
41+
fatalError("init(coder:) has not been implemented")
42+
}
43+
44+
// MARK: - UIViewController
45+
3246
override func viewDidLoad() {
3347
super.viewDidLoad()
3448
title = "UIAppearance"

0 commit comments

Comments
 (0)