Skip to content

Commit

Permalink
Swift 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@JARinteractive
JARinteractive committed Sep 14, 2017
1 parent b65d53b commit 4502081
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 115 deletions.
124 changes: 18 additions & 106 deletions ReLax/ReLax.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
4D72CD761E690A9A005D8769 /* ReLax.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D72CD6C1E690A99005D8769 /* ReLax.framework */; };
4D72CD7D1E690A9A005D8769 /* ReLax.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D72CD6F1E690A99005D8769 /* ReLax.h */; settings = {ATTRIBUTES = (Public, ); }; };
4D72CDAA1E690C1B005D8769 /* DataHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CD981E690C1B005D8769 /* DataHelpers.swift */; };
4D72CDAB1E690C1B005D8769 /* LCRLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CD991E690C1B005D8769 /* LCRLayer.swift */; };
Expand All @@ -30,21 +29,10 @@
4DD381971E6B7A0B003DCB3E /* CARHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD381961E6B7A0B003DCB3E /* CARHeader.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
4D72CD771E690A9A005D8769 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4D72CD631E690A99005D8769 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4D72CD6B1E690A99005D8769;
remoteInfo = ReLax;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4D72CD6C1E690A99005D8769 /* ReLax.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReLax.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4D72CD6F1E690A99005D8769 /* ReLax.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReLax.h; sourceTree = "<group>"; };
4D72CD701E690A99005D8769 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReLaxTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4D72CD981E690C1B005D8769 /* DataHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataHelpers.swift; sourceTree = "<group>"; };
4D72CD991E690C1B005D8769 /* LCRLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LCRLayer.swift; sourceTree = "<group>"; };
4D72CD9A1E690C1B005D8769 /* LCRLayeredImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LCRLayeredImage.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -74,14 +62,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
4D72CD721E690A9A005D8769 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4D72CD761E690A9A005D8769 /* ReLax.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -98,7 +78,6 @@
isa = PBXGroup;
children = (
4D72CD6C1E690A99005D8769 /* ReLax.framework */,
4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -187,44 +166,21 @@
productReference = 4D72CD6C1E690A99005D8769 /* ReLax.framework */;
productType = "com.apple.product-type.framework";
};
4D72CD741E690A9A005D8769 /* ReLaxTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4D72CD831E690A9A005D8769 /* Build configuration list for PBXNativeTarget "ReLaxTests" */;
buildPhases = (
4D72CD711E690A9A005D8769 /* Sources */,
4D72CD721E690A9A005D8769 /* Frameworks */,
4D72CD731E690A9A005D8769 /* Resources */,
);
buildRules = (
);
dependencies = (
4D72CD781E690A9A005D8769 /* PBXTargetDependency */,
);
name = ReLaxTests;
productName = ReLaxTests;
productReference = 4D72CD751E690A9A005D8769 /* ReLaxTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
4D72CD631E690A99005D8769 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = Asynchrony;
TargetAttributes = {
4D72CD6B1E690A99005D8769 = {
CreatedOnToolsVersion = 8.2;
LastSwiftMigration = 0820;
LastSwiftMigration = 0900;
ProvisioningStyle = Manual;
};
4D72CD741E690A9A005D8769 = {
CreatedOnToolsVersion = 8.2;
DevelopmentTeam = 9VPW79T9ZH;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 4D72CD661E690A99005D8769 /* Build configuration list for PBXProject "ReLax" */;
Expand All @@ -240,7 +196,6 @@
projectRoot = "";
targets = (
4D72CD6B1E690A99005D8769 /* ReLax */,
4D72CD741E690A9A005D8769 /* ReLaxTests */,
);
};
/* End PBXProject section */
Expand All @@ -257,13 +212,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
4D72CD731E690A9A005D8769 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -289,23 +237,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
4D72CD711E690A9A005D8769 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
4D72CD781E690A9A005D8769 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4D72CD6B1E690A99005D8769 /* ReLax */;
targetProxy = 4D72CD771E690A9A005D8769 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
4D72CD7E1E690A9A005D8769 /* Debug */ = {
isa = XCBuildConfiguration;
Expand All @@ -316,15 +249,21 @@
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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
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_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 @@ -370,15 +309,21 @@
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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
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_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 @@ -427,7 +372,8 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -451,38 +397,13 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
};
4D72CD841E690A9A005D8769 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = 9VPW79T9ZH;
INFOPLIST_FILE = ReLaxTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.ReLaxTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
4D72CD851E690A9A005D8769 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = 9VPW79T9ZH;
INFOPLIST_FILE = ReLaxTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.asynchrony.ReLaxTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -504,15 +425,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4D72CD831E690A9A005D8769 /* Build configuration list for PBXNativeTarget "ReLaxTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D72CD841E690A9A005D8769 /* Debug */,
4D72CD851E690A9A005D8769 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 4D72CD631E690A99005D8769 /* Project object */;
Expand Down
4 changes: 3 additions & 1 deletion ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.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 = "0820"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
29 changes: 23 additions & 6 deletions ReLaxExample/ReLaxExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,18 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = Asynchrony;
TargetAttributes = {
4D1CC1BB1E6DB9530056E465 = {
CreatedOnToolsVersion = 8.1;
DevelopmentTeam = 438VZ6GLSU;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
5AA998AC1CA98CBA00A66418 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0820;
LastSwiftMigration = 0900;
ProvisioningStyle = Manual;
};
};
Expand Down Expand Up @@ -365,7 +366,8 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
Expand All @@ -384,7 +386,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_PRODUCT = YES;
};
Expand All @@ -399,14 +402,20 @@
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_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_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 @@ -446,14 +455,20 @@
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_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_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 @@ -494,7 +509,8 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -516,7 +532,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
Expand Down
Loading

0 comments on commit 4502081

Please sign in to comment.