Skip to content

Commit

Permalink
Update Project settings to recommend settings
Browse files Browse the repository at this point in the history
  • Loading branch information
wongzigii committed Feb 19, 2017
1 parent 77af21c commit f936cbb
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 15 deletions.
96 changes: 88 additions & 8 deletions Alamofire-SwiftyJSON.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,34 @@
remoteGlobalIDString = E4D7CCE81B9465A700EE7221;
remoteInfo = "SwiftyJSON watchOS";
};
A81D16431E59E90500C62C5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4CF626EF1BA7CB3E0011A099;
remoteInfo = "Alamofire tvOS";
};
A81D16451E59E90500C62C5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 4CF626F81BA7CB3E0011A099;
remoteInfo = "Alamofire tvOS Tests";
};
A81D164D1E59E90500C62C5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7236B4F61BAC14150020529B;
remoteInfo = "SwiftyJSON tvOS";
};
A81D164F1E59E90500C62C5F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A8580F741BCF5C5B00DA927B;
remoteInfo = "SwiftyJSON tvOS Tests";
};
A8A2DBB61A23290100AF9EFC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
Expand Down Expand Up @@ -242,10 +270,12 @@
isa = PBXGroup;
children = (
A8AFB75A19D14A5C0070765E /* Alamofire.framework */,
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */,
4BC5E9FA1BB7E15600A393DD /* Alamofire.framework */,
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */,
A81D16441E59E90500C62C5F /* Alamofire.framework */,
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */,
4BC5E9FC1BB7E15600A393DD /* Alamofire.framework */,
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */,
4BC5E9FE1BB7E15600A393DD /* Alamofire OSX Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -254,10 +284,12 @@
isa = PBXGroup;
children = (
A8AFB76519D14A670070765E /* SwiftyJSON.framework */,
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */,
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */,
4BC5EA041BB7E15600A393DD /* SwiftyJSON.framework */,
4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */,
4BC5EA081BB7E15600A393DD /* SwiftyJSON.framework */,
A81D164E1E59E90500C62C5F /* SwiftyJSON.framework */,
A81D16501E59E90500C62C5F /* SwiftyJSON tvOS Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -325,14 +357,16 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0600;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = SwiftJSON;
TargetAttributes = {
A8AFB70E19D1401D0070765E = {
CreatedOnToolsVersion = 6.0.1;
LastSwiftMigration = 0820;
};
A8AFB71919D1401D0070765E = {
CreatedOnToolsVersion = 6.0.1;
LastSwiftMigration = 0820;
};
};
};
Expand Down Expand Up @@ -379,10 +413,10 @@
remoteRef = 4BC5E9FB1BB7E15600A393DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
4BC5E9FE1BB7E15600A393DD /* Alamofire OSX Tests.xctest */ = {
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Alamofire OSX Tests.xctest";
path = "Alamofire macOS Tests.xctest";
remoteRef = 4BC5E9FD1BB7E15600A393DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand All @@ -407,14 +441,42 @@
remoteRef = 4BC5EA071BB7E15600A393DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A81D16441E59E90500C62C5F /* Alamofire.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Alamofire.framework;
remoteRef = A81D16431E59E90500C62C5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Alamofire tvOS Tests.xctest";
remoteRef = A81D16451E59E90500C62C5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A81D164E1E59E90500C62C5F /* SwiftyJSON.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SwiftyJSON.framework;
remoteRef = A81D164D1E59E90500C62C5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A81D16501E59E90500C62C5F /* SwiftyJSON tvOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftyJSON tvOS Tests.xctest";
remoteRef = A81D164F1E59E90500C62C5F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A8AFB75A19D14A5C0070765E /* Alamofire.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Alamofire.framework;
remoteRef = A8AFB75919D14A5C0070765E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */ = {
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Alamofire iOS Tests.xctest";
Expand All @@ -428,7 +490,7 @@
remoteRef = A8AFB76419D14A670070765E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */ = {
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "SwiftyJSON iOS Tests.xctest";
Expand Down Expand Up @@ -515,16 +577,20 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -561,8 +627,10 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -571,6 +639,7 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -580,6 +649,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -590,30 +660,36 @@
A8AFB72319D1401D0070765E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
A8AFB72419D1401D0070765E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -630,7 +706,9 @@
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -643,7 +721,9 @@
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:Alamofire-SwiftyJSON.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down

0 comments on commit f936cbb

Please sign in to comment.