Merge branch 'hotfix/1.2.3'

bcylin · Jun 7, 2020 · 3ac01fb · 3ac01fb
2 parents 89894d0 + 1972be5
commit 3ac01fb
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 19 deletions.
diff --git a/.jazzy.yml b/.jazzy.yml
@@ -2,14 +2,14 @@ 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.2
+github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.3
 xcodebuild_arguments: [
   -project, QuickTableViewController.xcodeproj,
   -scheme, QuickTableViewController-iOS,
   -sdk, iphonesimulator
 ]
 module: QuickTableViewController
-module_version: 1.2.2
+module_version: 1.2.3
 output: docs/output
 theme: fullwidth
 skip_undocumented: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.2.3
+
+* Fix Swift version in podspec
+
 ## v1.2.2
 
 #### Fixes

diff --git a/Example-iOS/Info.plist b/Example-iOS/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Example-iOSUITests/Info.plist b/Example-iOSUITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/Example-tvOS/Info.plist b/Example-tvOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Example-tvOSUITests/Info.plist b/Example-tvOSUITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/QuickTableViewController.podspec b/QuickTableViewController.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name          = "QuickTableViewController"
-  s.version       = "1.2.2"
+  s.version       = "1.2.3"
   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"
+  s.screenshots   = "https://raw.githubusercontent.com/bcylin/QuickTableViewController/gh-pages/img/screenshot-1.png",
+                    "https://raw.githubusercontent.com/bcylin/QuickTableViewController/gh-pages/img/screenshot-2.png"
   s.homepage      = "https://github.com/bcylin/QuickTableViewController"
   s.license       = { type: "MIT", file: "LICENSE" }
   s.author        = "bcylin"
 
-  s.swift_version           = "4.2"
+  s.swift_version           = "5"
   s.ios.deployment_target   = "8.0"
   s.tvos.deployment_target  = "9.0"
 

diff --git a/QuickTableViewController/Info-iOS.plist b/QuickTableViewController/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QuickTableViewController/Info-iOSTests.plist b/QuickTableViewController/Info-iOSTests.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QuickTableViewController/Info-tvOS.plist b/QuickTableViewController/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/QuickTableViewController/Info-tvOSTests.plist b/QuickTableViewController/Info-tvOSTests.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 [![GitHub Actions](https://github.com/bcylin/QuickTableViewController/workflows/Tests/badge.svg)](https://github.com/bcylin/QuickTableViewController/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/bcylin/QuickTableViewController)](https://codecov.io/gh/bcylin/QuickTableViewController)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Carthage compatible](https://img.shields.io/badge/carthage-compatible-green.svg)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/QuickTableViewController.svg)](https://cocoapods.org/pods/QuickTableViewController)
-![Platform](https://img.shields.io/cocoapods/p/QuickTableViewController.svg)
+[![Platform](https://img.shields.io/cocoapods/p/QuickTableViewController?label=docs)](https://bcylin.github.io/QuickTableViewController)
 ![Swift 5](https://img.shields.io/badge/Swift-5-orange.svg)
 
 A simple way to create a table view for settings, including:
@@ -15,7 +15,7 @@ A simple way to create a table view for settings, including:
 * Actions performed when the row reacts to the user interaction
 * Easy to specify table view cell image, cell style and accessory type
 
-<img src="https://bcylin.github.io/QuickTableViewController/img/screenshots.png" width="80%"></img>
+<img src="https://raw.githubusercontent.com/bcylin/QuickTableViewController/gh-pages/img/screenshots.png" width="80%"></img>
 
 ## Usage
 
@@ -259,7 +259,7 @@ QuickTableViewController | iOS  | tvOS | Xcode | Swift
 
 Follow the instructions at [Adding Package Dependencies to Your App](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app) and use version `v1.2.1` or later. (requires Xcode 11)
 
-### Use [CocoaPods](http://guides.cocoapods.org/)
+### Use [CocoaPods](https://guides.cocoapods.org)
 
 Create a `Podfile` with the following specification and run `pod install`.
 
@@ -292,4 +292,4 @@ git submodule add -b master git@github.com:bcylin/QuickTableViewController.git D
 
 QuickTableViewController is released under the MIT license.
 See [LICENSE](https://github.com/bcylin/QuickTableViewController/blob/master/LICENSE) for more details.
-Image source: [iconmonstr](http://iconmonstr.com/license/).
+Image source: [iconmonstr](https://iconmonstr.com/license).