-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from PromiseKit/fix-swift5-warning
Xcode 10.2; Fix Swift 5 warning
- Loading branch information
Showing
5 changed files
with
95 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,79 @@ | ||
os: osx | ||
language: objective-c | ||
matrix: | ||
language: swift | ||
osx_image: xcode10.2 | ||
|
||
branches: | ||
only: | ||
- master | ||
stages: | ||
- lint | ||
- carthage | ||
- test | ||
jobs: | ||
include: | ||
- {osx_image: xcode8.3, env: 'SWFT=3.1 DST="OS=10.3.1,name=iPhone SE"'} | ||
- {osx_image: xcode9.2, env: 'SWFT=3.2 DST="OS=11.2,name=iPhone SE"'} | ||
- {osx_image: xcode9.4, env: 'SWFT=3.3 DST="OS=11.4,name=iPhone 5s"'} | ||
- {osx_image: xcode10, env: 'SWFT=3.4 DST="OS=12.0,name=iPhone SE"'} | ||
- {osx_image: xcode9.2, env: 'SWFT=4.0 DST="OS=11.2,name=iPhone SE"'} | ||
- {osx_image: xcode9.4, env: 'SWFT=4.1 DST="OS=11.4,name=iPhone 5s" TEST=1'} | ||
- {osx_image: xcode10, env: 'SWFT=4.2 DST="OS=12.0,name=iPhone SE"'} | ||
cache: | ||
directories: | ||
- Carthage | ||
before_install: | ||
- carthage bootstrap --cache-builds --no-use-binaries --platform iOS --verbose | ||
install: | ||
- xcodebuild -scheme PMKAddressBook -target PMKAddressBook -quiet -destination "$DST" SWIFT_VERSION=$SWFT SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build | ||
- if [[ $TEST == "1" ]]; then | ||
xcodebuild -scheme PMKAddressBook -target PMKABTests -quiet -destination "$DST" build; | ||
fi | ||
script: | ||
- if [[ $TEST == "1" ]]; then | ||
xcodebuild -scheme PMKAddressBook -quiet -destination "$DST" test; | ||
fi | ||
- &pod | ||
stage: lint | ||
osx_image: xcode8.3 | ||
env: SWIFT=3.1 | ||
before_install: | ||
gem install cocoapods --prerelease --version 1.7.0.beta.3 | ||
install: | ||
carthage bootstrap --no-build PromiseKit | ||
script: | | ||
cd Carthage/Checkouts/PromiseKit | ||
mv .github/PromiseKit.podspec . | ||
rm -rf Extensions/AddressBook/Sources | ||
cp -R ../../../Sources Extensions/AddressBook | ||
pod lib lint --subspec=PromiseKit/AddressBook --fail-fast --swift-version=$SWIFT | ||
- <<: *pod | ||
osx_image: xcode9.2 | ||
env: SWIFT=3.2 | ||
- <<: *pod | ||
osx_image: xcode9.4 | ||
env: SWIFT=3.3 | ||
- <<: *pod | ||
osx_image: xcode10.1 | ||
env: SWIFT=3.4 | ||
- <<: *pod | ||
osx_image: xcode9.2 | ||
env: SWIFT=4.0 | ||
- <<: *pod | ||
osx_image: xcode9.4 | ||
env: SWIFT=4.1 | ||
- <<: *pod | ||
osx_image: xcode10.1 | ||
env: SWIFT=4.2 | ||
# Fails at PromiseKit level currently | ||
# - <<: *pod | ||
# osx_image: xcode10.2 | ||
# env: SWIFT=4.3 | ||
# name: pod lib lint --swift-version=4.3 | ||
- <<: *pod | ||
osx_image: xcode10.2 | ||
env: SWIFT=5.0 | ||
|
||
- &carthage | ||
stage: carthage | ||
osx_image: xcode9.2 | ||
script: | ||
carthage bootstrap | ||
cache: | ||
directories: | ||
- Carthage | ||
- <<: *carthage | ||
osx_image: xcode9.4 | ||
- <<: *carthage | ||
osx_image: xcode10.1 | ||
- <<: *carthage | ||
osx_image: xcode10.2 | ||
|
||
- stage: test | ||
xcode_scheme: PMKAddressBook | ||
xcode_project: PMKAddressBook.xcodeproj | ||
xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE' | ||
cache: | ||
directories: | ||
- Carthage | ||
before_install: | | ||
carthage bootstrap --cache-builds --no-use-binaries --platform iOS | ||
sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
github "mxcl/PromiseKit" "6.3.3" | ||
github "mxcl/PromiseKit" "6.8.4" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
PMKAddressBook.xcodeproj/xcshareddata/xcschemes/PMKAddressBook.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters