Merge branch 'release/0.5.2'

.jazzy.yml

@@ -5,6 +5,6 @@ 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.5.1
+module_version: 0.5.2
 output: docs/output
 theme: fullwidth

.swift-version

@@ -0,0 +1 @@
+3.0

.swiftlint.yml

@@ -3,6 +3,7 @@ disabled_rules:
   - force_cast
   - function_body_length
   - valid_docs
+  - vertical_whitespace
 included:
   - Example
   - QuickTableViewControllerTests

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.3
 matrix:
   include:
     - env: VERSION=latest
@@ -10,16 +10,14 @@ cache:
   - Pods
 before_install:
   - export LANG=en_US.UTF-8
-  - brew tap homebrew/bundle
-  - brew bundle
 install:
   - bundle install --without development --deployment --jobs=3 --retry=3
   - bundle exec pod install
 before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
 script:
   - bundle exec rake ci:build[Example]
-  - bundle exec scan --scheme QuickTableViewController-iOS
+  - bundle exec fastlane scan --scheme QuickTableViewController-iOS
   - make -B carthage
   - make -B docs
 after_success:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v0.5.2
+
+#### Changes
+
+* Xcode 8.3
+* Make the image name and highlighted image name of `Icon` public readonly
+
 ## v0.5.1
 
 #### Changes

Dangerfile

@@ -2,24 +2,23 @@
 
 # Sometimes it's a README fix, or something like that - which isn't relevant for
 # including in a project's CHANGELOG for example
-declared_trivial = pr_title.include? "#trivial"
+declared_trivial = (github.pr_title + github.pr_body).include? "#trivial"
 
 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet
-warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
+warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]"
 
 # Warn when there is a big PR
-warn("Big PR") if lines_of_code > 500
+warn "Big PR" if git.lines_of_code > 500
 
-# Don't let testing shortcuts get into master by accident
-fail("fdescribe left in tests") if `grep -r fdescribe specs/`.length > 1
-fail("fit left in tests") if `grep -r "fit specs/ `.length > 1
+# Ensure there is a summary for a PR
+fail "Please provide a summary in the Pull Request description" if github.pr_body.length < 5
 
 # Add a CHANGELOG entry for app changes
-if git.lines_of_code > 50 && !github.modified_files.include?("CHANGELOG.md") && !declared_trivial
-  fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/bcylin/QuickTableViewController/blob/develop/CHANGELOG.md).")
+if git.lines_of_code > 50 && !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
+  fail "Please update [CHANGELOG.md](https://github.com/bcylin/QuickTableViewController/blob/develop/CHANGELOG.md).", sticky: true
 end
 
 # Ensure a clean commits history
-if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
-  fail('Please rebase to get rid of the merge commits in this PR')
+if git.commits.any? { |c| c.message =~ /^Merge branch/ }
+  fail "Please rebase to get rid of the merge commits in this PR", sticky: true
 end

Example.xcodeproj/project.pbxproj

@@ -63,7 +63,11 @@
 				A08429DFE9677455AFFC14F2 /* Pods */,
 				B5133F2D1D9D550D004DE48D /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 0;
+			wrapsLines = 0;
 		};
 		B5133F2D1D9D550D004DE48D /* Products */ = {
 			isa = PBXGroup;
@@ -115,7 +119,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = bcylin;
 				TargetAttributes = {
 					B5133F2B1D9D550D004DE48D = {
@@ -167,7 +171,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		A43CA00841AB7E30DF4064FE /* [CP] Embed Pods Frameworks */ = {
@@ -230,6 +234,7 @@
 		B5133F471D9D550D004DE48D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -245,6 +250,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -280,6 +286,7 @@
 		B5133F481D9D550D004DE48D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -295,6 +302,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -324,6 +332,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B210B15629AAA59EA1559FDA /* Pods-Example.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -338,6 +347,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3AC7D4E6AB04C46BA1E83D5D /* Pods-Example.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;

Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Info.plist

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

Gemfile

@@ -1,11 +1,10 @@
 source "http://rubygems.org"
 ruby "2.3.1"
 
-gem "bundler"
-gem "cocoapods", "~> 1.1.0.rc.2"
-gem "danger", "~> 0.10.0"
-gem "jazzy", "~> 0.7.0"
+gem "cocoapods"
+gem "danger"
+gem "fastlane"
+gem "jazzy"
 gem "rake"
-gem "scan"
 gem "slather"
 gem "xcpretty"