Skip to content

Commit c227f94

Browse files
committed
Use Swift 4.1
1 parent a79999e commit c227f94

File tree

7 files changed

+195
-183
lines changed

7 files changed

+195
-183
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode9.3beta
33

44
env:
55
global:
66
- LC_CTYPE=en_US.UTF-8
77
- LANG=en_US.UTF-8
88
- WORKSPACE=ASCollectionView.xcworkspace
99
- SCHEME=ASCollectionView
10-
- SDK=iphonesimulator11.0
10+
- SDK=iphonesimulator11.3
1111
- RUN_TESTS="YES"
1212
- POD_LINT="NO"
1313
matrix:
14-
- DESTINATION="OS=11.0,name=iPhone 8"
14+
- DESTINATION="OS=11.3,name=iPhone 8"
1515
- DESTINATION="OS=10.3.1,name=iPhone 6"
1616

1717
before_install:

ASCollectionView.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
isa = PBXProject;
294294
attributes = {
295295
LastSwiftUpdateCheck = 0720;
296-
LastUpgradeCheck = 0900;
296+
LastUpgradeCheck = 0930;
297297
ORGANIZATIONNAME = "Abdullah Selek";
298298
TargetAttributes = {
299299
A453F7601C8205EE00A799E0 = {
@@ -545,12 +545,14 @@
545545
CLANG_WARN_BOOL_CONVERSION = YES;
546546
CLANG_WARN_COMMA = YES;
547547
CLANG_WARN_CONSTANT_CONVERSION = YES;
548+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
548549
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
549550
CLANG_WARN_EMPTY_BODY = YES;
550551
CLANG_WARN_ENUM_CONVERSION = YES;
551552
CLANG_WARN_INFINITE_RECURSION = YES;
552553
CLANG_WARN_INT_CONVERSION = YES;
553554
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
555+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
554556
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
555557
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
556558
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -600,12 +602,14 @@
600602
CLANG_WARN_BOOL_CONVERSION = YES;
601603
CLANG_WARN_COMMA = YES;
602604
CLANG_WARN_CONSTANT_CONVERSION = YES;
605+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
603606
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
604607
CLANG_WARN_EMPTY_BODY = YES;
605608
CLANG_WARN_ENUM_CONVERSION = YES;
606609
CLANG_WARN_INFINITE_RECURSION = YES;
607610
CLANG_WARN_INT_CONVERSION = YES;
608611
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
612+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
609613
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
610614
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
611615
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

ASCollectionView.xcodeproj/xcshareddata/xcschemes/ASCollectionView.xcscheme

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

ASCollectionView.xcodeproj/xcshareddata/xcschemes/ASCollectionViewFramework.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

ASCollectionView.xcodeproj/xcshareddata/xcschemes/ASCollectionViewTests.xcscheme

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,9 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
language = ""
14-
shouldUseLaunchSchemeArgsEnv = "YES"
15-
codeCoverageEnabled = "YES">
13+
codeCoverageEnabled = "YES"
14+
shouldUseLaunchSchemeArgsEnv = "YES">
1615
<Testables>
1716
<TestableReference
1817
skipped = "NO">
@@ -32,7 +31,6 @@
3231
buildConfiguration = "Debug"
3332
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3433
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
35-
language = ""
3634
launchStyle = "0"
3735
useCustomWorkingDirectory = "NO"
3836
ignoresPersistentStateOnLaunch = "NO"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)