Skip to content

Commit 2333455

Browse files
committed
Upgrade xcode settings, and remove old travis settings
1 parent 7383367 commit 2333455

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
test:
22
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
3-
-destination 'platform=iOS Simulator,name=iPhone 7'
3+
-destination 'platform=iOS Simulator,name=iPhone 8'
44
xcodebuild test -workspace Example\ Apps/ExampleSwiftApp-iOS/ExampleSwiftApp-iOS.xcworkspace -scheme ExampleSwiftApp-iOS \
5-
-destination 'platform=iOS Simulator,name=iPhone 7'
6-
7-
test-travis-ci:
8-
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
9-
-destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \
10-
-destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3' \
11-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.1'
5+
-destination 'platform=iOS Simulator,name=iPhone 8'
126

137
test-circle-ci:
148
xcodebuild test -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge \
159
-destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.4' \
1610
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
17-
-destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
11+
-destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1' \
12+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.0'
1813

1914

2015
publish-pod:

Tests/WebViewJavascriptBridge.xcodeproj/project.pbxproj

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@
205205
3D0FE4621AE2886400BB4104 /* Project object */ = {
206206
isa = PBXProject;
207207
attributes = {
208-
LastUpgradeCheck = 0820;
208+
LastUpgradeCheck = 0900;
209209
ORGANIZATIONNAME = marcuswestin;
210210
TargetAttributes = {
211211
3D0FE4741AE2886500BB4104 = {
212212
CreatedOnToolsVersion = 6.3;
213-
LastSwiftMigration = 0820;
213+
LastSwiftMigration = 0900;
214214
TestTargetID = 3DCCF7D51AE28C2900CE7C51;
215215
};
216216
3DCCF7D51AE28C2900CE7C51 = {
@@ -298,14 +298,20 @@
298298
CLANG_CXX_LIBRARY = "libc++";
299299
CLANG_ENABLE_MODULES = YES;
300300
CLANG_ENABLE_OBJC_ARC = YES;
301+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
301302
CLANG_WARN_BOOL_CONVERSION = YES;
303+
CLANG_WARN_COMMA = YES;
302304
CLANG_WARN_CONSTANT_CONVERSION = YES;
303305
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
304306
CLANG_WARN_EMPTY_BODY = YES;
305307
CLANG_WARN_ENUM_CONVERSION = YES;
306308
CLANG_WARN_INFINITE_RECURSION = YES;
307309
CLANG_WARN_INT_CONVERSION = YES;
310+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
311+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
308312
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
313+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
314+
CLANG_WARN_STRICT_PROTOTYPES = YES;
309315
CLANG_WARN_SUSPICIOUS_MOVE = YES;
310316
CLANG_WARN_UNREACHABLE_CODE = YES;
311317
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -343,14 +349,20 @@
343349
CLANG_CXX_LIBRARY = "libc++";
344350
CLANG_ENABLE_MODULES = YES;
345351
CLANG_ENABLE_OBJC_ARC = YES;
352+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
346353
CLANG_WARN_BOOL_CONVERSION = YES;
354+
CLANG_WARN_COMMA = YES;
347355
CLANG_WARN_CONSTANT_CONVERSION = YES;
348356
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
349357
CLANG_WARN_EMPTY_BODY = YES;
350358
CLANG_WARN_ENUM_CONVERSION = YES;
351359
CLANG_WARN_INFINITE_RECURSION = YES;
352360
CLANG_WARN_INT_CONVERSION = YES;
361+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
362+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
353363
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
364+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
365+
CLANG_WARN_STRICT_PROTOTYPES = YES;
354366
CLANG_WARN_SUSPICIOUS_MOVE = YES;
355367
CLANG_WARN_UNREACHABLE_CODE = YES;
356368
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -390,7 +402,8 @@
390402
PRODUCT_NAME = "$(TARGET_NAME)";
391403
SWIFT_OBJC_BRIDGING_HEADER = "WebViewJavascriptBridgeTests/WebViewJavascriptBridgeTests-Bridging-Header.h";
392404
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
393-
SWIFT_VERSION = 3.0;
405+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
406+
SWIFT_VERSION = 4.0;
394407
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebViewJavascriptBridgeTestHost.app/WebViewJavascriptBridgeTestHost";
395408
};
396409
name = Debug;
@@ -406,7 +419,8 @@
406419
PRODUCT_BUNDLE_IDENTIFIER = "in.marcuswestin.WebViewJavascriptBridge.$(PRODUCT_NAME:rfc1034identifier)";
407420
PRODUCT_NAME = "$(TARGET_NAME)";
408421
SWIFT_OBJC_BRIDGING_HEADER = "WebViewJavascriptBridgeTests/WebViewJavascriptBridgeTests-Bridging-Header.h";
409-
SWIFT_VERSION = 3.0;
422+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
423+
SWIFT_VERSION = 4.0;
410424
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebViewJavascriptBridgeTestHost.app/WebViewJavascriptBridgeTestHost";
411425
};
412426
name = Release;

Tests/WebViewJavascriptBridge.xcodeproj/xcshareddata/xcschemes/WebViewJavascriptBridge.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)