Skip to content

Travis build, coverage and deprecated code. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 24, 2016
Merged

Travis build, coverage and deprecated code. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14ead17
[Travis CI] Update to Xcode 7.3.1
Sep 24, 2016
9744433
[Swift 2.2] Avoid deprecated C-style for loop.
iosdevzone Sep 24, 2016
70f11ee
[Travis CI] Avoid code signing issues
iosdevzone Sep 24, 2016
d9f9743
[GitHub #28] Only turn on code coverage in debug mode.
iosdevzone Sep 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.1
osx_image: xcode7.3
install:
- npm install -g playground

Expand All @@ -13,12 +13,6 @@ before_install:
script:
- echo Available SDKs
- xcodebuild -showsdks
- make
- rm -rf CommonCrypto
- ./GenerateCommonCryptoModule iphonesimulator9.0 .
- cat CommonCrypto/module.map
- pwd
- make build
- make test
- make all

after_success: bundle exec slather coverage --input-format profdata IDZSwiftCommonCrypto.xcodeproj
5 changes: 3 additions & 2 deletions IDZSwiftCommonCrypto.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -984,8 +985,8 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks/$(PLATFORM_NAME)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
GCC_GENERATE_TEST_COVERAGE_FILES = NO;
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand Down
2 changes: 1 addition & 1 deletion IDZSwiftCommonCryptoTests/IDZSwiftCommonCryptoTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class IDZSwiftCommonCryptoTests: XCTestCase {

let key = arrayFromHexString("0101010101010101")

for var i = 0; i < ivs.count; ++i {
for i in 0 ..< ivs.count {
let iv = arrayFromHexString(ivs[i])
let cipherText = Cryptor(operation:.Encrypt, algorithm:.DES, options:.ECBMode, key:key, iv:Array<UInt8>()).update(arrayFromHexString(ivs[i]))?.final()
print("\"\(hexStringFromArray(cipherText!))\", // [\(i)]")
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RSRC_DIR=$(PG)/Resources

XC=xcodebuild
XCPP=xcpretty
CS_FLAGS=CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

$(PG): README.md
playground README.md -p ios
Expand All @@ -16,10 +17,10 @@ $(PG): README.md
git config --global push.default simple
git diff-files --exit-code; if [[ "$?" == "1" ]]; then git commit -a -m "Playground update from Travis [ci skip]"; git push; fi
all:
$(XC) build -target "IDZSwiftCommonCrypto (iOS)" | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (OSX)" | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (tvOS)" | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (watchOS)" | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (iOS)" $(CS_FLAGS) | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (OSX)" $(CS_FLAGS) | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (tvOS)" $(CS_FLAGS) | xcpretty
$(XC) build -target "IDZSwiftCommonCrypto (watchOS)" $(CS_FLAGS) | xcpretty
$(XC) test -scheme "IDZSwiftCommonCrypto (iOS)" -destination 'platform=iOS Simulator,name=iPhone 6' | xcpretty
$(XC) test -scheme "IDZSwiftCommonCrypto (OSX)" | xcpretty
$(XC) test -scheme "IDZSwiftCommonCrypto (tvOS)" -destination 'platform=tvOS Simulator,name=Apple TV 1080p'| xcpretty
Expand Down