Skip to content

Migrated swift-xcode-playground-support to Swift 4.2 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 1, 2018
Merged

Migrated swift-xcode-playground-support to Swift 4.2 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f54d26
[PlaygroundLogger] Migrated PlaygroundLogger to Swift 4.2
cwakamo Oct 30, 2018
4b0f924
[PlaygroundSupport] De-duplicated much of the test files between macO…
cwakamo Oct 30, 2018
49c3642
[PlaygroundSupport] Added file automatically created by Xcode.
cwakamo Oct 30, 2018
9663a83
[PlaygroundSupport] Migrated the PlaygroundSupport framework and its …
cwakamo Oct 30, 2018
fdde4ba
[PlaygroundSupport] Migrated the XCPlayground framework and its tests…
cwakamo Oct 30, 2018
7c18f36
[PlaygroundRuntime] Migrated the experimental PlaygroundRuntime frame…
cwakamo Oct 30, 2018
e8ffe35
[PlaygroundRuntime] Added file automatically created by Xcode.
cwakamo Oct 30, 2018
85c404d
[xcworkspace] Added file automatically created by Xcode.
cwakamo Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Experimental/PlaygroundRuntime/PlaygroundRuntime.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
TargetAttributes = {
5EB7828A1FAE6B6F00ADE84E = {
CreatedOnToolsVersion = 9.1;
LastSwiftMigration = 0910;
LastSwiftMigration = "";
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -207,6 +207,7 @@
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TVOS_DEPLOYMENT_TARGET = 10.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -261,6 +262,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -288,7 +290,6 @@
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -311,7 +312,6 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions ...ime/PlaygroundRuntime.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
21 changes: 8 additions & 13 deletions PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,28 +809,33 @@
TargetAttributes = {
5E2646261FB64876002DC6B6 = {
CreatedOnToolsVersion = 9.1;
LastSwiftMigration = 0920;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
5E26462F1FB64876002DC6B6 = {
CreatedOnToolsVersion = 9.1;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
5EFE9188203F6CC400E21BAA = {
CreatedOnToolsVersion = 9.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 5EFE9197203F6DD700E21BAA;
};
5EFE9197203F6DD700E21BAA = {
CreatedOnToolsVersion = 9.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
5EFE91AF203F6E8D00E21BAA = {
CreatedOnToolsVersion = 9.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
5EFE91CC203F6F6900E21BAA = {
CreatedOnToolsVersion = 9.3;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 5EFE91AF203F6E8D00E21BAA;
};
Expand Down Expand Up @@ -1160,6 +1165,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand Down Expand Up @@ -1207,6 +1213,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1228,7 +1235,6 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -1250,7 +1256,6 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -1265,7 +1270,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-macOS";
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -1280,7 +1284,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTests-macOS";
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -1298,7 +1301,6 @@
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_iOS.app/PlaygroundLoggerTestHost_iOS";
};
Expand All @@ -1318,7 +1320,6 @@
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_iOS.app/PlaygroundLoggerTestHost_iOS";
VALIDATE_PRODUCT = YES;
Expand All @@ -1339,7 +1340,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -1358,7 +1358,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -1378,7 +1377,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-tvOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
Expand All @@ -1397,7 +1395,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.swift.PlaygroundLoggerTestHost-tvOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
VALIDATE_PRODUCT = YES;
};
Expand All @@ -1417,7 +1414,6 @@
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
};
Expand All @@ -1437,7 +1433,6 @@
PRODUCT_MODULE_NAME = PlaygroundLoggerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PlaygroundLoggerTestHost_tvOS.app/PlaygroundLoggerTestHost_tvOS";
VALIDATE_PRODUCT = YES;
Expand Down
2 changes: 1 addition & 1 deletion ...ogger/PlaygroundLogger/OpaqueRepresentations/UIKit/UIImage+OpaqueImageRepresentable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

extension UIImage: OpaqueImageRepresentable {
func encodeImage(into encoder: LogEncoder, withFormat format: LogEncoder.Format) throws {
guard let pngData = UIImagePNGRepresentation(self) else {
guard let pngData = self.pngData() else {
if size == .zero {
// We tried encoding an empty image, so it understandably failed.
// In this case, simply encode empty PNG data.
Expand Down
2 changes: 1 addition & 1 deletion PlaygroundLogger/PlaygroundLoggerTestHost_iOS/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
}
Expand Down
2 changes: 1 addition & 1 deletion PlaygroundLogger/PlaygroundLoggerTestHost_tvOS/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
}
Expand Down
Loading