Skip to content

fix ios11, update test enviroment #317

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

Closed
ronhippler wants to merge 2 commits into from
Closed

fix ios11, update test enviroment #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2d8790
fix ios11, update test environment
ronhippler Oct 25, 2017
b46146d
Merge branch 'master' into master
marcuswestin Nov 8, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: objective-c
osx_image: xcode8.2
osx_image: xcode9.0
script:
- make test-travis-ci
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec
Copyright (c) 2011-2017 Marcus Westin, Antoine Lagadec

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
14 changes: 6 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
test:
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
-destination 'platform=iOS Simulator,name=iPhone 7'
-destination 'platform=iOS Simulator,name=iPhone 8'
xcodebuild test -workspace Example\ Apps/ExampleSwiftApp-iOS/ExampleSwiftApp-iOS.xcworkspace -scheme ExampleSwiftApp-iOS \
-destination 'platform=iOS Simulator,name=iPhone 7'
-destination 'platform=iOS Simulator,name=iPhone 8'

test-travis-ci:
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
-destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \
-destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3' \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.1'
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0.1'

test-circle-ci:
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
-destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
-destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0.1'


publish-pod:
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
xcode:
version: 8.2
version: 9.0
# dependencies:
# override:
# - brew install kylef/formulae/swiftenv
Expand Down