Merge branch 'release/1.2.1'

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

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11.1
 cache:
   - bundler
   - cocoapods
@@ -15,10 +15,8 @@ before_script:
 script:
   - set -e
   - bundle exec rake "test:ios[QuickTableViewController-iOS]"
-  # - 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]"
   - make -B carthage
   - make -B docs
 after_success:

CHANGELOG.md

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

Example-iOS/Info.plist

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

Example-iOSUITests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</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.2.0</string>
+	<string>1.2.1</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.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Gemfile.lock

@@ -1,41 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.7.0)
+    cocoapods (1.8.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.0)
+      cocoapods-core (= 1.8.4)
       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)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.0)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -44,76 +49,72 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.0.6)
+    danger (6.1.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
+      faraday-http-cache (~> 2.0)
       git (~> 1.5)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.10.0)
-    fourflusher (2.2.0)
+    ffi (1.11.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.5.0)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.9.4)
-      cocoapods (~> 1.0)
-      mustache (~> 0.99)
+    jazzy (0.11.2)
+      cocoapods (~> 1.5)
+      mustache (~> 1.1)
       open4
-      redcarpet (~> 3.2)
+      redcarpet (~> 3.4)
       rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.4)
+      sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
+    json (2.2.0)
     kramdown (2.1.0)
-    kramdown-parser-gfm (1.0.1)
+    kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liferaft (0.0.6)
-    minitest (5.11.3)
+    minitest (5.12.2)
     molinillo (0.6.6)
-    multipart-post (2.0.0)
-    mustache (0.99.8)
+    multipart-post (2.1.1)
+    mustache (1.1.0)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (3.0.3)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    redcarpet (3.4.0)
+    public_suffix (4.0.1)
+    rake (13.0.0)
+    redcarpet (3.5.0)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.2.1)
+      ffi (~> 1.9)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -123,10 +124,10 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.9.0)
+    xcodeproj (1.13.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -146,4 +147,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

Package.swift

@@ -0,0 +1,45 @@
+// swift-tools-version:5.1
+//
+//  Package.swift
+//
+//  Copyright © 2016 bcylin.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "QuickTableViewController",
+    platforms: [
+        .iOS(.v13),
+        .tvOS(.v13),
+    ],
+    products: [
+        .library(
+            name: "QuickTableViewController",
+            targets: ["QuickTableViewController"]),
+    ],
+    targets: [
+        .target(
+            name: "QuickTableViewController",
+            path: "Source"),
+    ],
+    swiftLanguageVersions: [.v5]
+)

Podfile

@@ -1,11 +1,13 @@
+install! "cocoapods", generate_multiple_pod_projects: true
+inhibit_all_warnings!
 use_frameworks!
 
 workspace "QuickTableViewController"
 project "QuickTableViewController"
 
 def testing_frameworks
-  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
+  pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v8.0.4"
+  pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v2.2.0"
 end
 
 def linter

Podfile.lock

@@ -1,36 +1,36 @@
 PODS:
-  - Nimble (8.0.2)
-  - Quick (2.1.0)
+  - Nimble (8.0.4)
+  - Quick (2.2.0)
   - SwiftLint (0.32.0)
 
 DEPENDENCIES:
-  - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.2`)
-  - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.1.0`)
+  - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.4`)
+  - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.2.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.2
+    :tag: v8.0.4
   Quick:
     :git: https://github.com/Quick/Quick.git
-    :tag: v2.1.0
+    :tag: v2.2.0
   SwiftLint:
     :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.2
+    :tag: v8.0.4
   Quick:
     :git: https://github.com/Quick/Quick.git
-    :tag: v2.1.0
+    :tag: v2.2.0
 
 SPEC CHECKSUMS:
-  Nimble: e26a10816834aa42b84764ce52c1c70076bda635
-  Quick: 23a744168f4013d04a230e6ddfa61ce006e10012
+  Nimble: 56d5e29d71c1c13ef008401760edca09974e8903
+  Quick: 8bf351656d824b9cc6e292b41494c8f18562a5e9
   SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
 
-PODFILE CHECKSUM: bab0ca3fdb9dcc1bd8a76c803fb5e73ab0926aac
+PODFILE CHECKSUM: 6ab4719ee6c875770594be660db985ea59d39e68
 
-COCOAPODS: 1.7.0
+COCOAPODS: 1.8.4

QuickTableViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "QuickTableViewController"
-  s.version       = "1.2.0"
+  s.version       = "1.2.1"
   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"

QuickTableViewController.xcodeproj/project.pbxproj

@@ -34,7 +34,6 @@
 		B5334F301B8CC6AA00C64A6D /* QuickTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5334F2F1B8CC6AA00C64A6D /* QuickTableViewController.swift */; };
 		B536C7F81F4AAF9900DAC4AA /* ReusableSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B536C7F61F4AAF7C00DAC4AA /* ReusableSpec.swift */; };
 		B5374C901FDD7AF800A3EA28 /* RowCompatible.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5374C8F1FDD7AF700A3EA28 /* RowCompatible.swift */; };
-		B54A242F2088816E00EEBA26 /* QuickTableViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B54A24262088816D00EEBA26 /* QuickTableViewController.framework */; };
 		B54A243F208883A300EEBA26 /* Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E029221DC8B3EC00B5C90E /* Icon.swift */; };
 		B54A2440208883A300EEBA26 /* RadioSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E619CE1F454CF0005200E1 /* RadioSection.swift */; };
 		B54A2441208883A300EEBA26 /* Section.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E029201DC7A39200B5C90E /* Section.swift */; };
@@ -303,7 +302,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				2E72C6FDAAB1ACD925E74017 /* Pods_QuickTableViewController_tvOSTests.framework in Frameworks */,
-				B54A242F2088816E00EEBA26 /* QuickTableViewController.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

QuickTableViewController/Info-iOS.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>