Skip to content

Commit 6c112c2

Browse files
cwakamocwakamo
authored
Merge pull request #31 from cwakamo/migrate-to-swift-4.2
Migrated swift-xcode-playground-support to Swift 4.2
2 parents 6bf092e + 85c404d commit 6c112c2

File tree

16 files changed

+181
-491
lines changed

16 files changed

+181
-491
lines changed

‎Experimental/PlaygroundRuntime/PlaygroundRuntime.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
TargetAttributes = {
107107
5EB7828A1FAE6B6F00ADE84E = {
108108
CreatedOnToolsVersion = 9.1;
109-
LastSwiftMigration = 0910;
109+
LastSwiftMigration = "";
110110
ProvisioningStyle = Automatic;
111111
};
112112
};
@@ -207,6 +207,7 @@
207207
SDKROOT = macosx;
208208
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
209209
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
210+
SWIFT_VERSION = 4.2;
210211
TVOS_DEPLOYMENT_TARGET = 10.0;
211212
VERSIONING_SYSTEM = "apple-generic";
212213
VERSION_INFO_PREFIX = "";
@@ -261,6 +262,7 @@
261262
MTL_ENABLE_DEBUG_INFO = NO;
262263
SDKROOT = macosx;
263264
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
265+
SWIFT_VERSION = 4.2;
264266
TVOS_DEPLOYMENT_TARGET = 10.0;
265267
VALIDATE_PRODUCT = YES;
266268
VERSIONING_SYSTEM = "apple-generic";
@@ -288,7 +290,6 @@
288290
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
289291
SWIFT_INSTALL_OBJC_HEADER = NO;
290292
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
291-
SWIFT_VERSION = 4.0;
292293
};
293294
name = Debug;
294295
};
@@ -311,7 +312,6 @@
311312
SKIP_INSTALL = YES;
312313
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
313314
SWIFT_INSTALL_OBJC_HEADER = NO;
314-
SWIFT_VERSION = 4.0;
315315
};
316316
name = Release;
317317
};

‎Experimental/PlaygroundRuntime/PlaygroundRuntime.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -809,28 +809,33 @@
809809
TargetAttributes = {
810810
5E2646261FB64876002DC6B6 = {
811811
CreatedOnToolsVersion = 9.1;
812-
LastSwiftMigration = 0920;
812+
LastSwiftMigration = 1010;
813813
ProvisioningStyle = Automatic;
814814
};
815815
5E26462F1FB64876002DC6B6 = {
816816
CreatedOnToolsVersion = 9.1;
817+
LastSwiftMigration = 1010;
817818
ProvisioningStyle = Automatic;
818819
};
819820
5EFE9188203F6CC400E21BAA = {
820821
CreatedOnToolsVersion = 9.3;
822+
LastSwiftMigration = 1010;
821823
ProvisioningStyle = Automatic;
822824
TestTargetID = 5EFE9197203F6DD700E21BAA;
823825
};
824826
5EFE9197203F6DD700E21BAA = {
825827
CreatedOnToolsVersion = 9.3;
828+
LastSwiftMigration = 1010;
826829
ProvisioningStyle = Automatic;
827830
};
828831
5EFE91AF203F6E8D00E21BAA = {
829832
CreatedOnToolsVersion = 9.3;
833+
LastSwiftMigration = 1010;
830834
ProvisioningStyle = Automatic;
831835
};
832836
5EFE91CC203F6F6900E21BAA = {
833837
CreatedOnToolsVersion = 9.3;
838+
LastSwiftMigration = 1010;
834839
ProvisioningStyle = Automatic;
835840
TestTargetID = 5EFE91AF203F6E8D00E21BAA;
836841
};
@@ -1160,6 +1165,7 @@
11601165
MTL_ENABLE_DEBUG_INFO = YES;
11611166
SDKROOT = macosx;
11621167
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1168+
SWIFT_VERSION = 4.2;
11631169
};
11641170
name = Debug;
11651171
};
@@ -1207,6 +1213,7 @@
12071213
GCC_WARN_UNUSED_VARIABLE = YES;
12081214
MTL_ENABLE_DEBUG_INFO = NO;
12091215
SDKROOT = macosx;
1216+
SWIFT_VERSION = 4.2;
12101217
};
12111218
name = Release;
12121219
};
@@ -1228,7 +1235,6 @@
12281235
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
12291236
SKIP_INSTALL = NO;
12301237
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
1231-
SWIFT_VERSION = 4.0;
12321238
};
12331239
name = Debug;
12341240
};
@@ -1250,7 +1256,6 @@
12501256
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
12511257
SKIP_INSTALL = NO;
12521258
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
1253-
SWIFT_VERSION = 4.0;
12541259
};
12551260
name = Release;
12561261
};
@@ -1265,7 +1270,6 @@
12651270
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-macOS";
12661271
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
12671272
PRODUCT_NAME = "$(TARGET_NAME)";
1268-
SWIFT_VERSION = 4.0;
12691273
};
12701274
name = Debug;
12711275
};
@@ -1280,7 +1284,6 @@
12801284
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-macOS";
12811285
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
12821286
PRODUCT_NAME = "$(TARGET_NAME)";
1283-
SWIFT_VERSION = 4.0;
12841287
};
12851288
name = Release;
12861289
};
@@ -1298,7 +1301,6 @@
12981301
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
12991302
PRODUCT_NAME = "$(TARGET_NAME)";
13001303
SDKROOT = iphoneos;
1301-
SWIFT_VERSION = 4.0;
13021304
TARGETED_DEVICE_FAMILY = "1,2";
13031305
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_iOS.app/PlaygroundLoggerTestHost_iOS";
13041306
};
@@ -1318,7 +1320,6 @@
13181320
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
13191321
PRODUCT_NAME = "$(TARGET_NAME)";
13201322
SDKROOT = iphoneos;
1321-
SWIFT_VERSION = 4.0;
13221323
TARGETED_DEVICE_FAMILY = "1,2";
13231324
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_iOS.app/PlaygroundLoggerTestHost_iOS";
13241325
VALIDATE_PRODUCT = YES;
@@ -1339,7 +1340,6 @@
13391340
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
13401341
PRODUCT_NAME = "$(TARGET_NAME)";
13411342
SDKROOT = iphoneos;
1342-
SWIFT_VERSION = 4.0;
13431343
TARGETED_DEVICE_FAMILY = "1,2";
13441344
};
13451345
name = Debug;
@@ -1358,7 +1358,6 @@
13581358
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
13591359
PRODUCT_NAME = "$(TARGET_NAME)";
13601360
SDKROOT = iphoneos;
1361-
SWIFT_VERSION = 4.0;
13621361
TARGETED_DEVICE_FAMILY = "1,2";
13631362
VALIDATE_PRODUCT = YES;
13641363
};
@@ -1378,7 +1377,6 @@
13781377
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-tvOS";
13791378
PRODUCT_NAME = "$(TARGET_NAME)";
13801379
SDKROOT = appletvos;
1381-
SWIFT_VERSION = 4.0;
13821380
TARGETED_DEVICE_FAMILY = 3;
13831381
};
13841382
name = Debug;
@@ -1397,7 +1395,6 @@
13971395
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-tvOS";
13981396
PRODUCT_NAME = "$(TARGET_NAME)";
13991397
SDKROOT = appletvos;
1400-
SWIFT_VERSION = 4.0;
14011398
TARGETED_DEVICE_FAMILY = 3;
14021399
VALIDATE_PRODUCT = YES;
14031400
};
@@ -1417,7 +1414,6 @@
14171414
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
14181415
PRODUCT_NAME = "$(TARGET_NAME)";
14191416
SDKROOT = appletvos;
1420-
SWIFT_VERSION = 4.0;
14211417
TARGETED_DEVICE_FAMILY = 3;
14221418
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
14231419
};
@@ -1437,7 +1433,6 @@
14371433
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
14381434
PRODUCT_NAME = "$(TARGET_NAME)";
14391435
SDKROOT = appletvos;
1440-
SWIFT_VERSION = 4.0;
14411436
TARGETED_DEVICE_FAMILY = 3;
14421437
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
14431438
VALIDATE_PRODUCT = YES;

‎PlaygroundLogger/PlaygroundLogger/OpaqueRepresentations/UIKit/UIImage+OpaqueImageRepresentable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
extension UIImage: OpaqueImageRepresentable {
1717
func encodeImage(into encoder: LogEncoder, withFormat format: LogEncoder.Format) throws {
18-
guard let pngData = UIImagePNGRepresentation(self) else {
18+
guard let pngData = self.pngData() else {
1919
if size == .zero {
2020
// We tried encoding an empty image, so it understandably failed.
2121
// In this case, simply encode empty PNG data.

‎PlaygroundLogger/PlaygroundLoggerTestHost_iOS/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import UIKit
1616
class AppDelegate: UIResponder, UIApplicationDelegate {
1717
var window: UIWindow?
1818

19-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
19+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
2020
return true
2121
}
2222
}

‎PlaygroundLogger/PlaygroundLoggerTestHost_tvOS/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import UIKit
1616
class AppDelegate: UIResponder, UIApplicationDelegate {
1717
var window: UIWindow?
1818

19-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
19+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
2020
return true
2121
}
2222
}

0 commit comments

Comments
 (0)