Преглед изворни кода

Rename testing framework, update to C++17.

Sam Jaffe пре 5 година
родитељ
комит
d20302b868

+ 1 - 1
logger_test/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>

+ 71 - 82
logger.xcodeproj/project.pbxproj

@@ -10,40 +10,33 @@
 		CD1CDE872252E5B900E5B6B2 /* properties.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE862252E5B900E5B6B2 /* properties.cxx */; };
 		CD1CDE892252E60900E5B6B2 /* file_appender.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE882252E60900E5B6B2 /* file_appender.cxx */; };
 		CD1CDE8B2252E61800E5B6B2 /* console_appender.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE8A2252E61800E5B6B2 /* console_appender.cxx */; };
-		CD1CDE8D22540D9B00E5B6B2 /* c_logger_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE8C22540D9B00E5B6B2 /* c_logger_test.cxx */; };
-		CD1CDE9022542CC500E5B6B2 /* log_manager_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE8F22542CC500E5B6B2 /* log_manager_test.cxx */; };
-		CD1CDE9222543E7E00E5B6B2 /* test_properties.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE9122543E7E00E5B6B2 /* test_properties.cxx */; };
 		CD1CDEAF22556B7E00E5B6B2 /* logger_impl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDEAE22556B7E00E5B6B2 /* logger_impl.cxx */; };
 		CD1CDEB122557FB600E5B6B2 /* default_layout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDEB022557FB600E5B6B2 /* default_layout.cxx */; };
 		CD1CDEB52256C94000E5B6B2 /* pattern_layout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDEB42256C94000E5B6B2 /* pattern_layout.cxx */; };
 		CD29739B1D7B401F00E37217 /* logger.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD2973991D7B401F00E37217 /* logger.cxx */; };
 		CD3C80C01D6A2CA300ACC795 /* pattern_layout_format.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD3C80BE1D6A2CA300ACC795 /* pattern_layout_format.cxx */; };
 		CD6F73EC225187BE0081ED74 /* logger in Headers */ = {isa = PBXBuildFile; fileRef = CD6F73EA225187A10081ED74 /* logger */; settings = {ATTRIBUTES = (Public, ); }; };
-		CD6F7406225187F40081ED74 /* liblogging.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ECAC4AF1BC00AC500FDAE14 /* liblogging.dylib */; };
-		CD6F740C225187FD0081ED74 /* logger_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD6F73FC225187E10081ED74 /* logger_test.cxx */; };
-		CD6F746C22518A2C0081ED74 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6F746B22518A2C0081ED74 /* GoogleMock.framework */; };
-		CD760CB922621776008A62DE /* pattern_layout_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CB822621776008A62DE /* pattern_layout_test.cxx */; };
-		CD760CBF226221F6008A62DE /* console_appender_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CBE226221F6008A62DE /* console_appender_test.cxx */; };
-		CD760CC1226226CC008A62DE /* file_appender_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CC0226226CC008A62DE /* file_appender_test.cxx */; };
-		CD760CC922627202008A62DE /* json_layout_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CC822627202008A62DE /* json_layout_test.cxx */; };
-		CD760CD122628A63008A62DE /* libjsoncpp.1.8.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD760CCE226288AB008A62DE /* libjsoncpp.1.8.4.dylib */; };
-		CD760CD222628A73008A62DE /* libjsoncpp.1.8.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD760CCE226288AB008A62DE /* libjsoncpp.1.8.4.dylib */; };
 		CD88E9572252BDFC00927F40 /* log_manager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD88E9552252BDFC00927F40 /* log_manager.cxx */; };
 		CD88E95F2252D3EF00927F40 /* c_logger.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD88E95D2252D3EF00927F40 /* c_logger.cxx */; };
 		CD88E9632252D67A00927F40 /* common.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD88E9612252D67A00927F40 /* common.cxx */; };
 		CDA494DE2256D5F40041620C /* pattern_layout_date.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDA494DD2256D5F40041620C /* pattern_layout_date.cxx */; };
 		CDC0E0512269378E001EDAB7 /* message.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDC0E0502269378E001EDAB7 /* message.cxx */; };
+		CDCB3C5924E480FC0029B771 /* libjsoncpp.1.9.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCB3C5724E480E70029B771 /* libjsoncpp.1.9.2.dylib */; };
+		CDCB3C6324E481B10029B771 /* liblogging.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ECAC4AF1BC00AC500FDAE14 /* liblogging.dylib */; };
+		CDCB3C6924E481E70029B771 /* logger_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD6F73FC225187E10081ED74 /* logger_test.cxx */; };
+		CDCB3C6A24E481E70029B771 /* pattern_layout_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CB822621776008A62DE /* pattern_layout_test.cxx */; };
+		CDCB3C6B24E481E70029B771 /* json_layout_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CC822627202008A62DE /* json_layout_test.cxx */; };
+		CDCB3C6C24E481E70029B771 /* console_appender_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CBE226221F6008A62DE /* console_appender_test.cxx */; };
+		CDCB3C6D24E481E70029B771 /* file_appender_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD760CC0226226CC008A62DE /* file_appender_test.cxx */; };
+		CDCB3C6E24E481E70029B771 /* c_logger_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE8C22540D9B00E5B6B2 /* c_logger_test.cxx */; };
+		CDCB3C6F24E481E70029B771 /* log_manager_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE8F22542CC500E5B6B2 /* log_manager_test.cxx */; };
+		CDCB3C7024E481E70029B771 /* test_properties.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE9122543E7E00E5B6B2 /* test_properties.cxx */; };
+		CDCB3C7124E481F50029B771 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6F7437225189470081ED74 /* GoogleMock.framework */; };
+		CDCB3C7224E482020029B771 /* libjsoncpp.1.9.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCB3C5724E480E70029B771 /* libjsoncpp.1.9.2.dylib */; };
 		CDEA62D5225A3B0B00A6FAE0 /* json_layout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDEA62D4225A3B0B00A6FAE0 /* json_layout.cxx */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		CD6F7407225187F40081ED74 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0EB833411BBF45E600DDC844 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 0ECAC4AE1BC00AC500FDAE14;
-			remoteInfo = logging;
-		};
 		CD6F7436225189470081ED74 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CD6F742F225189470081ED74 /* GoogleMock.xcodeproj */;
@@ -72,6 +65,13 @@
 			remoteGlobalIDString = 05818F901A685AEA0072A469;
 			remoteInfo = GoogleMockTests;
 		};
+		CDCB3C6424E481B10029B771 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0EB833411BBF45E600DDC844 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0ECAC4AE1BC00AC500FDAE14;
+			remoteInfo = logging;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -91,8 +91,6 @@
 		CD3C80BE1D6A2CA300ACC795 /* pattern_layout_format.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pattern_layout_format.cxx; sourceTree = "<group>"; };
 		CD6F73EA225187A10081ED74 /* logger */ = {isa = PBXFileReference; lastKnownFileType = folder; name = logger; path = include/logger; sourceTree = "<group>"; };
 		CD6F73FC225187E10081ED74 /* logger_test.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = logger_test.cxx; sourceTree = "<group>"; };
-		CD6F7401225187F40081ED74 /* logger_test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = logger_test.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		CD6F7405225187F40081ED74 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CD6F742D225189290081ED74 /* libcfmt_logger.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libcfmt_logger.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD6F742F225189470081ED74 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CD6F746B22518A2C0081ED74 /* GoogleMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMock.framework; path = "../../../gmock-xcode-master/build/Release/GoogleMock.framework"; sourceTree = "<group>"; };
@@ -111,6 +109,9 @@
 		CDC0E0502269378E001EDAB7 /* message.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = message.cxx; sourceTree = "<group>"; };
 		CDC0E06022694966001EDAB7 /* logger_test_obj.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = logger_test_obj.h; sourceTree = "<group>"; };
 		CDC0E0652269EE9E001EDAB7 /* header_test_obj.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = header_test_obj.h; sourceTree = "<group>"; };
+		CDCB3C5724E480E70029B771 /* libjsoncpp.1.9.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjsoncpp.1.9.2.dylib; path = ../../../../../../../../opt/local/lib/libjsoncpp.1.9.2.dylib; sourceTree = "<group>"; };
+		CDCB3C5E24E481B10029B771 /* logger-test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "logger-test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CDCB3C6224E481B10029B771 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CDEA62D4225A3B0B00A6FAE0 /* json_layout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = json_layout.cxx; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -119,17 +120,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD760CD122628A63008A62DE /* libjsoncpp.1.8.4.dylib in Frameworks */,
+				CDCB3C5924E480FC0029B771 /* libjsoncpp.1.9.2.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		CD6F73FE225187F40081ED74 /* Frameworks */ = {
+		CDCB3C5B24E481B10029B771 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD760CD222628A73008A62DE /* libjsoncpp.1.8.4.dylib in Frameworks */,
-				CD6F7406225187F40081ED74 /* liblogging.dylib in Frameworks */,
-				CD6F746C22518A2C0081ED74 /* GoogleMock.framework in Frameworks */,
+				CDCB3C7224E482020029B771 /* libjsoncpp.1.9.2.dylib in Frameworks */,
+				CDCB3C7124E481F50029B771 /* GoogleMock.framework in Frameworks */,
+				CDCB3C6324E481B10029B771 /* liblogging.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -143,7 +144,7 @@
 				CD2973971D7B3FC600E37217 /* src */,
 				0EB833481BBF45E600DDC844 /* Makefile */,
 				CD6F73EB225187B30081ED74 /* test */,
-				CD6F7402225187F40081ED74 /* logger_test */,
+				CDCB3C5F24E481B10029B771 /* logger-test */,
 				0EB8335A1BBF484800DDC844 /* Products */,
 				CD6F742B225188600081ED74 /* Frameworks */,
 			);
@@ -153,7 +154,7 @@
 			isa = PBXGroup;
 			children = (
 				0ECAC4AF1BC00AC500FDAE14 /* liblogging.dylib */,
-				CD6F7401225187F40081ED74 /* logger_test.xctest */,
+				CDCB3C5E24E481B10029B771 /* logger-test.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -208,17 +209,10 @@
 			path = test;
 			sourceTree = "<group>";
 		};
-		CD6F7402225187F40081ED74 /* logger_test */ = {
-			isa = PBXGroup;
-			children = (
-				CD6F7405225187F40081ED74 /* Info.plist */,
-			);
-			path = logger_test;
-			sourceTree = "<group>";
-		};
 		CD6F742B225188600081ED74 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CDCB3C5724E480E70029B771 /* libjsoncpp.1.9.2.dylib */,
 				CD760CCE226288AB008A62DE /* libjsoncpp.1.8.4.dylib */,
 				CD6F746B22518A2C0081ED74 /* GoogleMock.framework */,
 				CD6F742F225189470081ED74 /* GoogleMock.xcodeproj */,
@@ -238,6 +232,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		CDCB3C5F24E481B10029B771 /* logger-test */ = {
+			isa = PBXGroup;
+			children = (
+				CDCB3C6224E481B10029B771 /* Info.plist */,
+			);
+			path = "logger-test";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -269,22 +271,22 @@
 			productReference = 0ECAC4AF1BC00AC500FDAE14 /* liblogging.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
-		CD6F7400225187F40081ED74 /* logger_test */ = {
+		CDCB3C5D24E481B10029B771 /* logger-test */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = CD6F7409225187F40081ED74 /* Build configuration list for PBXNativeTarget "logger_test" */;
+			buildConfigurationList = CDCB3C6624E481B10029B771 /* Build configuration list for PBXNativeTarget "logger-test" */;
 			buildPhases = (
-				CD6F73FD225187F40081ED74 /* Sources */,
-				CD6F73FE225187F40081ED74 /* Frameworks */,
-				CD6F73FF225187F40081ED74 /* Resources */,
+				CDCB3C5A24E481B10029B771 /* Sources */,
+				CDCB3C5B24E481B10029B771 /* Frameworks */,
+				CDCB3C5C24E481B10029B771 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				CD6F7408225187F40081ED74 /* PBXTargetDependency */,
+				CDCB3C6524E481B10029B771 /* PBXTargetDependency */,
 			);
-			name = logger_test;
-			productName = logger_test;
-			productReference = CD6F7401225187F40081ED74 /* logger_test.xctest */;
+			name = "logger-test";
+			productName = "logger-test";
+			productReference = CDCB3C5E24E481B10029B771 /* logger-test.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -299,8 +301,8 @@
 					0ECAC4AE1BC00AC500FDAE14 = {
 						CreatedOnToolsVersion = 7.0.1;
 					};
-					CD6F7400225187F40081ED74 = {
-						CreatedOnToolsVersion = 10.1;
+					CDCB3C5D24E481B10029B771 = {
+						CreatedOnToolsVersion = 11.3.1;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -325,7 +327,7 @@
 			projectRoot = "";
 			targets = (
 				0ECAC4AE1BC00AC500FDAE14 /* logging */,
-				CD6F7400225187F40081ED74 /* logger_test */,
+				CDCB3C5D24E481B10029B771 /* logger-test */,
 			);
 		};
 /* End PBXProject section */
@@ -362,7 +364,7 @@
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
-		CD6F73FF225187F40081ED74 /* Resources */ = {
+		CDCB3C5C24E481B10029B771 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -393,28 +395,28 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		CD6F73FD225187F40081ED74 /* Sources */ = {
+		CDCB3C5A24E481B10029B771 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD760CBF226221F6008A62DE /* console_appender_test.cxx in Sources */,
-				CD1CDE9022542CC500E5B6B2 /* log_manager_test.cxx in Sources */,
-				CD6F740C225187FD0081ED74 /* logger_test.cxx in Sources */,
-				CD760CB922621776008A62DE /* pattern_layout_test.cxx in Sources */,
-				CD760CC1226226CC008A62DE /* file_appender_test.cxx in Sources */,
-				CD1CDE9222543E7E00E5B6B2 /* test_properties.cxx in Sources */,
-				CD760CC922627202008A62DE /* json_layout_test.cxx in Sources */,
-				CD1CDE8D22540D9B00E5B6B2 /* c_logger_test.cxx in Sources */,
+				CDCB3C7024E481E70029B771 /* test_properties.cxx in Sources */,
+				CDCB3C6D24E481E70029B771 /* file_appender_test.cxx in Sources */,
+				CDCB3C6F24E481E70029B771 /* log_manager_test.cxx in Sources */,
+				CDCB3C6B24E481E70029B771 /* json_layout_test.cxx in Sources */,
+				CDCB3C6A24E481E70029B771 /* pattern_layout_test.cxx in Sources */,
+				CDCB3C6C24E481E70029B771 /* console_appender_test.cxx in Sources */,
+				CDCB3C6924E481E70029B771 /* logger_test.cxx in Sources */,
+				CDCB3C6E24E481E70029B771 /* c_logger_test.cxx in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		CD6F7408225187F40081ED74 /* PBXTargetDependency */ = {
+		CDCB3C6524E481B10029B771 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 0ECAC4AE1BC00AC500FDAE14 /* logging */;
-			targetProxy = CD6F7407225187F40081ED74 /* PBXContainerItemProxy */;
+			targetProxy = CDCB3C6424E481B10029B771 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -423,6 +425,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -461,6 +464,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -497,7 +501,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -538,7 +541,6 @@
 					"$(inherited)",
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "../../**";
@@ -549,7 +551,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -586,20 +587,18 @@
 					"$(inherited)",
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "../../**";
 			};
 			name = Release;
 		};
-		CD6F740A225187F40081ED74 /* Debug */ = {
+		CDCB3C6724E481B10029B771 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -608,7 +607,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -621,30 +619,25 @@
 				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				INFOPLIST_FILE = logger_test/Info.plist;
+				INFOPLIST_FILE = "logger-test/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "leumasjaffe.logger-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
-		CD6F740B225187F40081ED74 /* Release */ = {
+		CDCB3C6824E481B10029B771 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -653,7 +646,6 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -662,19 +654,16 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				INFOPLIST_FILE = logger_test/Info.plist;
+				INFOPLIST_FILE = "logger-test/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "leumasjaffe.logger-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -699,11 +688,11 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		CD6F7409225187F40081ED74 /* Build configuration list for PBXNativeTarget "logger_test" */ = {
+		CDCB3C6624E481B10029B771 /* Build configuration list for PBXNativeTarget "logger-test" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				CD6F740A225187F40081ED74 /* Debug */,
-				CD6F740B225187F40081ED74 /* Release */,
+				CDCB3C6724E481B10029B771 /* Debug */,
+				CDCB3C6824E481B10029B771 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

+ 4 - 4
logger.xcodeproj/xcshareddata/xcschemes/logger_test.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,9 +27,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CD6F7400225187F40081ED74"
-               BuildableName = "logger_test.xctest"
-               BlueprintName = "logger_test"
+               BlueprintIdentifier = "CDCB3C5D24E481B10029B771"
+               BuildableName = "logger-test.xctest"
+               BlueprintName = "logger-test"
                ReferencedContainer = "container:logger.xcodeproj">
             </BuildableReference>
          </TestableReference>

+ 7 - 2
logger.xcodeproj/xcuserdata/samjaffe.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,10 +4,10 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>logger_test.xcscheme_^#shared#^_</key>
+		<key>logger-test.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>40</integer>
+			<integer>47</integer>
 		</dict>
 		<key>logging.xcscheme</key>
 		<dict>
@@ -34,6 +34,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>CDCB3C5D24E481B10029B771</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>