Merge pull request #35 from iosdevzone/Xcode-7.3.1-7D1014

Travis build, coverage and deprecated code.

Author: iosdevzone

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.3
 install:
 - npm install -g playground
 
@@ -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

IDZSwiftCommonCrypto.xcodeproj/project.pbxproj

@@ -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;
@@ -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;

IDZSwiftCommonCryptoTests/IDZSwiftCommonCryptoTests.swift

@@ -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)]")

Makefile

@@ -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 
@@ -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