Skip to content

Commit b56eda5

Browse files
cwakamocwakamo
committed
[PlaygroundLogger] Adopted the XcodeConfig files in the new PlaygroundLogger project.
1 parent e517361 commit b56eda5

File tree

3 files changed

+26
-50
lines changed

3 files changed

+26
-50
lines changed

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
/* End PBXCopyFilesBuildPhase section */
182182

183183
/* Begin PBXFileReference section */
184+
5E11805920414E2700B73EE9 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = ../XcodeConfig/Debug.xcconfig; sourceTree = "<group>"; };
185+
5E11805A20414E2700B73EE9 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = ../XcodeConfig/Release.xcconfig; sourceTree = "<group>"; };
184186
5E184714202BB72700F01AD1 /* TypeName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeName.swift; sourceTree = "<group>"; };
185187
5E184716202BB80200F01AD1 /* PGLConcurrentMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PGLConcurrentMap.h; sourceTree = "<group>"; };
186188
5E184717202BB80200F01AD1 /* PGLConcurrentMap_MRR.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PGLConcurrentMap_MRR.m; sourceTree = "<group>"; };
@@ -327,6 +329,15 @@
327329
/* End PBXFrameworksBuildPhase section */
328330

329331
/* Begin PBXGroup section */
332+
5E11805820414E0C00B73EE9 /* Config Files */ = {
333+
isa = PBXGroup;
334+
children = (
335+
5E11805920414E2700B73EE9 /* Debug.xcconfig */,
336+
5E11805A20414E2700B73EE9 /* Release.xcconfig */,
337+
);
338+
name = "Config Files";
339+
sourceTree = "<group>";
340+
};
330341
5E26461D1FB64876002DC6B6 = {
331342
isa = PBXGroup;
332343
children = (
@@ -337,8 +348,8 @@
337348
5EFE91CE203F6F6A00E21BAA /* PlaygroundLoggerTests_tvOS */,
338349
5EFE9199203F6DD700E21BAA /* PlaygroundLoggerTestHost_iOS */,
339350
5EFE91B1203F6E8D00E21BAA /* PlaygroundLoggerTestHost_tvOS */,
351+
5E11805820414E0C00B73EE9 /* Config Files */,
340352
5E2646281FB64876002DC6B6 /* Products */,
341-
5E26464F1FB64F95002DC6B6 /* Frameworks */,
342353
);
343354
sourceTree = "<group>";
344355
};
@@ -397,13 +408,6 @@
397408
path = PlaygroundLoggerTests_macOS;
398409
sourceTree = "<group>";
399410
};
400-
5E26464F1FB64F95002DC6B6 /* Frameworks */ = {
401-
isa = PBXGroup;
402-
children = (
403-
);
404-
name = Frameworks;
405-
sourceTree = "<group>";
406-
};
407411
5E27561B1FC4854C00B69C83 /* Opaque Representations */ = {
408412
isa = PBXGroup;
409413
children = (
@@ -1069,13 +1073,13 @@
10691073
/* Begin XCBuildConfiguration section */
10701074
5E2646391FB64876002DC6B6 /* Debug */ = {
10711075
isa = XCBuildConfiguration;
1076+
baseConfigurationReference = 5E11805920414E2700B73EE9 /* Debug.xcconfig */;
10721077
buildSettings = {
10731078
ALWAYS_SEARCH_USER_PATHS = NO;
10741079
CLANG_ANALYZER_NONNULL = YES;
10751080
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
10761081
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
10771082
CLANG_CXX_LIBRARY = "libc++";
1078-
CLANG_ENABLE_MODULES = YES;
10791083
CLANG_ENABLE_OBJC_ARC = YES;
10801084
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10811085
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1098,14 +1102,11 @@
10981102
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10991103
CODE_SIGN_IDENTITY = "-";
11001104
COPY_PHASE_STRIP = NO;
1101-
CURRENT_PROJECT_VERSION = 1;
11021105
DEBUG_INFORMATION_FORMAT = dwarf;
11031106
ENABLE_STRICT_OBJC_MSGSEND = YES;
1104-
ENABLE_TESTABILITY = YES;
11051107
GCC_C_LANGUAGE_STANDARD = gnu11;
11061108
GCC_DYNAMIC_NO_PIC = NO;
11071109
GCC_NO_COMMON_BLOCKS = YES;
1108-
GCC_OPTIMIZATION_LEVEL = 0;
11091110
GCC_PREPROCESSOR_DEFINITIONS = (
11101111
"DEBUG=1",
11111112
"$(inherited)",
@@ -1116,28 +1117,21 @@
11161117
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11171118
GCC_WARN_UNUSED_FUNCTION = YES;
11181119
GCC_WARN_UNUSED_VARIABLE = YES;
1119-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1120-
MACOSX_DEPLOYMENT_TARGET = 10.12;
11211120
MTL_ENABLE_DEBUG_INFO = YES;
1122-
ONLY_ACTIVE_ARCH = YES;
11231121
SDKROOT = macosx;
11241122
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1125-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1126-
TVOS_DEPLOYMENT_TARGET = 10.0;
1127-
VERSIONING_SYSTEM = "apple-generic";
1128-
VERSION_INFO_PREFIX = "";
11291123
};
11301124
name = Debug;
11311125
};
11321126
5E26463A1FB64876002DC6B6 /* Release */ = {
11331127
isa = XCBuildConfiguration;
1128+
baseConfigurationReference = 5E11805A20414E2700B73EE9 /* Release.xcconfig */;
11341129
buildSettings = {
11351130
ALWAYS_SEARCH_USER_PATHS = NO;
11361131
CLANG_ANALYZER_NONNULL = YES;
11371132
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
11381133
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
11391134
CLANG_CXX_LIBRARY = "libc++";
1140-
CLANG_ENABLE_MODULES = YES;
11411135
CLANG_ENABLE_OBJC_ARC = YES;
11421136
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
11431137
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -1160,7 +1154,6 @@
11601154
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11611155
CODE_SIGN_IDENTITY = "-";
11621156
COPY_PHASE_STRIP = NO;
1163-
CURRENT_PROJECT_VERSION = 1;
11641157
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11651158
ENABLE_NS_ASSERTIONS = NO;
11661159
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1172,21 +1165,14 @@
11721165
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11731166
GCC_WARN_UNUSED_FUNCTION = YES;
11741167
GCC_WARN_UNUSED_VARIABLE = YES;
1175-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1176-
MACOSX_DEPLOYMENT_TARGET = 10.12;
11771168
MTL_ENABLE_DEBUG_INFO = NO;
11781169
SDKROOT = macosx;
1179-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1180-
TVOS_DEPLOYMENT_TARGET = 10.0;
1181-
VERSIONING_SYSTEM = "apple-generic";
1182-
VERSION_INFO_PREFIX = "";
11831170
};
11841171
name = Release;
11851172
};
11861173
5E26463C1FB64876002DC6B6 /* Debug */ = {
11871174
isa = XCBuildConfiguration;
11881175
buildSettings = {
1189-
CLANG_ENABLE_MODULES = YES;
11901176
CODE_SIGN_IDENTITY = "";
11911177
CODE_SIGN_STYLE = Automatic;
11921178
COMBINE_HIDPI_IMAGES = YES;
@@ -1196,22 +1182,19 @@
11961182
DYLIB_INSTALL_NAME_BASE = "@rpath";
11971183
FRAMEWORK_VERSION = A;
11981184
INFOPLIST_FILE = PlaygroundLogger/Info.plist;
1199-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1185+
INSTALL_PATH = "$(PGS_PRIVATEFRAMEWORKS_DIR_FOR_INSTALL)";
12001186
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
1201-
OTHER_SWIFT_FLAGS = "-Xfrontend -debugger-support";
12021187
PRODUCT_BUNDLE_IDENTIFIER = org.swift.PlaygroundLogger;
12031188
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1204-
SKIP_INSTALL = YES;
1189+
SKIP_INSTALL = NO;
12051190
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
1206-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
12071191
SWIFT_VERSION = 4.0;
12081192
};
12091193
name = Debug;
12101194
};
12111195
5E26463D1FB64876002DC6B6 /* Release */ = {
12121196
isa = XCBuildConfiguration;
12131197
buildSettings = {
1214-
CLANG_ENABLE_MODULES = YES;
12151198
CODE_SIGN_IDENTITY = "";
12161199
CODE_SIGN_STYLE = Automatic;
12171200
COMBINE_HIDPI_IMAGES = YES;
@@ -1221,12 +1204,11 @@
12211204
DYLIB_INSTALL_NAME_BASE = "@rpath";
12221205
FRAMEWORK_VERSION = A;
12231206
INFOPLIST_FILE = PlaygroundLogger/Info.plist;
1224-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1207+
INSTALL_PATH = "$(PGS_PRIVATEFRAMEWORKS_DIR_FOR_INSTALL)";
12251208
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
1226-
OTHER_SWIFT_FLAGS = "-Xfrontend -debugger-support";
12271209
PRODUCT_BUNDLE_IDENTIFIER = org.swift.PlaygroundLogger;
12281210
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1229-
SKIP_INSTALL = YES;
1211+
SKIP_INSTALL = NO;
12301212
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
12311213
SWIFT_VERSION = 4.0;
12321214
};
@@ -1271,7 +1253,6 @@
12711253
CODE_SIGN_IDENTITY = "-";
12721254
CODE_SIGN_STYLE = Automatic;
12731255
INFOPLIST_FILE = PlaygroundLoggerTests_iOS/Info.plist;
1274-
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
12751256
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12761257
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-iOS";
12771258
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
@@ -1292,13 +1273,11 @@
12921273
CODE_SIGN_IDENTITY = "-";
12931274
CODE_SIGN_STYLE = Automatic;
12941275
INFOPLIST_FILE = PlaygroundLoggerTests_iOS/Info.plist;
1295-
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
12961276
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12971277
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-iOS";
12981278
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
12991279
PRODUCT_NAME = "$(TARGET_NAME)";
13001280
SDKROOT = iphoneos;
1301-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13021281
SWIFT_VERSION = 4.0;
13031282
TARGETED_DEVICE_FAMILY = "1,2";
13041283
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_iOS.app/PlaygroundLoggerTestHost_iOS";
@@ -1316,7 +1295,6 @@
13161295
CODE_SIGN_IDENTITY = "-";
13171296
CODE_SIGN_STYLE = Automatic;
13181297
INFOPLIST_FILE = PlaygroundLoggerTestHost_iOS/Info.plist;
1319-
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
13201298
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13211299
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
13221300
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1336,12 +1314,10 @@
13361314
CODE_SIGN_IDENTITY = "-";
13371315
CODE_SIGN_STYLE = Automatic;
13381316
INFOPLIST_FILE = PlaygroundLoggerTestHost_iOS/Info.plist;
1339-
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
13401317
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13411318
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
13421319
PRODUCT_NAME = "$(TARGET_NAME)";
13431320
SDKROOT = iphoneos;
1344-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13451321
SWIFT_VERSION = 4.0;
13461322
TARGETED_DEVICE_FAMILY = "1,2";
13471323
VALIDATE_PRODUCT = YES;
@@ -1364,7 +1340,6 @@
13641340
SDKROOT = appletvos;
13651341
SWIFT_VERSION = 4.0;
13661342
TARGETED_DEVICE_FAMILY = 3;
1367-
TVOS_DEPLOYMENT_TARGET = 11.3;
13681343
};
13691344
name = Debug;
13701345
};
@@ -1382,10 +1357,8 @@
13821357
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-tvOS";
13831358
PRODUCT_NAME = "$(TARGET_NAME)";
13841359
SDKROOT = appletvos;
1385-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13861360
SWIFT_VERSION = 4.0;
13871361
TARGETED_DEVICE_FAMILY = 3;
1388-
TVOS_DEPLOYMENT_TARGET = 11.3;
13891362
VALIDATE_PRODUCT = YES;
13901363
};
13911364
name = Release;
@@ -1407,7 +1380,6 @@
14071380
SWIFT_VERSION = 4.0;
14081381
TARGETED_DEVICE_FAMILY = 3;
14091382
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
1410-
TVOS_DEPLOYMENT_TARGET = 11.3;
14111383
};
14121384
name = Debug;
14131385
};
@@ -1425,11 +1397,9 @@
14251397
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
14261398
PRODUCT_NAME = "$(TARGET_NAME)";
14271399
SDKROOT = appletvos;
1428-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
14291400
SWIFT_VERSION = 4.0;
14301401
TARGETED_DEVICE_FAMILY = 3;
14311402
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
1432-
TVOS_DEPLOYMENT_TARGET = 11.3;
14331403
VALIDATE_PRODUCT = YES;
14341404
};
14351405
name = Release;

‎PlaygroundLogger/PlaygroundLogger/CustomLoggable/CoreImage/CIImage+CustomOpaqueLoggable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import CoreGraphics
2121

2222
extension CIImage: CustomOpaqueLoggable {
2323
func opaqueRepresentation() -> LogEntry.OpaqueRepresentation {
24-
if let cgImage = self.cgImage {
24+
if #available(macOS 10.12, *), let cgImage = self.cgImage {
2525
return ImageOpaqueRepresentation(kind: .image, backedBy: cgImage)
2626
}
2727
else {

‎PlaygroundLogger/PlaygroundLoggerTests/LegacyPlaygroundLoggerTests.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,13 @@ class LegacyPlaygroundLoggerTests: XCTestCase {
308308
return true
309309
}
310310
#elseif os(iOS) || os(tvOS)
311-
let rendererFormat = UIGraphicsImageRendererFormat.preferred()
311+
let rendererFormat: UIGraphicsImageRendererFormat
312+
if #available(iOS 11.0, tvOS 11.0, *) {
313+
rendererFormat = .preferred()
314+
}
315+
else {
316+
rendererFormat = .default()
317+
}
312318
rendererFormat.scale = 1
313319
rendererFormat.opaque = true
314320

0 commit comments

Comments
 (0)