Skip to content

[4.1] Modernized the Xcode project config and prepared for fixes to build-script. #22

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 19 commits into from
Feb 26, 2018
Merged

[4.1] Modernized the Xcode project config and prepared for fixes to build-script. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
962f3ae
Update xcode-playground-support for SE-0054
slavapestov Nov 21, 2017
123451c
Merge pull request #15 from slavapestov/iuo-fix
slavapestov Nov 21, 2017
3a398e6
Minor fix
kant Dec 14, 2017
258a50f
Merge pull request #16 from kant/patch-1
cwakamo Dec 14, 2017
83386c5
Slightly cleaned up the group structure of the PlaygroundSupport Xcod…
cwakamo Dec 12, 2017
222e2f4
Added the project.xcworkspace embedded inside of PlaygroundSupport's …
cwakamo Dec 12, 2017
16f1816
Added an empty umbrella header to the PlaygroundSupport framework.
cwakamo Dec 12, 2017
d4d55ec
Accepted Xcode 9.1 project modernizations for the PlaygroundSupport p…
cwakamo Dec 12, 2017
45d6f7b
Unset SWIFT_DISABLE_SAFETY_CHECKS in PlaygroundSupport.
cwakamo Dec 12, 2017
45665c8
Accepted Xcode 9.1 project modernizations for the PlaygroundLogger pr…
cwakamo Dec 13, 2017
5889f32
Added the project.xcworkspace embedded inside of PlaygroundLogger's X…
cwakamo Dec 13, 2017
aa8d5d5
Migrate PlaygroundLogger's module map files from a Copy Files phase t…
cwakamo Dec 13, 2017
ec50d75
Removed the "Barrier Phase" build phases from PlaygroundLogger's Xcod…
cwakamo Dec 13, 2017
dd13394
Cleaned up some of the versioning in PlaygroundLogger's Xcode project.
cwakamo Dec 13, 2017
2fd1889
Set STRIP_SWIFT_SYMBOLS to NO for the PlaygroundSupport* and XCPlaygr…
cwakamo Dec 14, 2017
4a73bf8
Introduced a suite of xcconfig files for the PlaygroundLogger and Pla…
cwakamo Dec 21, 2017
707d8f7
[PlaygroundSupport] Cleaned up a few things in PlaygroundPage.swift.
cwakamo Jan 24, 2018
108ef80
[PlaygroundLogger] Control the building of tests by a build setting.
cwakamo Jan 24, 2018
7997f2f
[build] Introduced a workspace with per-platform schemes.
cwakamo Jan 24, 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
2 changes: 1 addition & 1 deletion PlaygroundLogger/Documentation/LoggerFormat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ This is followed by a `number` field. This is the count of a set of
about the log being emitted. As of now, there is only one field that can
be emitted:

* "tid",a unique identifier for the thread that is emitting the log entry
* "tid", a unique identifier for the thread that is emitting the log entry

Consumers should be ready and willing to accept any (or no) entries here and proceed.

Expand Down
689 changes: 359 additions & 330 deletions PlaygroundLogger/PlaygroundLogger.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions PlaygroundLogger/PlaygroundLogger.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions PlaygroundLogger/PlaygroundLogger/ImageHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ImageRepresentation {
}

#if os(iOS) || os(tvOS)
func CI2Data(_ x: CIImage, callback: (UIImage!) -> (Data?)) -> Data? {
func CI2Data(_ x: CIImage, callback: (UIImage?) -> (Data?)) -> Data? {
let size = x.extent.size
if size.width <= 0 || size.height <= 0 { return nil }
UIGraphicsBeginImageContext(size)
Expand All @@ -46,12 +46,12 @@ class ImageRepresentation {
if let ui_image = x as? UIImage {
if ui_image.cgImage == nil {
if let ci_image = ui_image.ciImage {
return CI2Data(ci_image) { return UIImageJPEGRepresentation($0, compressionFactor) }
return CI2Data(ci_image) { return UIImageJPEGRepresentation($0!, compressionFactor) }
}
} else { return UIImageJPEGRepresentation(ui_image, compressionFactor) }
}
else if let ci_image = x as? CIImage {
return CI2Data(ci_image) { return UIImageJPEGRepresentation($0, compressionFactor) }
return CI2Data(ci_image) { return UIImageJPEGRepresentation($0!, compressionFactor) }
}
return nil
}
Expand All @@ -60,12 +60,12 @@ class ImageRepresentation {
if let ui_image = x as? UIImage {
if ui_image.cgImage == nil {
if let ci_image = ui_image.ciImage {
return CI2Data(ci_image) { return UIImagePNGRepresentation($0) }
return CI2Data(ci_image) { return UIImagePNGRepresentation($0!) }
}
} else { return UIImagePNGRepresentation(ui_image) }
}
else if let ci_image = x as? CIImage {
return CI2Data(ci_image) { return UIImagePNGRepresentation($0) }
return CI2Data(ci_image) { return UIImagePNGRepresentation($0!) }
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions PlaygroundLogger/PlaygroundLogger/PlaygroundLogger-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.apple.dt.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>8500</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Apple Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
0 ...dLogger/PlaygroundLogger/module.modulemap → ...aygroundLogger/PlaygroundLogger.modulemap
View file
Open in desktop
File renamed without changes.
0 ...PlaygroundLogger/module.private.modulemap → ...Logger/PlaygroundLogger.private.modulemap
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions PlaygroundLogger/PlaygroundLogger_iOS/PlaygroundLogger_iOS-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.apple.dt.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -21,10 +21,10 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>8500</string>
<key>NSPrincipalClass</key>
<string></string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Apple Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
8 changes: 4 additions & 4 deletions PlaygroundLogger/PlaygroundLogger_tvOS/PlaygroundLogger_tvOS-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.apple.dt.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -21,10 +21,10 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>8500</string>
<key>NSPrincipalClass</key>
<string></string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Apple Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Loading