Merge branch 'release/1.2.0'

.hound.yml

@@ -1,3 +1,5 @@
+rubocop:
+  enabled: false
 swiftlint:
   enabled: true
   config_file: .swiftlint.yml

.jazzy.yml

@@ -2,10 +2,10 @@ 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.1.1
+github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.0
 xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
 module: QuickTableViewController
-module_version: 1.1.1
+module_version: 1.2.0
 output: docs/output
 theme: fullwidth
 skip_undocumented: true

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 cache:
   - bundler
   - cocoapods
@@ -13,9 +13,9 @@ install:
 before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
 script:
-  - set -o pipefail
+  - set -e
   - bundle exec rake "test:ios[QuickTableViewController-iOS]"
-  - bundle exec rake "test:tvos[QuickTableViewController-tvOS]"
+  # - bundle exec rake "test:tvos[QuickTableViewController-tvOS]"
   - bash <(curl -s https://codecov.io/bash) -cF ios -J "QuickTableViewController"
   - bundle exec rake "test:ios[Example-iOS]"
   - bundle exec rake "test:tvos[Example-tvOS]"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.2.0
+
+* Swift 5, [#38](https://github.com/bcylin/QuickTableViewController/pull/38) by [@getaaron](https://github.com/getaaron)
+
 ## v1.1.1
 
 #### Fixes

Example-iOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

Example-iOS/ViewControllers/ExampleViewController.swift

@@ -122,7 +122,7 @@ internal final class ExampleViewController: QuickTableViewController {
   private func showDebuggingText(_ text: String) {
     print(text)
     debugging.rows = [NavigationRow(text: text, detailText: .none)]
-    if let section = tableContents.index(where: { $0 === debugging }) {
+    if let section = tableContents.firstIndex(where: { $0 === debugging }) {
       tableView.reloadSections([section], with: .none)
     }
   }

Example-iOSUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Example-tvOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

Example-tvOSUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Gemfile.lock

@@ -15,11 +15,11 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.6.1)
+    cocoapods (1.7.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.0)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -33,8 +33,8 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.8.2, < 2.0)
+    cocoapods-core (1.7.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -146,4 +146,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.16.4
+   2.0.1

Podfile

@@ -4,26 +4,21 @@ workspace "QuickTableViewController"
 project "QuickTableViewController"
 
 def testing_frameworks
-  pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v8.0.1", inhibit_warnings: true
-  pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v2.0.0", inhibit_warnings: true
+  pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v8.0.2", inhibit_warnings: true
+  pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v2.1.0", inhibit_warnings: true
+end
+
+def linter
+  pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json"
 end
 
 target "QuickTableViewController-iOSTests" do
   platform :ios, "8.0"
   testing_frameworks
+  linter
 end
 
 target "QuickTableViewController-tvOSTests" do
   platform :tvos, "9.0"
   testing_frameworks
 end
-
-target "Example-iOS" do
-  platform :ios, "8.0"
-  pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json"
-end
-
-target "Example-tvOS" do
-  platform :tvos, "9.0"
-  pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json"
-end

Podfile.lock

@@ -1,36 +1,36 @@
 PODS:
-  - Nimble (8.0.1)
-  - Quick (2.0.0)
-  - SwiftLint (0.27.0)
+  - Nimble (8.0.2)
+  - Quick (2.1.0)
+  - SwiftLint (0.32.0)
 
 DEPENDENCIES:
-  - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.1`)
-  - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.0.0`)
-  - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json`)
+  - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.2`)
+  - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.1.0`)
+  - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json`)
 
 EXTERNAL SOURCES:
   Nimble:
     :git: https://github.com/Quick/Nimble.git
-    :tag: v8.0.1
+    :tag: v8.0.2
   Quick:
     :git: https://github.com/Quick/Quick.git
-    :tag: v2.0.0
+    :tag: v2.1.0
   SwiftLint:
-    :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json
+    :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json
 
 CHECKOUT OPTIONS:
   Nimble:
     :git: https://github.com/Quick/Nimble.git
-    :tag: v8.0.1
+    :tag: v8.0.2
   Quick:
     :git: https://github.com/Quick/Quick.git
-    :tag: v2.0.0
+    :tag: v2.1.0
 
 SPEC CHECKSUMS:
-  Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
-  Quick: 7143820c017e20f5b67967d60741f3b9ba0652d7
-  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  Nimble: e26a10816834aa42b84764ce52c1c70076bda635
+  Quick: 23a744168f4013d04a230e6ddfa61ce006e10012
+  SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
 
-PODFILE CHECKSUM: efdcb8f949ea8eca6bb4091cfe2ddbeb63328c00
+PODFILE CHECKSUM: bab0ca3fdb9dcc1bd8a76c803fb5e73ab0926aac
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0

QuickTableViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "QuickTableViewController"
-  s.version       = "1.1.1"
+  s.version       = "1.2.0"
   s.summary       = "A simple way to create a UITableView for settings."
   s.screenshots   = "https://bcylin.github.io/QuickTableViewController/img/screenshot-1.png",
                     "https://bcylin.github.io/QuickTableViewController/img/screenshot-2.png"