Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bcylin committed Oct 5, 2020
2 parents f2a8120 + 81fb80d commit 11f085d
Show file tree
Hide file tree
Showing 40 changed files with 642 additions and 198 deletions.
2 changes: 1 addition & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ coverage:
default:
target: 90%
comment:
layout: "diff, files"
layout: "files"
ignore:
- "Carthage/**/*"
- "Example*/**/*"
Expand Down
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: bcylin
19 changes: 19 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 14
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- discussion
- help wanted
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: invalid
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
28 changes: 20 additions & 8 deletions .github/workflows/run_tests.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,45 @@
name: Tests
name: CI
on: [push, pull_request]

jobs:
run-tests:
name: Run tests
runs-on: macOS-latest
if: contains(github.event.head_commit.message, '[ci skip]') == false
env:
BUNDLE_PATH: vendor/bundle
POD_PATH: Pods
steps:
- uses: actions/checkout@master
- uses: actions/setup-ruby@v1
- uses: actions/setup-ruby@v1.1.2
with:
ruby-version: '2.6.x'
- uses: actions/cache@v1

# Cache
- name: Cache ${{ env.BUNDLE_PATH }}
uses: actions/[email protected]
with:
path: vendor/bundle
path: ${{ env.BUNDLE_PATH }}
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: ${{ runner.os }}-gems-
- uses: actions/cache@v1
- name: Cache ${{ env.POD_PATH }}
uses: actions/[email protected]
with:
path: Pods
path: ${{ env.POD_PATH }}
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
restore-keys: ${{ runner.os }}-pods-

# Dependencies
- name: Bundle install
run: |
gem install bundler:2.1.4
bundle config path vendor/bundle
gem install bundler -v `tail -1 Gemfile.lock`
bundle config path ${{ env.BUNDLE_PATH }}
bundle install --jobs 4 --retry 3
- name: Pod install
run: |
bundle exec pod install
# Tests
- run: |
bundle exec fastlane ios unit_tests
- run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ Pods/

## Carthage
Carthage/

## Swift Package tests
Package.xcodeproj
4 changes: 2 additions & 2 deletions .jazzy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ clean: true
author: bcylin
author_url: https://github.com/bcylin
github_url: https://github.com/bcylin/QuickTableViewController
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.4
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.3.0
xcodebuild_arguments: [
-project, QuickTableViewController.xcodeproj,
-scheme, QuickTableViewController-iOS,
-sdk, iphonesimulator
]
module: QuickTableViewController
module_version: 1.2.4
module_version: 1.3.0
output: docs/output
theme: fullwidth
skip_undocumented: true
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
language: objective-c
osx_image: xcode11.3
cache:
- bundler
directories:
- vendor/bundle
- vendor/mint
before_install:
- export LANG=en_US.UTF-8
- xcrun instruments -s devices
install:
- bundle config path vendor/bundle
- bundle install --without development --deployment --jobs=3 --retry=3
- brew list mint > /dev/null || brew install mint
- mint bootstrap
script:
- set -e
- mint run yonaskolb/XcodeGen xcodegen generate --project Package --spec Package/Package.yml
- bundler exec fastlane swift_package
- make -B carthage
- make -B docs
after_success:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## v1.3.0

* Use SF Symbols as icon images, [#41](https://github.com/bcylin/QuickTableViewController/pull/41) by [@ezfe](https://github.com/ezfe)
* Make `init(style:)` a designated initializer
* Add an option to override table view for style configuration, [#74](https://github.com/bcylin/QuickTableViewController/pull/74) by [@Tobisaninfo](https://github.com/Tobisaninfo)
* Set IPHONEOS_DEPLOYMENT_TARGET to 9.0

## v1.2.4

* Fix an issue where the same identifier is used for different cell types [#50](https://github.com/bcylin/QuickTableViewController/issues/50)
Expand Down
2 changes: 1 addition & 1 deletion Example-iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.4</string>
<string>1.3.0</string>
<key>CFBundleVersion</key>
<string>101</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
14 changes: 14 additions & 0 deletions Example-iOS/ViewControllers/AppearanceViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ import QuickTableViewController

internal final class AppearanceViewController: QuickTableViewController {

init() {
if #available(iOS 13.0, *) {
super.init(style: .insetGrouped)
} else {
super.init(style: .grouped)
}
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

// MARK: - UIViewController

override func viewDidLoad() {
super.viewDidLoad()
title = "UIAppearance"
Expand Down
14 changes: 14 additions & 0 deletions Example-iOS/ViewControllers/CustomizationViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@ private final class CustomOptionRow<T: UITableViewCell>: OptionRow<T> {}

internal final class CustomizationViewController: QuickTableViewController {

init() {
if #available(iOS 13.0, *) {
super.init(style: .insetGrouped)
} else {
super.init(style: .grouped)
}
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

// MARK: - Properties

private let debugging = Section(
title: nil,
rows: [NavigationRow(text: "", detailText: .none)],
Expand Down
12 changes: 12 additions & 0 deletions Example-iOS/ViewControllers/ExampleViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ import QuickTableViewController

internal final class ExampleViewController: QuickTableViewController {

init() {
if #available(iOS 13.0, *) {
super.init(style: .insetGrouped)
} else {
super.init(style: .grouped)
}
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

// MARK: - Properties

private let debugging = Section(title: nil, rows: [NavigationRow(text: "", detailText: .none)])
Expand Down
18 changes: 16 additions & 2 deletions Example-iOS/ViewControllers/RootViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,28 @@ import QuickTableViewController

internal final class RootViewController: QuickTableViewController {

override func viewDidLoad() {
super.viewDidLoad()
init() {
if #available(iOS 13.0, *) {
super.init(style: .insetGrouped)
} else {
super.init(style: .grouped)
}

let titleLabel = UILabel()
titleLabel.text = "QuickTableViewController"
titleLabel.font = UIFont.boldSystemFont(ofSize: 17)
title = " "
navigationItem.titleView = titleLabel
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

// MARK: - UIViewController

override func viewDidLoad() {
super.viewDidLoad()

tableContents = [
Section(title: "Default", rows: [
Expand Down
2 changes: 1 addition & 1 deletion Example-iOSUITests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.4</string>
<string>1.3.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Example-tvOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.4</string>
<string>1.3.0</string>
<key>CFBundleVersion</key>
<string>101</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
2 changes: 1 addition & 1 deletion Example-tvOSUITests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.4</string>
<string>1.3.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
Loading

0 comments on commit 11f085d

Please sign in to comment.