Merge branch 'develop'

.travis.sh

@@ -6,6 +6,8 @@ set -eo pipefail
 echo $TRAVIS_COMMIT_MESSAGE
 echo "RFCI_TASK = $RFCI_TASK"
 readonly RFWorkspace="Test/RFKit.xcworkspace"
+readonly RFSTAGE="$1"
+echo "RFSTAGE = $RFSTAGE"
 
 # Run test
 # $1 scheme
@@ -24,46 +26,60 @@ XC_TestWatch() {
     xcodebuild build -workspace "$RFWorkspace" -scheme Target-watchOS ONLY_ACTIVE_ARCH=NO | xcpretty
 }
 
-if [ "$RFCI_TASK" = "POD_LINT" ]; then
-    if [[ "$TRAVIS_COMMIT_MESSAGE" = *"[skip lint]"* ]]; then
-        echo "Skip pod lint"
-    else
-        echo "TRAVIS_BRANCH = $TRAVIS_BRANCH"
-        echo "Update cocoapods..."
-        gem install cocoapods --no-rdoc --no-ri --no-document --quiet
-        echo "Pod lint..."
-        if [ "$TRAVIS_BRANCH" = "develop" ]; then
-            pod lib lint --allow-warnings
+STAGE_MAIN() {
+    if [ "$RFCI_TASK" = "POD_LINT" ]; then
+        if [[ "$TRAVIS_COMMIT_MESSAGE" = *"[skip lint]"* ]]; then
+            echo "Skip pod lint"
         else
-            pod lib lint
+            echo "TRAVIS_BRANCH = $TRAVIS_BRANCH"
+            gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+            if [ "$TRAVIS_BRANCH" = "develop" ]; then
+                pod lib lint --allow-warnings
+            else
+                pod lib lint
+            fi
         fi
-    fi
 
-elif [ "$RFCI_TASK" = "Xcode9" ]; then
-    pod install --project-directory=Test
+    elif [ "$RFCI_TASK" = "Xcode9" ]; then
+        pod install --project-directory=Test
+
+        echo "Test for macOS and watchOS."
+        XC_TestMac
+        XC_TestWatch
+
+        echo "Test on lastest device and OS."
+        XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone X,OS=11.3"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 4K,OS=11.3"
 
-    echo "Test for macOS and watchOS."
-    XC_TestMac
-    XC_TestWatch
+        echo "Test on old device and OS".
+        XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 5,OS=9.0"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV,OS=9.0"
 
-    echo "Test on lastest device and OS."
-    XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone X,OS=11.3"
-    XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 4K,OS=11.3"
+        echo "Test Swift"
+        XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone X,OS=11.3"
 
-    echo "Test on old device and OS".
-    XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 5,OS=9.0"
-    XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV,OS=9.0"
+    elif [ "$RFCI_TASK" = "Xcode8" ]; then
+        pod install --project-directory=Test
+
+        echo "Test for macOS and watchOS."
+        XC_TestMac
+        XC_TestWatch
+
+        XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 6,OS=10.2"
+        XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.2"
+    fi
+}
 
-    echo "Test Swift"
-    XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone X,OS=11.3"
+STAGE_SUCCESS() {
+    if [ "$RFCI_TASK" = "Xcode9" ]; then
+        curl -s https://codecov.io/bash | bash -s
+    fi
+}
 
-elif [ "$RFCI_TASK" = "Xcode8" ]; then
-    pod install --project-directory=Test
+STAGE_FAILURE() {
+    if [[ "$RFCI_TASK" == Xcode* ]]; then
+        cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
+    fi
+}
 
-    echo "Test for macOS and watchOS."
-    XC_TestMac
-    XC_TestWatch
-
-    XC_Test "Test-iOS"   "platform=iOS Simulator,name=iPhone 6,OS=10.2"
-    XC_Test "Test-tvOS"  "platform=tvOS Simulator,name=Apple TV 1080p,OS=10.2"
-fi
+"STAGE_$RFSTAGE"

.travis.yml

@@ -16,8 +16,6 @@ matrix:
       env: RFCI_TASK="Xcode8"
 before_install:
   - pod repo update master --silent
-script: ./.travis.sh
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-after_failure:
-  - cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
+script: ./.travis.sh MAIN
+after_success: ./.travis.sh SUCCESS
+after_failure: ./.travis.sh FAILURE

Changelog.md

@@ -1,5 +1,19 @@
 # RFKit Changelog
 
+## 2.1.0
+
+* **Breaking Changes:**
+  * Subspec RFKit/Category/UIAlertView is no longer included by default.
+* API Enhancements:
+  * NSArray+RFKit, add `rf_mapedArrayWithBlock:`.
+* Bug fixes:
+  * Version in RFKit.h not bumped.
+
+## 2.0.1
+
+* Bug fixes:
+  * Eliminate warning when 'DEBUG' is not defined.
+
 ## 2.0
 
 * Highlighted enhancements:

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/BB9z/RFKit.svg?style=flat-square&colorA=333333&colorB=6600cc)](https://travis-ci.org/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/RFMessageManager.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)
 
 <base href="//github.com/BB9z/RFKit/blob/master/" />
 

RFDispatch.h

@@ -1,14 +1,14 @@
 /*!
-    RFDispatch
-    RFKit
-
-    GCD helper
-
-    Copyright (c) 2012-2015, 2018 BB9z
-    https://github.com/BB9z/RFKit
-
-    The MIT License (MIT)
-    http://www.opensource.org/licenses/mit-license.php
+ RFDispatch
+ RFKit
+ 
+ GCD helper
+ 
+ Copyright (c) 2012-2015, 2018 BB9z
+ https://github.com/BB9z/RFKit
+ 
+ The MIT License (MIT)
+ http://www.opensource.org/licenses/mit-license.php
  */
 
 #import "RFRuntime.h"

RFFoundation.h

@@ -1,12 +1,12 @@
 /*!
-    RFFoundation
-    RFKit
-
-    Copyright (c) 2018 BB9z
-    https://github.com/BB9z/RFKit
-
-    The MIT License (MIT)
-    http://www.opensource.org/licenses/mit-license.php
+ RFFoundation
+ RFKit
+ 
+ Copyright (c) 2018 BB9z
+ https://github.com/BB9z/RFKit
+ 
+ The MIT License (MIT)
+ http://www.opensource.org/licenses/mit-license.php
  */
 #pragma once
 

RFKit.h

@@ -1,16 +1,16 @@
 /*!
-    RFKit
-    Tool kit for daily Cocoa development.
+ RFKit
+ Tool kit for daily Cocoa development.
  
-    Copyright (c) 2012-2018 BB9z
-    https://github.com/BB9z/RFKit
+ Copyright (c) 2012-2018 BB9z
+ https://github.com/BB9z/RFKit
  
-    The MIT License (MIT)
-    http://www.opensource.org/licenses/mit-license.php
+ The MIT License (MIT)
+ http://www.opensource.org/licenses/mit-license.php
  */
 
 #ifndef RFKit_h
-#define RFKit_h 1.7
+#define RFKit_h 2.1
 
 #import "RFRuntime.h"
 #import "RFGeometry.h"

RFKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'RFKit'
-  s.version      = '2.0.1'
+  s.version      = '2.1.0'
   s.summary      = 'Tool kit for daily cocoa development.'
   s.homepage     = 'https://github.com/BB9z/RFKit'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
@@ -83,7 +83,6 @@ Pod::Spec.new do |s|
       ssp.dependency 'RFKit/Category/NSObject'
       ssp.dependency 'RFKit/Category/NSString'
 
-      ssp.ios.dependency 'RFKit/Category/UIAlertView'
       ssp.ios.dependency 'RFKit/Category/UIButton'
       ssp.ios.dependency 'RFKit/Category/UIColor'
       ssp.ios.dependency 'RFKit/Category/UIDevice'
@@ -122,6 +121,7 @@ Pod::Spec.new do |s|
       ssp.dependency 'RFKit/Category/NSNumberFormatter'
       ssp.dependency 'RFKit/Category/NSURL'
 
+      ssp.ios.dependency 'RFKit/Category/UIAlertView'
       ssp.ios .dependency 'RFKit/Category/NSLayoutConstraint'
       ssp.tvos.dependency 'RFKit/Category/NSLayoutConstraint'
       ssp.ios .dependency 'RFKit/Category/UIScrollView+RFScrolling'

RFKitDefaultCategories.h

@@ -1,12 +1,12 @@
 /*!
-    RFKit
-    This file define which extension category will included by default.
+ RFKit
+ This file define which extension category will included by default.
  
-    Copyright (c) 2012-2015, 2017 BB9z
-    https://github.com/bb9z/RFKit
+ Copyright (c) 2012-2015, 2017-2018 BB9z
+ https://github.com/bb9z/RFKit
  
-    The MIT License (MIT)
-    http://www.opensource.org/licenses/mit-license.php
+ The MIT License (MIT)
+ http://www.opensource.org/licenses/mit-license.php
  */
 
 #import "NSArray+RFKit.h"
@@ -24,7 +24,7 @@
 
 #if TARGET_OS_IOS
 //#import "NSLayoutConstraint+RFKit.h"
-#import "UIAlertView+RFKit.h"
+//#import "UIAlertView+RFKit.h"
 #import "UIButton+RFKit.h"
 #import "UIColor+RFKit.h"
 #import "UIDevice+RFKit.h"
@@ -38,6 +38,7 @@
 #import "UIView+RFAnimate.h"
 #import "UIView+RFKit.h"
 #import "UIViewController+RFKit.h"
+//#import "UIViewController+RFInterfaceOrientation.h"
 //#import "UIWebView+RFKit.h"
 
 #elif TARGET_OS_TV
@@ -52,7 +53,6 @@
 #import "UIView+RFAnimate.h"
 #import "UIView+RFKit.h"
 #import "UIViewController+RFKit.h"
-
 #elif TARGET_OS_WATCH
 #import "UIColor+RFKit.h"
 #import "UIImage+RFKit.h"

RFPerformance.h

@@ -1,13 +1,13 @@
 /*!
-    RFPerformance
-    RFKit
-
-    Copyright (c) 2012-2013, 2015-2016, 2018 BB9z
-    https://github.com/BB9z/RFKit
-
-    The MIT License (MIT)
-    http://www.opensource.org/licenses/mit-license.php
-*/
+ RFPerformance
+ RFKit
+ 
+ Copyright (c) 2012-2013, 2015-2016, 2018 BB9z
+ https://github.com/BB9z/RFKit
+ 
+ The MIT License (MIT)
+ http://www.opensource.org/licenses/mit-license.php
+ */
 
 #import "RFRuntime.h"