Skip to content

Commit e1ee236

Browse files
author
Martin Barreto
authored
Add Swift 4 support (#79)
1 parent 28fb2d7 commit e1ee236

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+159
-281
lines changed

‎.swift-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: swift
2-
osx_image: xcode8.3
2+
osx_image: xcode9
33
env:
44
matrix:
5-
- DESTINATION="OS=10.0,name=iPhone 7" SCHEME="MetalBender" SDK=iphonesimulator10.3
6-
- DESTINATION="generic/platform=iOS" SCHEME="MetalBender" SDK=iphoneos10.3
7-
- DESTINATION="OS=10.0,name=iPhone 7" SCHEME="Example" SDK=iphonesimulator10.3
8-
- DESTINATION="generic/platform=iOS" SCHEME="Example" SDK=iphoneos10.3
5+
- DESTINATION="OS=11.0,name=iPhone 8" SCHEME="MetalBender" SDK=iphonesimulator
6+
- DESTINATION="generic/platform=iOS" SCHEME="MetalBender" SDK=iphoneos
7+
- DESTINATION="OS=11.0,name=iPhone 8" SCHEME="Example" SDK=iphonesimulator
8+
- DESTINATION="generic/platform=iOS" SCHEME="Example" SDK=iphoneos
99
before_install:
1010
- brew update
1111
- brew outdated carthage || brew upgrade carthage

‎Bender.xcodeproj/project.pbxproj

+17-3
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
isa = PBXProject;
441441
attributes = {
442442
LastSwiftUpdateCheck = 0720;
443-
LastUpgradeCheck = 0800;
443+
LastUpgradeCheck = 0900;
444444
TargetAttributes = {
445445
28F8287C1C494B2C00330CF4 = {
446446
CreatedOnToolsVersion = 7.2;
@@ -568,14 +568,20 @@
568568
CLANG_CXX_LIBRARY = "libc++";
569569
CLANG_ENABLE_MODULES = YES;
570570
CLANG_ENABLE_OBJC_ARC = YES;
571+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
571572
CLANG_WARN_BOOL_CONVERSION = YES;
573+
CLANG_WARN_COMMA = YES;
572574
CLANG_WARN_CONSTANT_CONVERSION = YES;
573575
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
574576
CLANG_WARN_EMPTY_BODY = YES;
575577
CLANG_WARN_ENUM_CONVERSION = YES;
576578
CLANG_WARN_INFINITE_RECURSION = YES;
577579
CLANG_WARN_INT_CONVERSION = YES;
580+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
581+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
578582
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
583+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
584+
CLANG_WARN_STRICT_PROTOTYPES = YES;
579585
CLANG_WARN_SUSPICIOUS_MOVE = YES;
580586
CLANG_WARN_UNREACHABLE_CODE = YES;
581587
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -604,6 +610,7 @@
604610
ONLY_ACTIVE_ARCH = YES;
605611
SDKROOT = iphoneos;
606612
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
613+
SWIFT_VERSION = 4.0;
607614
TARGETED_DEVICE_FAMILY = "1,2";
608615
VERSIONING_SYSTEM = "apple-generic";
609616
VERSION_INFO_PREFIX = "";
@@ -618,14 +625,20 @@
618625
CLANG_CXX_LIBRARY = "libc++";
619626
CLANG_ENABLE_MODULES = YES;
620627
CLANG_ENABLE_OBJC_ARC = YES;
628+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
621629
CLANG_WARN_BOOL_CONVERSION = YES;
630+
CLANG_WARN_COMMA = YES;
622631
CLANG_WARN_CONSTANT_CONVERSION = YES;
623632
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
624633
CLANG_WARN_EMPTY_BODY = YES;
625634
CLANG_WARN_ENUM_CONVERSION = YES;
626635
CLANG_WARN_INFINITE_RECURSION = YES;
627636
CLANG_WARN_INT_CONVERSION = YES;
637+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
638+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
628639
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
640+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
641+
CLANG_WARN_STRICT_PROTOTYPES = YES;
629642
CLANG_WARN_SUSPICIOUS_MOVE = YES;
630643
CLANG_WARN_UNREACHABLE_CODE = YES;
631644
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -647,6 +660,7 @@
647660
MTL_ENABLE_DEBUG_INFO = NO;
648661
SDKROOT = iphoneos;
649662
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
663+
SWIFT_VERSION = 4.0;
650664
TARGETED_DEVICE_FAMILY = "1,2";
651665
VALIDATE_PRODUCT = YES;
652666
VERSIONING_SYSTEM = "apple-generic";
@@ -674,7 +688,7 @@
674688
PRODUCT_NAME = "$(TARGET_NAME)";
675689
SKIP_INSTALL = YES;
676690
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
677-
SWIFT_VERSION = 3.0;
691+
SWIFT_VERSION = 4.0;
678692
};
679693
name = Debug;
680694
};
@@ -697,7 +711,7 @@
697711
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Bender;
698712
PRODUCT_NAME = "$(TARGET_NAME)";
699713
SKIP_INSTALL = YES;
700-
SWIFT_VERSION = 3.0;
714+
SWIFT_VERSION = 4.0;
701715
};
702716
name = Release;
703717
};

‎Bender.xcodeproj/xcshareddata/xcschemes/MetalBender.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 = "0830"
3+
LastUpgradeVersion = "0900"
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
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Cartfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "apple/swift-protobuf" "0.9.904"
2-
github "xmartlabs/MetalPerformanceShadersProxy" ~> 0.1.5
1+
github "apple/swift-protobuf" "1.0.0"
2+
github "xmartlabs/MetalPerformanceShadersProxy" ~> 0.2.0

‎Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "apple/swift-protobuf" "0.9.904"
2-
github "xmartlabs/MetalPerformanceShadersProxy" "0.1.5"
1+
github "apple/swift-protobuf" "1.0.0"
2+
github "xmartlabs/MetalPerformanceShadersProxy" "0.2.0"

0 commit comments

Comments
 (0)