Skip to content

Commit f407ba3

Browse files
committed
Travis fix.
1 parent 76b10ba commit f407ba3

File tree

6 files changed

+28
-10
lines changed

6 files changed

+28
-10
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.0.1

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ matrix:
44
env: ACTION=iOS
55

66
language: objective-c
7-
osx_image: xcode8
7+
osx_image: xcode9.1
88

99
script:
1010
- git submodule update --init --recursive

ReusableView.xcodeproj/project.pbxproj

+17-5
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
attributes = {
352352
LastSwiftMigration = 0700;
353353
LastSwiftUpdateCheck = 0730;
354-
LastUpgradeCheck = 0800;
354+
LastUpgradeCheck = 0910;
355355
ORGANIZATIONNAME = "Artem Antihevich";
356356
TargetAttributes = {
357357
C089D3261D54A3BF00599DD7 = {
@@ -582,14 +582,20 @@
582582
ALWAYS_SEARCH_USER_PATHS = NO;
583583
CLANG_ENABLE_MODULES = YES;
584584
CLANG_ENABLE_OBJC_ARC = YES;
585+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
585586
CLANG_WARN_BOOL_CONVERSION = YES;
587+
CLANG_WARN_COMMA = YES;
586588
CLANG_WARN_CONSTANT_CONVERSION = YES;
587589
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
588590
CLANG_WARN_EMPTY_BODY = YES;
589591
CLANG_WARN_ENUM_CONVERSION = YES;
590592
CLANG_WARN_INFINITE_RECURSION = YES;
591593
CLANG_WARN_INT_CONVERSION = YES;
594+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
595+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
592596
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
597+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
598+
CLANG_WARN_STRICT_PROTOTYPES = YES;
593599
CLANG_WARN_SUSPICIOUS_MOVE = YES;
594600
CLANG_WARN_UNREACHABLE_CODE = YES;
595601
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -618,7 +624,7 @@
618624
ONLY_ACTIVE_ARCH = YES;
619625
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
620626
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
621-
SWIFT_VERSION = 3.0;
627+
SWIFT_VERSION = 4.0;
622628
TARGETED_DEVICE_FAMILY = "1,2";
623629
VERSIONING_SYSTEM = "apple-generic";
624630
};
@@ -630,14 +636,20 @@
630636
ALWAYS_SEARCH_USER_PATHS = NO;
631637
CLANG_ENABLE_MODULES = YES;
632638
CLANG_ENABLE_OBJC_ARC = YES;
639+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
633640
CLANG_WARN_BOOL_CONVERSION = YES;
641+
CLANG_WARN_COMMA = YES;
634642
CLANG_WARN_CONSTANT_CONVERSION = YES;
635643
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
636644
CLANG_WARN_EMPTY_BODY = YES;
637645
CLANG_WARN_ENUM_CONVERSION = YES;
638646
CLANG_WARN_INFINITE_RECURSION = YES;
639647
CLANG_WARN_INT_CONVERSION = YES;
648+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
649+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
640650
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
651+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
652+
CLANG_WARN_STRICT_PROTOTYPES = YES;
641653
CLANG_WARN_SUSPICIOUS_MOVE = YES;
642654
CLANG_WARN_UNREACHABLE_CODE = YES;
643655
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -659,7 +671,7 @@
659671
METAL_ENABLE_DEBUG_INFO = NO;
660672
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
661673
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
662-
SWIFT_VERSION = 3.0;
674+
SWIFT_VERSION = 4.0;
663675
TARGETED_DEVICE_FAMILY = "1,2";
664676
VALIDATE_PRODUCT = YES;
665677
VERSIONING_SYSTEM = "apple-generic";
@@ -686,7 +698,7 @@
686698
PRODUCT_NAME = "$(TARGET_NAME)";
687699
SDKROOT = iphoneos;
688700
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
689-
SWIFT_VERSION = 3.0;
701+
SWIFT_VERSION = 4.0;
690702
};
691703
name = Debug;
692704
};
@@ -710,7 +722,7 @@
710722
PRODUCT_BUNDLE_IDENTIFIER = mlsdev.AppRouterTests;
711723
PRODUCT_NAME = "$(TARGET_NAME)";
712724
SDKROOT = iphoneos;
713-
SWIFT_VERSION = 3.0;
725+
SWIFT_VERSION = 4.0;
714726
};
715727
name = Release;
716728
};

ReusableView.xcodeproj/xcshareddata/xcschemes/ReusableView.xcscheme

+3-1
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 = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

ReusableView.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -46,6 +47,7 @@
4647
buildConfiguration = "Debug"
4748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
language = ""
4951
launchStyle = "0"
5052
useCustomWorkingDirectory = "NO"
5153
ignoresPersistentStateOnLaunch = "NO"

ReusableView.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,6 +10,7 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
language = ""
1314
shouldUseLaunchSchemeArgsEnv = "YES">
1415
<Testables>
1516
<TestableReference
@@ -30,6 +31,7 @@
3031
buildConfiguration = "Debug"
3132
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3233
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
language = ""
3335
launchStyle = "0"
3436
useCustomWorkingDirectory = "NO"
3537
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)