Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bcylin committed May 6, 2019
2 parents 5cadedd + f2037e6 commit b344c30
Show file tree
Hide file tree
Showing 25 changed files with 213 additions and 165 deletions.
4 changes: 2 additions & 2 deletions .jazzy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/develop
github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.1.1
xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
module: QuickTableViewController
module_version: 1.1.0
module_version: 1.1.1
output: docs/output
theme: fullwidth
skip_undocumented: true
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ cache:
before_install:
- export LANG=en_US.UTF-8
- xcrun instruments -s devices
- open -a /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app
install:
- bundle install --without development --deployment --jobs=3 --retry=3
- bundle exec rake launch:simulators
- bundle exec pod install
before_script:
- if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## v1.1.1

#### Fixes

* Fix the animated `OptionRow` deselection
* Invoke `accessoryButtonAction` asynchronously to match the behaviour of row `action`
* Remove `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` from build settings

## v1.1.0

#### Enhancements
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.1.0</string>
<string>1.1.1</string>
<key>CFBundleVersion</key>
<string>101</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
4 changes: 2 additions & 2 deletions Example-iOS/ViewControllers/ExampleViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ internal final class ExampleViewController: QuickTableViewController {
private func showDebuggingText(_ text: String) {
print(text)
debugging.rows = [NavigationRow(text: text, detailText: .none)]
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
self?.tableView.reloadData()
if let section = tableContents.index(where: { $0 === debugging }) {
tableView.reloadSections([section], with: .none)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Example-iOSUITests/ExampleUITests.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// ExampleUITests.swift
// ExampleUITests
// Example-iOSUITests
//
// Created by Ben on 14/08/2017.
// Copyright © 2017 bcylin.
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.1.0</string>
<string>1.1.1</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.1.0</string>
<string>1.1.1</string>
<key>CFBundleVersion</key>
<string>101</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
4 changes: 2 additions & 2 deletions Example-tvOSUITests/ExampleUITests.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// Example_tvOSUITests.swift
// ExampleUITests.swift
// Example-tvOSUITests
//
// Created by Francesco Deliro on 07/10/2018.
// Copyright © 2018 bcylin. All rights reserved.
// Copyright © 2018 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
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.1.0</string>
<string>1.1.1</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ source "http://rubygems.org"

gem "cocoapods"
gem "danger"
gem "jazzy", "~> 0.9.0"
gem "jazzy", ">= 0.9.0"
gem "rake"
gem "xcpretty"
75 changes: 39 additions & 36 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,81 +2,82 @@ GEM
remote: http://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.10)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.3)
claide (1.0.2)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.5.3)
cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 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.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.2.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.6.4)
danger (6.0.6)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1)
kramdown (~> 1.5)
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.2)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
ffi (1.9.25)
fourflusher (2.0.1)
ffi (1.10.0)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.5.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.3)
jazzy (0.9.4)
cocoapods (~> 1.0)
mustache (~> 0.99)
open4
Expand All @@ -85,7 +86,9 @@ GEM
sass (~> 3.4)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
kramdown (1.17.0)
kramdown (2.1.0)
kramdown-parser-gfm (1.0.1)
kramdown (~> 2.0)
liferaft (0.0.6)
minitest (5.11.3)
molinillo (0.6.6)
Expand All @@ -95,35 +98,35 @@ GEM
nap (1.1.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.10.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
public_suffix (3.0.3)
rake (12.3.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
rouge (2.0.7)
ruby-macho (1.3.0)
sass (3.5.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)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sqlite3 (1.3.13)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sqlite3 (1.4.1)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.0)
unicode-display_width (1.5.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.6.0)
xcodeproj (1.9.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -138,7 +141,7 @@ PLATFORMS
DEPENDENCIES
cocoapods
danger
jazzy (~> 0.9.0)
jazzy (>= 0.9.0)
rake
xcpretty

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ bump:
ifeq (,$(strip $(version)))
# Usage: make bump version=<number>
else
ruby -pi -e "gsub(/\d+\.\d+\.\d+/i, \""$(version)"\")" QuickTableViewController.podspec
ruby -pi -e "gsub(/:\s\d+\.\d+\.\d+/i, \": "$(version)"\")" .jazzy.yml
ruby -pi -e "gsub(%r{\d+\.\d+\.\d+}, %{"$(version)"})" QuickTableViewController.podspec
ruby -pi -e "gsub(%r{\d+\.\d+\.\d+}, %{"$(version)"})" .jazzy.yml
xcrun agvtool new-marketing-version $(version)
endif

Expand Down
11 changes: 7 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ use_frameworks!
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
end

target "QuickTableViewController-iOSTests" do
platform :ios, "8.0"
pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.1.3"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1", inhibit_warnings: true
testing_frameworks
end

target "QuickTableViewController-tvOSTests" do
platform :tvos, "9.0"
pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.1.3"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1", inhibit_warnings: true
testing_frameworks
end

target "Example-iOS" do
Expand Down
24 changes: 12 additions & 12 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
PODS:
- Nimble (7.1.3)
- Quick (1.3.1)
- Nimble (8.0.1)
- Quick (2.0.0)
- SwiftLint (0.27.0)

DEPENDENCIES:
- Nimble (from `https://github.com/Quick/Nimble.git`, tag `v7.1.3`)
- Quick (from `https://github.com/Quick/Quick.git`, tag `v1.3.1`)
- 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`)

EXTERNAL SOURCES:
Nimble:
:git: https://github.com/Quick/Nimble.git
:tag: v7.1.3
:tag: v8.0.1
Quick:
:git: https://github.com/Quick/Quick.git
:tag: v1.3.1
:tag: v2.0.0
SwiftLint:
:podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json

CHECKOUT OPTIONS:
Nimble:
:git: https://github.com/Quick/Nimble.git
:tag: v7.1.3
:tag: v8.0.1
Quick:
:git: https://github.com/Quick/Quick.git
:tag: v1.3.1
:tag: v2.0.0

SPEC CHECKSUMS:
Nimble: 2839b01d1b31f6a6a7777a221f0d91cf52e8e27b
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
Quick: 7143820c017e20f5b67967d60741f3b9ba0652d7
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073

PODFILE CHECKSUM: e7ef9cc37da1ecd814713ea6beccac0b452a5ae4
PODFILE CHECKSUM: efdcb8f949ea8eca6bb4091cfe2ddbeb63328c00

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
2 changes: 1 addition & 1 deletion QuickTableViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "QuickTableViewController"
s.version = "1.1.0"
s.version = "1.1.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"
Expand Down
Loading

0 comments on commit b344c30

Please sign in to comment.