Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
BB9z committed Apr 23, 2018
2 parents 42ef1c9 + 982fa20 commit 337eb9d
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 151 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ DerivedData/
# CocoaPods & Carthage
Pods/
Carthage/Build
# Ignore the lock file because we are developing a library.
Test/Podfile.lock

# fastlane
fastlane/report.xml
Expand Down
13 changes: 9 additions & 4 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@ set -eo pipefail

echo $TRAVIS_COMMIT_MESSAGE
echo "RFCI_TASK = $RFCI_TASK"
readonly RFWorkspace="Test/RFKit.xcworkspace"

# Run test
# $1 scheme
# $2 destination
XC_Test() {
xcodebuild test -enableCodeCoverage YES -workspace Test/RFKit.xcworkspace -scheme "$1" -destination "$2" ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
xcodebuild test -enableCodeCoverage YES -workspace "$RFWorkspace" -scheme "$1" -destination "$2" ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
}

# Run macOS test
XC_TestMac() {
xcodebuild test -enableCodeCoverage YES -workspace Test/RFKit.xcworkspace -scheme "Test-macOS" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
xcodebuild test -enableCodeCoverage YES -workspace "$RFWorkspace" -scheme "Test-macOS" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
}

# Run watchOS test
# Run watchOS build
XC_TestWatch() {
xcodebuild build -workspace Test/RFKit.xcworkspace -scheme Target-watchOS ONLY_ACTIVE_ARCH=NO | xcpretty
xcodebuild build -workspace "$RFWorkspace" -scheme Target-watchOS ONLY_ACTIVE_ARCH=NO | xcpretty
}

if [ "$RFCI_TASK" = "POD_LINT" ]; then
Expand All @@ -39,6 +40,8 @@ if [ "$RFCI_TASK" = "POD_LINT" ]; then
fi

elif [ "$RFCI_TASK" = "Xcode9" ]; then
pod install --project-directory=Test

echo "Test for macOS and watchOS."
XC_TestMac
XC_TestWatch
Expand All @@ -55,6 +58,8 @@ elif [ "$RFCI_TASK" = "Xcode9" ]; then
XC_Test "Test-Swift" "platform=iOS Simulator,name=iPhone X,OS=11.3"

elif [ "$RFCI_TASK" = "Xcode8" ]; then
pod install --project-directory=Test

echo "Test for macOS and watchOS."
XC_TestMac
XC_TestWatch
Expand Down
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ matrix:
- osx_image: xcode8.3
env: RFCI_TASK="Xcode8"
before_install:
# - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
# - pod repo update master --silent
- pod install --project-directory=Test
- 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
- cat -n ~/Library/Logs/DiagnosticReports/xctest*.crash
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# RFKit

[![Build Status](https://travis-ci.org/BB9z/RFKit.svg?branch=develop)](https://travis-ci.org/BB9z/RFKit)
[![codecov](https://codecov.io/gh/BB9z/RFKit/branch/develop/graph/badge.svg)](https://codecov.io/gh/BB9z/RFKit)
[![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)

<base href="//github.com/BB9z/RFKit/blob/master/" />

Expand Down
2 changes: 1 addition & 1 deletion RFFeatureSupport.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
@ref https://gist.github.com/robb/d55b72d62d32deaee5fa
*/
#if DEBUG
#if defined(DEBUG) && !defined(NDEBUG)
#define RF_AS_NONNULL(V) \
({\
__typeof__(V) __nullableV = V;\
Expand Down
2 changes: 1 addition & 1 deletion RFKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RFKit'
s.version = '2.0.0'
s.version = '2.0.1'
s.summary = 'Tool kit for daily cocoa development.'
s.homepage = 'https://github.com/BB9z/RFKit'
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand Down
8 changes: 6 additions & 2 deletions RFRuntime.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
#pragma mark - Macro options for Debug
// If DEBUG is true and NDEBUG is not defined, define RFDEBUG 1, else 0.
#ifndef RFDEBUG
# if DEBUG && !defined(NDEBUG)
# define RFDEBUG 1
# if defined(DEBUG) && !defined(NDEBUG)
# if DEBUG
# define RFDEBUG 1
# else
# define RFDEBUG 0
# endif
# else
# define RFDEBUG 0
# endif
Expand Down
137 changes: 0 additions & 137 deletions Test/Podfile.lock

This file was deleted.

0 comments on commit 337eb9d

Please sign in to comment.