Skip to content

Commit

Permalink
Merge pull request #10 from dmiedema/Swift4_Cleanup
Browse files Browse the repository at this point in the history 
Cleanup projects for Swift 4
  • Loading branch information
@bsneed
bsneed authored Sep 6, 2018
2 parents 5607619 + 83dab02 commit e971fba
Show file tree
Hide file tree
Showing 29 changed files with 281 additions and 455 deletions.
38 changes: 32 additions & 6 deletions Modules/ELCLI/ELCLI.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
CA7E8CEE1C529DBC00B8E125 /* ELFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA7E8CE21C529D6400B8E125 /* ELFoundation.framework */; };
C1FD87C22141A70C00B42D9B /* ELFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA7E8CE61C529D6400B8E125 /* ELFoundation.framework */; };
CA8CD5881B7BBF8100DA8BF7 /* CommitCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA8CD5871B7BBF8100DA8BF7 /* CommitCommand.swift */; };
CA8CD58A1B7D1A2A00DA8BF7 /* VersionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA977321B66AD330068AB25 /* VersionCommand.swift */; };
CA8CD58C1B7D1C1D00DA8BF7 /* Output.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA8CD58B1B7D1C1D00DA8BF7 /* Output.swift */; };
Expand Down Expand Up @@ -84,7 +84,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CA7E8CEE1C529DBC00B8E125 /* ELFoundation.framework in Frameworks */,
C1FD87C22141A70C00B42D9B /* ELFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -99,6 +99,13 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
C1FD87C12141A70C00B42D9B /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
CA7E8CDB1C529D6400B8E125 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -133,6 +140,7 @@
CAA977111B66A10F0068AB25 /* ELCLI */,
CAA9771E1B66A10F0068AB25 /* ELCLITests */,
CAA977101B66A10F0068AB25 /* Products */,
C1FD87C12141A70C00B42D9B /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -255,12 +263,12 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = WalmartLabs;
TargetAttributes = {
CAA9770E1B66A10F0068AB25 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
CAA977191B66A10F0068AB25 = {
CreatedOnToolsVersion = 6.4;
Expand Down Expand Up @@ -382,14 +390,22 @@
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;
Expand Down Expand Up @@ -431,14 +447,22 @@
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;
Expand Down Expand Up @@ -481,7 +505,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0.1;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -501,7 +526,8 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.walmartlabs.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0.1;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
10 changes: 5 additions & 5 deletions Modules/ELCLI/ELCLI/CLI.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ open class CLI {
return 0
}

open let appName: String
open let appVersion: String
open let appDescription: String
open let executableName: String
public let appName: String
public let appVersion: String
public let appDescription: String
public let executableName: String

open var allArgumentsToExecutable: Array<String>? = nil

Expand Down Expand Up @@ -145,7 +145,7 @@ open class CLI {
if arg.hasPrefix(optionFlag + "=") {
// is this a "--flag=value" type argument?
// if so, break it into its parts.
let parts = arg.characters.split(maxSplits: 1, omittingEmptySubsequences: true, whereSeparator: { return $0 == "=" })
let parts = arg.split(maxSplits: 1, omittingEmptySubsequences: true, whereSeparator: { return $0 == "=" })
if parts.count == 2 {
optionFlag = String(parts[0])
value = String(parts[1])
Expand Down
4 changes: 2 additions & 2 deletions Modules/ELCLI/ELCLI/Output.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ public func printOption(_ option: Option) {

let usageData = option.usage!

if flagData.characters.count > 26 {
if flagData.count > 26 {
flagData += "\n"
flagData += usageData.padFront(27 + usageData.characters.count)
flagData += usageData.padFront(27 + usageData.count)
} else {
flagData += " " + usageData
}
Expand Down
37 changes: 32 additions & 5 deletions Modules/ELCodable/ELCodable.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = WalmartLabs;
TargetAttributes = {
CA0C9F151BF4AD08006459C7 = {
Expand All @@ -347,7 +347,7 @@
};
CAE55BFD1D13A61900411727 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
CAE55C061D13A61A00411727 = {
CreatedOnToolsVersion = 7.3.1;
Expand Down Expand Up @@ -486,14 +486,22 @@
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;
Expand Down Expand Up @@ -536,14 +544,22 @@
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;
Expand Down Expand Up @@ -655,7 +671,8 @@
PRODUCT_NAME = ELCodable;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -678,7 +695,8 @@
PRODUCT_NAME = ELCodable;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = QADeployment;
};
Expand All @@ -701,7 +719,8 @@
PRODUCT_NAME = ELCodable;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down Expand Up @@ -758,14 +777,22 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/ELCodable/ELCodable.xcodeproj/xcshareddata/xcschemes/ELCodable.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit e971fba

Please sign in to comment.