Update to Swift 4.1

Cartfile.resolved

@@ -1 +1 @@
-github "soffes/X" "v0.3.1"
+github "soffes/X" "v0.4.0"

SyntaxKit.xcodeproj/project.pbxproj

@@ -84,7 +84,6 @@
  2198CEDA1B36D5DE00BD463F /* ResultSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 211989941B2EC38B00F0D786 /* ResultSet.swift */; };
  2198CEDB1B36D5DE00BD463F /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 211989961B2EC38B00F0D786 /* Theme.swift */; };
  2198CEDC1B36D5E100BD463F /* SyntaxKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 211989951B2EC38B00F0D786 /* SyntaxKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 21F28DDB1B7AC7F8009DD1E9 /* X.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F28DDA1B7AC7F8009DD1E9 /* X.framework */; };
  21F28DDD1B7AC802009DD1E9 /* X.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F28DDC1B7AC802009DD1E9 /* X.framework */; };
  21F28DDF1B7AC80B009DD1E9 /* X.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21F28DDE1B7AC80B009DD1E9 /* X.framework */; };
  92EC79D41CC9060600E058ED /* JavaScript.tmLanguage in Resources */ = {isa = PBXBuildFile; fileRef = 92EC79D31CC9060600E058ED /* JavaScript.tmLanguage */; };
@@ -212,7 +211,6 @@
  isa = PBXFrameworksBuildPhase;
  buildActionMask = 2147483647;
  files = (
- 21F28DDB1B7AC7F8009DD1E9 /* X.framework in Frameworks */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
@@ -555,7 +553,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0730;
- LastUpgradeCheck = 0700;
+ LastUpgradeCheck = 0930;
  ORGANIZATIONNAME = "Sam Soffes";
  TargetAttributes = {
  211826D91D257A71003F2BF2 = {
@@ -566,9 +564,11 @@
  };
  211989A61B2EC3B600F0D786 = {
  CreatedOnToolsVersion = 7.0;
+ DevelopmentTeam = GEA92R6RK9;
  };
  211989AF1B2EC3B600F0D786 = {
  CreatedOnToolsVersion = 7.0;
+ DevelopmentTeam = GEA92R6RK9;
  };
  2122A6DD1B22B9320006409B = {
  CreatedOnToolsVersion = 6.3.2;
@@ -798,6 +798,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  CLANG_ANALYZER_NONNULL = YES;
+ CODE_SIGN_IDENTITY = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -822,6 +823,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  CLANG_ANALYZER_NONNULL = YES;
+ CODE_SIGN_IDENTITY = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -883,8 +885,10 @@
  211989B91B2EC3B600F0D786 /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ CODE_SIGN_IDENTITY = "";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  DEFINES_MODULE = YES;
+ DEVELOPMENT_TEAM = GEA92R6RK9;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -894,7 +898,7 @@
  );
  INFOPLIST_FILE = "$(SRCROOT)/SyntaxKit/Resources/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.syntaxkit;
  PRODUCT_NAME = SyntaxKit;
@@ -907,8 +911,10 @@
  211989BA1B2EC3B600F0D786 /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ CODE_SIGN_IDENTITY = "";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  DEFINES_MODULE = YES;
+ DEVELOPMENT_TEAM = GEA92R6RK9;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -918,7 +924,7 @@
  );
  INFOPLIST_FILE = "$(SRCROOT)/SyntaxKit/Resources/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.syntaxkit;
  PRODUCT_NAME = SyntaxKit;
@@ -934,12 +940,13 @@
  buildSettings = {
  APPLICATION_EXTENSION_API_ONLY = NO;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ DEVELOPMENT_TEAM = GEA92R6RK9;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Carthage/Build/iOS",
  );
  INFOPLIST_FILE = SyntaxKit/Tests/Resources/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "com.samsoffes.syntaxkit-ios.tests";
  PRODUCT_NAME = "$(TARGET_NAME)";
@@ -952,12 +959,13 @@
  buildSettings = {
  APPLICATION_EXTENSION_API_ONLY = NO;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ DEVELOPMENT_TEAM = GEA92R6RK9;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Carthage/Build/iOS",
  );
  INFOPLIST_FILE = SyntaxKit/Tests/Resources/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "com.samsoffes.syntaxkit-ios.tests";
  PRODUCT_NAME = "$(TARGET_NAME)";
@@ -975,13 +983,23 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  COPY_PHASE_STRIP = NO;
@@ -1004,12 +1022,13 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  MACOSX_DEPLOYMENT_TARGET = 10.9;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = macosx;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 4.0;
  VERSIONING_SYSTEM = "apple-generic";
  VERSION_INFO_PREFIX = "";
  };
@@ -1024,13 +1043,23 @@
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
  CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
  CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  COPY_PHASE_STRIP = NO;
@@ -1046,10 +1075,12 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
  MACOSX_DEPLOYMENT_TARGET = 10.9;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = macosx;
+ SWIFT_COMPILATION_MODE = wholemodule;
+ SWIFT_VERSION = 4.0;
  VERSIONING_SYSTEM = "apple-generic";
  VERSION_INFO_PREFIX = "";
  };
@@ -1058,13 +1089,13 @@
  2122A6F51B22B9320006409B /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  CLANG_ENABLE_MODULES = YES;
  COMBINE_HIDPI_IMAGES = YES;
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  DYLIB_INSTALL_NAME_BASE = "@rpath";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -1083,13 +1114,13 @@
  2122A6F61B22B9320006409B /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  CLANG_ENABLE_MODULES = YES;
  COMBINE_HIDPI_IMAGES = YES;
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  DYLIB_INSTALL_NAME_BASE = "@rpath";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
  FRAMEWORK_SEARCH_PATHS = (
  "$(inherited)",
  "$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -1145,6 +1176,7 @@
  2198CECF1B36D5D700BD463F /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ CODE_SIGN_IDENTITY = "";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1169,6 +1201,7 @@
  2198CED01B36D5D700BD463F /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ CODE_SIGN_IDENTITY = "";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1201,6 +1234,7 @@
  211826ED1D257A71003F2BF2 /* Release */,
  );
  defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
  };
  211826EE1D257A71003F2BF2 /* Build configuration list for PBXNativeTarget "SyntaxKitTests-tvOS" */ = {
  isa = XCConfigurationList;
@@ -1209,6 +1243,7 @@
  211826F01D257A71003F2BF2 /* Release */,
  );
  defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
  };
  211989B81B2EC3B600F0D786 /* Build configuration list for PBXNativeTarget "SyntaxKit-iOS" */ = {
  isa = XCConfigurationList;

SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-shouldUseLaunchSchemeArgsEnv = "YES"
-codeCoverageEnabled = "YES">
+codeCoverageEnabled = "YES"
+shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
  skipped = "NO">

SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
  buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-shouldUseLaunchSchemeArgsEnv = "YES"
-codeCoverageEnabled = "YES">
+codeCoverageEnabled = "YES"
+shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  <TestableReference
  skipped = "NO">

SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0730"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "211826D91D257A71003F2BF2"
- BuildableName = "SyntaxKit-tvOS.framework"
+ BuildableName = "SyntaxKit.framework"
  BlueprintName = "SyntaxKit-tvOS"
  ReferencedContainer = "container:SyntaxKit.xcodeproj">
  </BuildableReference>
@@ -33,7 +33,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "211826E21D257A71003F2BF2"
- BuildableName = "SyntaxKitTests-tvOS.xctest"
+ BuildableName = "SyntaxKitTests.xctest"
  BlueprintName = "SyntaxKitTests-tvOS"
  ReferencedContainer = "container:SyntaxKit.xcodeproj">
  </BuildableReference>
@@ -43,7 +43,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "211826D91D257A71003F2BF2"
- BuildableName = "SyntaxKit-tvOS.framework"
+ BuildableName = "SyntaxKit.framework"
  BlueprintName = "SyntaxKit-tvOS"
  ReferencedContainer = "container:SyntaxKit.xcodeproj">
  </BuildableReference>
@@ -65,7 +65,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "211826D91D257A71003F2BF2"
- BuildableName = "SyntaxKit-tvOS.framework"
+ BuildableName = "SyntaxKit.framework"
  BlueprintName = "SyntaxKit-tvOS"
  ReferencedContainer = "container:SyntaxKit.xcodeproj">
  </BuildableReference>
@@ -83,7 +83,7 @@
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "211826D91D257A71003F2BF2"
- BuildableName = "SyntaxKit-tvOS.framework"
+ BuildableName = "SyntaxKit.framework"
  BlueprintName = "SyntaxKit-tvOS"
  ReferencedContainer = "container:SyntaxKit.xcodeproj">
  </BuildableReference>

SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0700"
+ LastUpgradeVersion = "0930"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"