Skip to content

[overlay] Build SceneKit in Swift 4 mode #20137

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 1 commit into from
Nov 2, 2018
Merged

[overlay] Build SceneKit in Swift 4 mode #20137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 stdlib/public/SDK/SceneKit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
add_swift_target_library(swiftSceneKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
SceneKit.swift.gyb

SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-swift-version" "3"
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
SWIFT_MODULE_DEPENDS_OSX Darwin AppKit CoreData CoreGraphics CoreImage Dispatch Foundation GLKit IOKit ObjectiveC QuartzCore simd XPC # auto-updated
Expand Down
12 changes: 9 additions & 3 deletions stdlib/public/SDK/SceneKit/SceneKit.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,21 @@ extension SCNGeometryElement {
extension SCNGeometrySource {
@nonobjc
public convenience init(vertices: [SCNVector3]) {
self.init(vertices: vertices, count: vertices.count)
fatalError()
// FIXME: <rdar://problem/43534146>
// self.init(__vertices: vertices, count: vertices.count)
}
@nonobjc
public convenience init(normals: [SCNVector3]) {
self.init(normals: normals, count: normals.count)
fatalError()
// FIXME: <rdar://problem/43534146>
// self.init(__normals: normals, count: normals.count)
}
@nonobjc
public convenience init(textureCoordinates: [CGPoint]) {
self.init(textureCoordinates: textureCoordinates, count: textureCoordinates.count)
fatalError()
// FIXME: <rdar://problem/43534146>
// self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
}
}

Expand Down
12 changes: 9 additions & 3 deletions validation-test/stdlib/SceneKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ if #available(iOS 8.0, *) {
expectEqual(1, element.bytesPerIndex)
}

SceneKitTests.test("SCNGeometrySource.init(vertices:)") {
SceneKitTests.test("SCNGeometrySource.init(vertices:)")
.skip(.always("rdar://problem/43534146"))
.code {
let source = SCNGeometrySource(vertices: [SCNVector3(1, 2, 3),
SCNVector3(4, 5, 6)])

Expand All @@ -146,7 +148,9 @@ if #available(iOS 8.0, *) {
expectEqual(positions[4], 5)
}

SceneKitTests.test("SCNGeometrySource.init(normals:)") {
SceneKitTests.test("SCNGeometrySource.init(normals:)")
.skip(.always("rdar://problem/43534146"))
.code {
let source = SCNGeometrySource(normals: [SCNVector3(1, 2, 3),
SCNVector3(4, 5, 6)])

Expand All @@ -160,7 +164,9 @@ if #available(iOS 8.0, *) {
expectEqual(normals[4], 5)
}

SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)") {
SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)")
.skip(.always("rdar://problem/43534146"))
.code {
let source = SCNGeometrySource(textureCoordinates: [CGPoint(x: 1, y: 2),
CGPoint(x: 4, y: 5)])

Expand Down