Merge branch 'release/0.9.0'

.codecov.yml

@@ -1,7 +1,6 @@
 coverage:
   ignore:
-    - Carthage/*
-    - Example/*
-    - ExampleUITests/*
-    - QuickTableViewControllerTests/*
-    - Pods/*
+    - "Carthage/**/*"
+    - "Example*/**/*"
+    - "*Tests/**/*"
+    - "Pods/**/*"

.jazzy.yml

@@ -5,7 +5,7 @@ github_url: https://github.com/bcylin/QuickTableViewController
 github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/develop
 xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
 module: QuickTableViewController
-module_version: 0.8.4
+module_version: 0.9.0
 output: docs/output
 theme: fullwidth
 skip_undocumented: true

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.2
 matrix:
   include:
     - env: VERSION=latest
@@ -17,11 +17,11 @@ before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
 script:
   - bundle exec rake ci:test[QuickTableViewController-iOS]
-  - bundle exec rake ci:test[Example]
+  - bash <(curl -s https://codecov.io/bash) -cF ios -J "QuickTableViewController"
+  - bundle exec rake ci:test[Example-iOS]
   - make -B carthage
   - make -B docs
 after_success:
-  # - bash <(curl -s https://codecov.io/bash) -cF ios
   - sh scripts/update-docs.sh
 notifications:
   email: false

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## v0.9.0
+
+#### Breaking
+
+* Change the `Icon` type (since [v0.2.0](#v020)) from struct to enum:
+
+  ```swift
+  enum Icon {
+    case named(String)
+    case image(UIImage)
+    case images(normal: UIImage, highlighted: UIImage)
+  }
+  ```
+
+* Rename the protocols (introduced in [v0.8.1](#v081)) that define specific rows regardless of their associated cell types:
+
+  * `NavigationRowCompatible`
+  * `OptionSelectable` → `OptionRowCompatible`
+  * `Switchable` → `SwitchRowCompatible`
+  * `Tappable` → `TapActionRowCompatible`
+
 ## v0.8.4
 
 #### Fixes

Example/Assets.xcassets/AppIcon.appiconset/Contents.json → Example-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -29,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Example/Info.plist → Example-iOS/Info.plist

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

Example/ViewControllers/CustomizationViewController.swift → Example-iOS/ViewControllers/CustomizationViewController.swift

@@ -97,7 +97,7 @@ internal final class CustomizationViewController: QuickTableViewController {
   // MARK: - Private
 
   private func log(_ sender: Row) {
-    if let option = sender as? OptionSelectable, !option.isSelected {
+    if let option = sender as? OptionRowCompatible, !option.isSelected {
       return
     }
 

Example/ViewControllers/DefaultViewController.swift → Example-iOS/ViewControllers/DefaultViewController.swift

@@ -46,18 +46,18 @@ internal final class DefaultViewController: QuickTableViewController {
 
     tableContents = [
       Section(title: "Switch", rows: [
-        SwitchRow(title: "Setting 1", switchValue: true, icon: Icon(image: globe), action: weakify(self, type(of: self).didToggleSwitch)),
-        SwitchRow(title: "Setting 2", switchValue: false, icon: Icon(image: time), action: weakify(self, type(of: self).didToggleSwitch))
+        SwitchRow(title: "Setting 1", switchValue: true, icon: .image(globe), action: weakify(self, type(of: self).didToggleSwitch)),
+        SwitchRow(title: "Setting 2", switchValue: false, icon: .image(time), action: weakify(self, type(of: self).didToggleSwitch))
       ]),
 
       Section(title: "Tap Action", rows: [
         TapActionRow(title: "Tap action", action: weakify(self, type(of: self).showAlert))
       ]),
 
       Section(title: "Navigation", rows: [
-        NavigationRow(title: "CellStyle.default", subtitle: .none, icon: Icon(image: gear)),
-        NavigationRow(title: "CellStyle", subtitle: .belowTitle(".subtitle"), icon: Icon(image: globe)),
-        NavigationRow(title: "CellStyle", subtitle: .rightAligned(".value1"), icon: Icon(image: time), action: weakify(self, type(of: self).showDetail)),
+        NavigationRow(title: "CellStyle.default", subtitle: .none, icon: .image(gear)),
+        NavigationRow(title: "CellStyle", subtitle: .belowTitle(".subtitle"), icon: .image(globe)),
+        NavigationRow(title: "CellStyle", subtitle: .rightAligned(".value1"), icon: .image(time), action: weakify(self, type(of: self).showDetail)),
         NavigationRow(title: "CellStyle", subtitle: .leftAligned(".value2"))
       ], footer: "UITableViewCellStyle.Value2 hides the image view."),
 
@@ -82,7 +82,7 @@ internal final class DefaultViewController: QuickTableViewController {
   // MARK: - Private Methods
 
   private func didToggleSelection(_ sender: Row) {
-    guard let option = sender as? OptionSelectable else {
+    guard let option = sender as? OptionRowCompatible else {
       return
     }
     let state = "\(option.title) is " + (option.isSelected ? "selected" : "deselected")
@@ -91,7 +91,7 @@ internal final class DefaultViewController: QuickTableViewController {
   }
 
   private func didToggleSwitch(_ sender: Row) {
-    if let row = sender as? Switchable {
+    if let row = sender as? SwitchRowCompatible {
       let state = "\(row.title) = \(row.switchValue)"
       print(state)
       showDebuggingText(state)

ExampleUITests/Info.plist → Example-iOSUITests/Info.plist

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

Gemfile.lock

@@ -1,44 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.2)
     claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.3.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -51,7 +52,7 @@ GEM
     concurrent-ruby (1.0.5)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.5.5)
+    danger (5.5.11)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -64,48 +65,48 @@ GEM
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.13.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
-    ffi (1.9.18)
+    ffi (1.9.23)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
+    gh_inspector (1.1.3)
     git (1.3.0)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.9.0)
+    jazzy (0.9.1)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
       open4
       redcarpet (~> 3.2)
-      rouge (~> 1.5)
+      rouge (>= 2.0.6, < 4.0)
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
     kramdown (1.16.2)
     liferaft (0.0.6)
-    minitest (5.10.3)
-    molinillo (0.5.7)
+    minitest (5.11.3)
+    molinillo (0.6.5)
     multipart-post (2.0.0)
     mustache (0.99.8)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (3.0.1)
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
+    public_suffix (3.0.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
-    rouge (1.11.1)
+    rouge (2.0.7)
     ruby-macho (1.1.0)
-    sass (3.5.4)
+    sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -117,18 +118,19 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.4)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
-    xcpretty (0.2.6)
-      rouge (~> 1.8)
+      nanaimo (~> 0.2.4)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby

Makefile

@@ -2,7 +2,7 @@ default: test
 
 test:
 	bundle exec rake 'ci:test[QuickTableViewController-iOS]'
-	bundle exec rake 'ci:test[Example]'
+	bundle exec rake 'ci:test[Example-iOS]'
 
 ci-test: test
 	make -B carthage

Podfile

@@ -4,12 +4,12 @@ use_frameworks!
 workspace "QuickTableViewController"
 project "QuickTableViewController"
 
-target "QuickTableViewControllerTests-iOS" do
-  pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.0.2"
+target "QuickTableViewController-iOSTests" do
+  pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.0.3"
   pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.2.0"
 end
 
-target "Example" do
-  pod "SwiftLint", "0.23.1"
+target "Example-iOS" do
+  pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.25.0/SwiftLint.podspec.json"
   pod "Weakify", git: "https://github.com/klundberg/Weakify.git", tag: "v0.4.0"
 end