From 89fb81f5797007f04ecf80c2bf846402bd6b7121 Mon Sep 17 00:00:00 2001 From: Scott Talbot Date: Mon, 21 Oct 2019 11:48:27 +1100 Subject: [PATCH 1/3] Update to Xcode 10.3 on Travis --- .travis.yml | 5 +++-- STSecurity.xcodeproj/project.pbxproj | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54e9fdc..fb8a546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ -osx_image: xcode8.2 +os: osx +osx_image: xcode10.3 language: objective-c xcode_project: STSecurity.xcodeproj xcode_sdk: iphonesimulator xcode_scheme: STSecurity env: - - TRAVIS_XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6,OS=9.3" + - TRAVIS_XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.4" branches: only: - master diff --git a/STSecurity.xcodeproj/project.pbxproj b/STSecurity.xcodeproj/project.pbxproj index 872193c..3771bf0 100644 --- a/STSecurity.xcodeproj/project.pbxproj +++ b/STSecurity.xcodeproj/project.pbxproj @@ -398,6 +398,10 @@ INFOPLIST_FILE = STSecurityTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.chikachow.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = STSecurityTests; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-objc-messaging-id", + ); }; name = Debug; }; @@ -408,6 +412,10 @@ INFOPLIST_FILE = STSecurityTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.chikachow.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = STSecurityTests; + WARNING_CFLAGS = ( + "$(inherited)", + "-Wno-objc-messaging-id", + ); }; name = Release; }; From 54b1b0ce636211aa229231bd934ea66dc8ea9d5a Mon Sep 17 00:00:00 2001 From: Scott Talbot Date: Mon, 21 Oct 2019 11:57:34 +1100 Subject: [PATCH 2/3] Remove TRAVIS_ prefix from environment variable --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb8a546..076223e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ xcode_project: STSecurity.xcodeproj xcode_sdk: iphonesimulator xcode_scheme: STSecurity env: - - TRAVIS_XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.4" + - XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.4" branches: only: - master before_script: - gem install xcpretty -script: set -o pipefail && xcodebuild test -project "${TRAVIS_XCODE_PROJECT}" -scheme "${TRAVIS_XCODE_SCHEME}" -sdk "${TRAVIS_XCODE_SDK}" -destination "${TRAVIS_XCODE_DESTINATION}" | xcpretty +script: set -o pipefail && xcodebuild test -project "${TRAVIS_XCODE_PROJECT}" -scheme "${TRAVIS_XCODE_SCHEME}" -sdk "${TRAVIS_XCODE_SDK}" -destination "${XCODE_DESTINATION}" | xcpretty From b37182d0f2fa3302bb0bd318c93b706d3e735038 Mon Sep 17 00:00:00 2001 From: Scott Talbot Date: Mon, 14 Oct 2019 08:23:34 +1100 Subject: [PATCH 3/3] Use SonarCloud --- .travis.yml | 21 +++++++++++++++++---- sonar-project.properties | 13 +++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 sonar-project.properties diff --git a/.travis.yml b/.travis.yml index 076223e..c8b42fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,24 @@ language: objective-c xcode_project: STSecurity.xcodeproj xcode_sdk: iphonesimulator xcode_scheme: STSecurity +addons: + sonarcloud: + organization: "cysp" + token: + secure: "nEmZnpgXh5Ba9tUCWLcyACYXQKG8XUEdWTMhFN4zJ8/gUCTdshYySWN6gd6sDLdfkCBNohrN1Xn0710jlNJWUiDBuz3hr2RnhAKOqwXbActW63BWRj9h1v8/AI2k7NkBL+/85l7+MbdP3mT43JOyNBq3GYZy/H132pR5phC62TA=" env: + global: + - secure: XqWY+wX6j83BGKYI4LFDFHPBv2R2d7MhECwk1y+CRC1y3EfYji8TTTIWR2VQZCgZwRvf8YNva5zWk6ET4BramXdij/zV+guDC9cc6c/ws/ekt4Eiy6UpD5ZoxLPtHSW1+92xa46/udCOfrTh8ODAUv4IDzz74/CYFC6+FqGYjGE= + jobs: - XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.4" branches: - only: - - master + only: + - master before_script: - - gem install xcpretty -script: set -o pipefail && xcodebuild test -project "${TRAVIS_XCODE_PROJECT}" -scheme "${TRAVIS_XCODE_SCHEME}" -sdk "${TRAVIS_XCODE_SDK}" -destination "${XCODE_DESTINATION}" | xcpretty +- gem install xcpretty +- brew install sonar-scanner +script: + - set -o pipefail && xcodebuild test -project "${TRAVIS_XCODE_PROJECT}" -scheme + "${TRAVIS_XCODE_SCHEME}" -sdk "${TRAVIS_XCODE_SDK}" -destination "${XCODE_DESTINATION}" + | xcpretty + - sonar-scanner diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..2617c13 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,13 @@ +sonar.projectKey=cysp_STSecurity +sonar.organization=cysp + +# this is the name and version displayed in the SonarCloud UI. +sonar.projectName=STSecurity +sonar.projectVersion=1.0 + +# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. +# This property is optional if sonar.modules is set. +sonar.sources=STSecurity + +# Encoding of the source code. Default is default system encoding +#sonar.sourceEncoding=UTF-8