Skip to content

Commit d4be7bb

Browse files
committed
Merge branch 'release/1.2.0'
2 parents b344c30 + 800c91c commit d4be7bb

31 files changed

Lines changed: 116 additions & 169 deletions

.hound.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
rubocop:
2+
enabled: false
13
swiftlint:
24
enabled: true
35
config_file: .swiftlint.yml

.jazzy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ 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.1.1
5+
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.0
66
xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
77
module: QuickTableViewController
8-
module_version: 1.1.1
8+
module_version: 1.2.0
99
output: docs/output
1010
theme: fullwidth
1111
skip_undocumented: true

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10.1
2+
osx_image: xcode10.2
33
cache:
44
- bundler
55
- cocoapods
@@ -13,9 +13,9 @@ install:
1313
before_script:
1414
- if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
1515
script:
16-
- set -o pipefail
16+
- set -e
1717
- bundle exec rake "test:ios[QuickTableViewController-iOS]"
18-
- bundle exec rake "test:tvos[QuickTableViewController-tvOS]"
18+
# - bundle exec rake "test:tvos[QuickTableViewController-tvOS]"
1919
- bash <(curl -s https://codecov.io/bash) -cF ios -J "QuickTableViewController"
2020
- bundle exec rake "test:ios[Example-iOS]"
2121
- bundle exec rake "test:tvos[Example-tvOS]"

CHANGELOG.md

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

3+
## v1.2.0
4+
5+
* Swift 5, [#38](https://github.com/bcylin/QuickTableViewController/pull/38) by [@getaaron](https://github.com/getaaron)
6+
37
## v1.1.1
48

59
#### Fixes

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.1.1</string>
20+
<string>1.2.0</string>
2121
<key>CFBundleVersion</key>
2222
<string>101</string>
2323
<key>LSRequiresIPhoneOS</key>

Example-iOS/ViewControllers/ExampleViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ internal final class ExampleViewController: QuickTableViewController {
122122
private func showDebuggingText(_ text: String) {
123123
print(text)
124124
debugging.rows = [NavigationRow(text: text, detailText: .none)]
125-
if let section = tableContents.index(where: { $0 === debugging }) {
125+
if let section = tableContents.firstIndex(where: { $0 === debugging }) {
126126
tableView.reloadSections([section], with: .none)
127127
}
128128
}

Example-iOSUITests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.1</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

Example-tvOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.1</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>101</string>
2121
<key>LSRequiresIPhoneOS</key>

Example-tvOSUITests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.1</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ GEM
1515
cork
1616
nap
1717
open4 (~> 1.3)
18-
cocoapods (1.6.1)
18+
cocoapods (1.7.0)
1919
activesupport (>= 4.0.2, < 5)
2020
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.6.1)
22-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
21+
cocoapods-core (= 1.7.0)
22+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2323
cocoapods-downloader (>= 1.2.2, < 2.0)
2424
cocoapods-plugins (>= 1.0.0, < 2.0)
2525
cocoapods-search (>= 1.0.0, < 2.0)
@@ -33,8 +33,8 @@ GEM
3333
molinillo (~> 0.6.6)
3434
nap (~> 1.0)
3535
ruby-macho (~> 1.4)
36-
xcodeproj (>= 1.8.1, < 2.0)
37-
cocoapods-core (1.6.1)
36+
xcodeproj (>= 1.8.2, < 2.0)
37+
cocoapods-core (1.7.0)
3838
activesupport (>= 4.0.2, < 6)
3939
fuzzy_match (~> 2.0.4)
4040
nap (~> 1.0)
@@ -146,4 +146,4 @@ DEPENDENCIES
146146
xcpretty
147147

148148
BUNDLED WITH
149-
1.16.4
149+
2.0.1

0 commit comments

Comments
 (0)