Skip to content

Commit 27a3ebf

Browse files
committed
[overlay] Build SceneKit in Swift 4 mode
Addresses: <rdar://problem/43534146>
1 parent cd920b6 commit 27a3ebf

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

stdlib/public/SDK/SceneKit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
44
add_swift_target_library(swiftSceneKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
55
SceneKit.swift.gyb
66

7-
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-swift-version" "3"
7+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
88
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
99
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
1010
SWIFT_MODULE_DEPENDS_OSX Darwin AppKit CoreData CoreGraphics CoreImage Dispatch Foundation GLKit IOKit ObjectiveC QuartzCore simd XPC # auto-updated

stdlib/public/SDK/SceneKit/SceneKit.swift.gyb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,21 @@ extension SCNGeometryElement {
179179
extension SCNGeometrySource {
180180
@nonobjc
181181
public convenience init(vertices: [SCNVector3]) {
182-
self.init(vertices: vertices, count: vertices.count)
182+
fatalError()
183+
// FIXME: <rdar://problem/43534146>
184+
// self.init(__vertices: vertices, count: vertices.count)
183185
}
184186
@nonobjc
185187
public convenience init(normals: [SCNVector3]) {
186-
self.init(normals: normals, count: normals.count)
188+
fatalError()
189+
// FIXME: <rdar://problem/43534146>
190+
// self.init(__normals: normals, count: normals.count)
187191
}
188192
@nonobjc
189193
public convenience init(textureCoordinates: [CGPoint]) {
190-
self.init(textureCoordinates: textureCoordinates, count: textureCoordinates.count)
194+
fatalError()
195+
// FIXME: <rdar://problem/43534146>
196+
// self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
191197
}
192198
}
193199

validation-test/stdlib/SceneKit.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ if #available(iOS 8.0, *) {
132132
expectEqual(1, element.bytesPerIndex)
133133
}
134134

135-
SceneKitTests.test("SCNGeometrySource.init(vertices:)") {
135+
SceneKitTests.test("SCNGeometrySource.init(vertices:)")
136+
.skip(.always("rdar://problem/43534146"))
137+
.code {
136138
let source = SCNGeometrySource(vertices: [SCNVector3(1, 2, 3),
137139
SCNVector3(4, 5, 6)])
138140

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

149-
SceneKitTests.test("SCNGeometrySource.init(normals:)") {
151+
SceneKitTests.test("SCNGeometrySource.init(normals:)")
152+
.skip(.always("rdar://problem/43534146"))
153+
.code {
150154
let source = SCNGeometrySource(normals: [SCNVector3(1, 2, 3),
151155
SCNVector3(4, 5, 6)])
152156

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

163-
SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)") {
167+
SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)")
168+
.skip(.always("rdar://problem/43534146"))
169+
.code {
164170
let source = SCNGeometrySource(textureCoordinates: [CGPoint(x: 1, y: 2),
165171
CGPoint(x: 4, y: 5)])
166172

0 commit comments

Comments
 (0)