Merge branch 'develop'

.github/dependabot.yml

@@ -0,0 +1,8 @@
+# https://help.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/cocoapods.yml

@@ -0,0 +1,25 @@
+name: CocoaPods
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: macos-latest
+    if: ${{ startsWith(github.ref, 'refs/heads') }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint the podspec
+        if: github.tag == ''
+        run: |
+          pod lib lint --fail-fast --allow-warnings
+
+  release:
+    runs-on: macos-latest
+    if: ${{ startsWith(github.ref, 'refs/tags') }}
+    env:
+      COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Release the podspec
+        run: |
+          pod trunk push "RFKit.podspec"

.travis.sh

@@ -87,6 +87,17 @@ STAGE_MAIN() {
                 pod lib lint --fail-fast --allow-warnings
             fi
         fi
+
+    elif [ "$RFCI_TASK" = "Xcode12" ]; then
+        pod install
+        XC_TestMac
+        XC_TestWatch
+        XC_TestAutoIOS "Test-iOS"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 4K,OS=14.0"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV,OS=10.2"
+
+        echo "Test Swift"
+        XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone 11,OS=14.0"
 
     elif [ "$RFCI_TASK" = "Xcode11" ]; then
         pod install
@@ -97,10 +108,9 @@ STAGE_MAIN() {
         XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 11 Pro,OS=13.0"
         XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 4K,OS=13.0"
 
-        # travis-ci Xcode 11 image only provides latest runtimes at this time.
-        # echo "Test on old device and OS".
-        # XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 5,OS=10.3"
-        # XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV,OS=10.2"
+        echo "Test on old device and OS".
+        XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 5,OS=10.3.1"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV,OS=10.2"
 
         echo "Test Swift"
         XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone 8,OS=13.0"
@@ -123,16 +133,6 @@ STAGE_MAIN() {
         echo "Test Swift"
         XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone SE,OS=12.0"
 
-    elif [ "$RFCI_TASK" = "Xcode9" ]; then
-        pod install
-
-        echo "Test for macOS and watchOS."
-        XC_TestMac
-        XC_TestWatch
-
-        XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone X,OS=11.4"
-        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 4K,OS=11.4"
-
     else
         logError "Unexpected CI task: $RFCI_TASK"
     fi

.travis.yml

@@ -9,17 +9,13 @@ env:
   - RFCI_PRODUCT_NAME="RFKit"
 jobs:
   include:
-    - osx_image: xcode11
-      env: RFCI_TASK="POD_LINT"
     - osx_image: xcode11
       env:
       - RFCI_TASK="Xcode11"
       - RFCI_COVERAGE=1
     - osx_image: xcode10
       env: RFCI_TASK="Xcode10"
-    - osx_image: xcode9.4
-      env: RFCI_TASK="Xcode9"
 before_install: ./.travis.sh SETUP
-script: travis_wait 20 ./.travis.sh MAIN
+script:        ./.travis.sh MAIN
 after_success: ./.travis.sh SUCCESS
 after_failure: ./.travis.sh FAILURE

Changelog.md

@@ -1,9 +1,14 @@
 # RFKit Changelog
 
+## 2.5.1
+
+* Upgrade project files for Xcode 12.
+* Fix Carthage framework version.
+
 ## 2.5.0
 
 * Drop Xcode 9 support.
-* iOS minimum deployment version upgrade to 8.0.
+* iOS minimum deployment version upgrade to 9.0.
 * macOS minimum deployment version upgrade to 10.9.
 * API Enhancements:
   * RFFoundation, add guard define for `TARGET_OS_MACCATALYST`.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright © 2012-2019 BB9z (https://github.com/BB9z/RFKit)
+Copyright © 2012-2020 BB9z (https://github.com/BB9z/RFKit)
 
 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:
 

Podfile.lock

@@ -1,10 +1,10 @@
 PODS:
-  - RFKit/ALL (2.5.0):
+  - RFKit/ALL (2.5.1):
     - RFKit/Category/All
     - RFKit/Default
     - RFKit/doutkit
     - RFKit/Performance
-  - RFKit/Category/All (2.5.0):
+  - RFKit/Category/All (2.5.1):
     - RFKit/Category/Default
     - RFKit/Category/NSDate
     - RFKit/Category/NSDateFormatter
@@ -20,7 +20,7 @@ PODS:
     - RFKit/Category/UITextField
     - "RFKit/Category/UIViewController+RFInterfaceOrientation"
     - RFKit/Category/UIWebView
-  - RFKit/Category/Default (2.5.0):
+  - RFKit/Category/Default (2.5.1):
     - RFKit/Category/NSArray
     - RFKit/Category/NSBundle
     - RFKit/Category/NSDictionary
@@ -38,95 +38,95 @@ PODS:
     - RFKit/Category/UIView
     - "RFKit/Category/UIView+RFAnimate"
     - RFKit/Category/UIViewController
-  - RFKit/Category/NSArray (2.5.0):
+  - RFKit/Category/NSArray (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/NSBundle (2.5.0):
+  - RFKit/Category/NSBundle (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/NSDate (2.5.0):
+  - RFKit/Category/NSDate (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/NSDateFormatter (2.5.0):
+  - RFKit/Category/NSDateFormatter (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/NSDictionary (2.5.0):
+  - RFKit/Category/NSDictionary (2.5.1):
     - RFKit/Category/NSObject
     - RFKit/Foundation
-  - RFKit/Category/NSError (2.5.0):
+  - RFKit/Category/NSError (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/NSFileManager (2.5.0):
+  - RFKit/Category/NSFileManager (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/NSJSONSerialization (2.5.0):
+  - RFKit/Category/NSJSONSerialization (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/NSLayoutConstraint (2.5.0):
+  - RFKit/Category/NSLayoutConstraint (2.5.1):
     - RFKit/Category/UIView
     - RFKit/Foundation
-  - RFKit/Category/NSNumberFormatter (2.5.0):
+  - RFKit/Category/NSNumberFormatter (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/NSObject (2.5.0):
+  - RFKit/Category/NSObject (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/NSString (2.5.0):
+  - RFKit/Category/NSString (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/NSURL (2.5.0):
+  - RFKit/Category/NSURL (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIAlertView (2.5.0):
+  - RFKit/Category/UIAlertView (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIButton (2.5.0):
+  - RFKit/Category/UIButton (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIColor (2.5.0):
+  - RFKit/Category/UIColor (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIDevice (2.5.0):
+  - RFKit/Category/UIDevice (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/UIImage (2.5.0):
+  - RFKit/Category/UIImage (2.5.1):
     - RFKit/Foundation
     - RFKit/RFGeometry
-  - RFKit/Category/UINavigationController (2.5.0):
+  - RFKit/Category/UINavigationController (2.5.1):
     - RFKit/Category/NSArray
     - RFKit/Foundation
-  - RFKit/Category/UIPickerView (2.5.0):
+  - RFKit/Category/UIPickerView (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIResponder (2.5.0):
+  - RFKit/Category/UIResponder (2.5.1):
     - RFKit/Foundation
     - RFKit/Runtime
-  - "RFKit/Category/UIScrollView+RFScrolling (2.5.0)":
+  - "RFKit/Category/UIScrollView+RFScrolling (2.5.1)":
     - RFKit/Foundation
-  - RFKit/Category/UISearchBar (2.5.0):
+  - RFKit/Category/UISearchBar (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIStoryboard (2.5.0):
+  - RFKit/Category/UIStoryboard (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UITableView (2.5.0):
+  - RFKit/Category/UITableView (2.5.1):
     - "RFKit/Category/UIView+RFAnimate"
     - RFKit/Foundation
-  - RFKit/Category/UITextField (2.5.0):
+  - RFKit/Category/UITextField (2.5.1):
     - RFKit/Foundation
-  - RFKit/Category/UIView (2.5.0):
+  - RFKit/Category/UIView (2.5.1):
     - RFKit/Category/UIResponder
     - RFKit/Foundation
     - RFKit/RFGeometry
-  - "RFKit/Category/UIView+RFAnimate (2.5.0)":
+  - "RFKit/Category/UIView+RFAnimate (2.5.1)":
     - RFKit/Foundation
     - RFKit/Runtime
-  - RFKit/Category/UIViewController (2.5.0):
+  - RFKit/Category/UIViewController (2.5.1):
     - RFKit/Foundation
-  - "RFKit/Category/UIViewController+RFInterfaceOrientation (2.5.0)"
-  - RFKit/Category/UIWebView (2.5.0):
+  - "RFKit/Category/UIViewController+RFInterfaceOrientation (2.5.1)"
+  - RFKit/Category/UIWebView (2.5.1):
     - RFKit/Foundation
-  - RFKit/Default (2.5.0):
+  - RFKit/Default (2.5.1):
     - RFKit/Category/Default
     - RFKit/RFGeometry
     - RFKit/Runtime
-  - RFKit/doutkit (2.5.0):
+  - RFKit/doutkit (2.5.1):
     - RFKit/Performance
     - RFKit/Runtime
-  - RFKit/Foundation (2.5.0)
-  - RFKit/Performance (2.5.0):
+  - RFKit/Foundation (2.5.1)
+  - RFKit/Performance (2.5.1):
     - RFKit/Runtime
-  - RFKit/RFGeometry (2.5.0):
+  - RFKit/RFGeometry (2.5.1):
     - RFKit/Runtime
-  - RFKit/Runtime (2.5.0):
+  - RFKit/Runtime (2.5.1):
     - RFKit/Foundation
 
 DEPENDENCIES:
@@ -137,7 +137,7 @@ EXTERNAL SOURCES:
     :path: "."
 
 SPEC CHECKSUMS:
-  RFKit: 9a16a8215ebcc03d4d6e75905d15c735e81abfab
+  RFKit: 046ed8a61c874fbb93dce7a694cfc059e8bf5d7a
 
 PODFILE CHECKSUM: 4a445c69cc99fa92683e62ea4879ca679ccd1822
 

README.md

@@ -1,5 +1,6 @@
 # RFKit
 
+[![CocoaPods](https://github.com/BB9z/RFKit/workflows/CocoaPods/badge.svg)](https://github.com/BB9z/RFKit/actions?query=workflow%3ACocoaPods)
 [![Build Status](https://img.shields.io/travis/BB9z/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://travis-ci.com/BB9z/RFKit)
 [![Codecov](https://img.shields.io/codecov/c/github/BB9z/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://codecov.io/gh/BB9z/RFKit)
 [![CocoaPods](https://img.shields.io/cocoapods/v/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://cocoapods.org/pods/RFKit)
@@ -15,7 +16,7 @@ RFKit is a useful toolkit for daily Cocoa development.
 
 | RFKit Version | Minimum Xcode Version | Minimum iOS Target  | Minimum macOS Target | Minimum watchOS Target | Minimum tvOS Target |
 |:-------------:|:---------------------:|:-------------------:|:--------------------:|:----------------------:|:-------------------:|
-| 2.5             | Xcode 9               | iOS 9  | macOS 10.9  | watchOS 2.0 | tvOS 9.0 |
+| 2.5+            | Xcode 9               | iOS 9  | macOS 10.9  | watchOS 2.0 | tvOS 9.0 |
 | 2.4             | Xcode 8               | iOS 8  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
 | 2.0-2.3       | Xcode 8               | iOS 6  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
 | 1.7             | Xcode 7               | iOS 6  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
@@ -42,7 +43,6 @@ A more complex sample:
 ```ruby
 pod 'RFKit',
     :git => 'https://github.com/BB9z/RFKit.git',
-    :branch => 'develop',
     :subspecs => ['Default', 'Category/NSDateFormatter']
 ```
 
@@ -56,12 +56,6 @@ Specify RFKit in your Cartfile:
 github "BB9z/RFKit"
 ```
 
-Or use lastest version:
-
-```
-github "BB9z/RFKit" "develop"
-```
-
 ### Manual
 
 You can always import RFKit by adding source code into your project. Just copy any files you needs.

README~zh-hans.md

@@ -1,5 +1,6 @@
 # RFKit
 
+[![CocoaPods](https://github.com/BB9z/RFKit/workflows/CocoaPods/badge.svg)](https://github.com/BB9z/RFKit/actions?query=workflow%3ACocoaPods)
 [![Build Status](https://img.shields.io/travis/BB9z/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://travis-ci.com/BB9z/RFKit)
 [![Codecov](https://img.shields.io/codecov/c/github/BB9z/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://codecov.io/gh/BB9z/RFKit)
 [![CocoaPods](https://img.shields.io/cocoapods/v/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://cocoapods.org/pods/RFKit)
@@ -15,7 +16,7 @@ RFKit 包含一套对日常 Cocoa 开发很有帮助的工具。
 
 | RFKit Version | Minimum Xcode Version | Minimum iOS Target  | Minimum macOS Target | Minimum watchOS Target | Minimum tvOS Target |
 |:-------------:|:---------------------:|:-------------------:|:--------------------:|:----------------------:|:-------------------:|
-| 2.5             | Xcode 9               | iOS 9  | macOS 10.9  | watchOS 2.0 | tvOS 9.0 |
+| 2.5+            | Xcode 9               | iOS 9  | macOS 10.9  | watchOS 2.0 | tvOS 9.0 |
 | 2.4             | Xcode 8               | iOS 8  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
 | 2.0-2.3       | Xcode 8               | iOS 6  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
 | 1.7           | Xcode 7               | iOS 6  | macOS 10.8  | watchOS 2.0 | tvOS 9.0 |
@@ -42,7 +43,6 @@ pod 'RFKit', :git => 'https://github.com/BB9z/RFKit.git', :branch => 'develop'
 ```ruby
 pod 'RFKit',
     :git => 'https://github.com/BB9z/RFKit.git',
-    :branch => 'develop',
     :subspecs => ['Default', 'Category/NSDateFormatter']
 ```
 
@@ -56,12 +56,6 @@ pod 'RFKit',
 github "BB9z/RFKit"
 ```
 
-或者用最新的版本：
-
-```
-github "BB9z/RFKit" "develop"
-```
-
 ### 手工引用
 
 你总是可以通过导入源码的方式使用 RFKit，只需拷贝相应文件到工程中即可。