Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into observation-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephencelis
stephencelis committed Jan 25, 2024
2 parents bc41412 + ab1daa7 commit cee0c1c
Show file tree
Hide file tree
Showing 14 changed files with 227 additions and 150 deletions.
72 changes: 45 additions & 27 deletions App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-case-paths",
"state" : {
"revision" : "a5521dde99570789d8cb7c43e51418d7cd1a87ca",
"version" : "1.1.2"
"revision" : "76d7791b5bda47df7e3d4690c4c3aaf089730707",
"version" : "1.2.1"
}
},
{
Expand All @@ -104,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "a902f1823a7ff3c9ab2fba0f992396b948eda307",
"version" : "1.0.5"
"revision" : "d029d9d39c87bed85b1c50adee7c41795261a192",
"version" : "1.0.6"
}
},
{
Expand All @@ -114,7 +114,7 @@
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
"state" : {
"branch" : "observation-beta",
"revision" : "a1f2ebbe973e35d4d476da4e0a297e0002af25a6"
"revision" : "77f6c5cd22bade2976e7c6760c15017b66b92f91"
}
},
{
Expand Down Expand Up @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "9783b58167f7618cb86011156e741cbc6f4cc864",
"version" : "1.1.2"
"revision" : "adb04a8e35f07edc001877af9f9f97fcc21d409e",
"version" : "1.2.0"
}
},
{
Expand All @@ -176,8 +176,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
"revision" : "1827dc94bdab2eb5f2fc804e9b0cb43574282566",
"version" : "1.0.2"
"revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65",
"version" : "1.0.3"
}
},
{
Expand All @@ -194,8 +194,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
"version" : "1.5.3"
"revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
"version" : "1.5.4"
}
},
{
Expand All @@ -212,44 +212,44 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "702cd7c56d5d44eeba73fdf83918339b26dc855c",
"version" : "2.62.0"
"revision" : "635b2589494c97e48c62514bc8b37ced762e0a62",
"version" : "2.63.0"
}
},
{
"identity" : "swift-nio-extras",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "798c962495593a23fdea0c0c63fd55571d8dff51",
"version" : "1.20.0"
"revision" : "363da63c1966405764f380c627409b2f9d9e710b",
"version" : "1.21.0"
}
},
{
"identity" : "swift-nio-http2",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "3bd9004b9d685ed6b629760fc84903e48efec806",
"version" : "1.29.0"
"revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87",
"version" : "1.30.0"
}
},
{
"identity" : "swift-nio-ssl",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "320bd978cceb8e88c125dcbb774943a92f6286e9",
"version" : "2.25.0"
"revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5",
"version" : "2.26.0"
}
},
{
"identity" : "swift-nio-transport-services",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
"revision" : "ebf8b9c365a6ce043bf6e6326a04b15589bd285e",
"version" : "1.20.0"
"revision" : "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce",
"version" : "1.20.1"
}
},
{
Expand Down Expand Up @@ -279,6 +279,15 @@
"version" : "0.13.0"
}
},
{
"identity" : "swift-perception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-perception",
"state" : {
"revision" : "42240120b2a8797595433288ab4118f8042214c3",
"version" : "1.1.1"
}
},
{
"identity" : "swift-prelude",
"kind" : "remoteSourceControl",
Expand All @@ -293,17 +302,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing",
"state" : {
"revision" : "59b663f68e69f27a87b45de48cb63264b8194605",
"version" : "1.15.1"
"revision" : "8e68404f641300bfd0e37d478683bb275926760c",
"version" : "1.15.2"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax",
"state" : {
"revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036",
"version" : "509.0.2"
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
}
},
{
"identity" : "swift-system",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"state" : {
"revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
"version" : "1.2.1"
}
},
{
Expand Down Expand Up @@ -356,8 +374,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "23cbf2294e350076ea4dbd7d5d047c1e76b03631",
"version" : "1.0.2"
"revision" : "b58e6627149808b40634c4552fcf2f44d0b3ca87",
"version" : "1.1.0"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else
@git lfs pull
endif

PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17,iPhone \d\+ Pro [^M])
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.2,iPhone \d\+ Pro [^M])
test-client:
@xcodebuild test \
-project App/isowords.xcodeproj \
Expand Down
27 changes: 20 additions & 7 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ var package = Package(
"SiteMiddleware",
.product(name: "HttpPipeline", package: "swift-web"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "Prelude", package: "swift-prelude"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
Expand Down Expand Up @@ -161,6 +162,7 @@ var package = Package(
"FirstPartyMocks",
"SharedModels",
"TestHelpers",
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "Overture", package: "swift-overture"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
Expand Down Expand Up @@ -399,6 +401,7 @@ if ProcessInfo.processInfo.environment["TEST_SERVER"] == nil {
"FirstPartyMocks",
"TestHelpers",
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "Overture", package: "swift-overture"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
Expand Down Expand Up @@ -1030,6 +1033,7 @@ package.targets.append(contentsOf: [
"AppSiteAssociationMiddleware",
"SiteMiddleware",
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
]
),
Expand Down Expand Up @@ -1058,6 +1062,7 @@ package.targets.append(contentsOf: [
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "HttpPipeline", package: "swift-web"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
exclude: ["__Snapshots__"]
Expand Down Expand Up @@ -1121,6 +1126,7 @@ package.targets.append(contentsOf: [
"DemoMiddleware",
"SiteMiddleware",
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
]
),
Expand Down Expand Up @@ -1149,6 +1155,7 @@ package.targets.append(contentsOf: [
"SiteMiddleware",
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
exclude: ["__Snapshots__"]
Expand Down Expand Up @@ -1193,6 +1200,7 @@ package.targets.append(contentsOf: [
.product(name: "Either", package: "swift-prelude"),
.product(name: "HttpPipeline", package: "swift-web"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "Overture", package: "swift-overture"),
.product(name: "Prelude", package: "swift-prelude"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
Expand Down Expand Up @@ -1247,13 +1255,6 @@ package.targets.append(contentsOf: [
.product(name: "HttpPipeline", package: "swift-web"),
]
),
.target(
name: "ServerTestHelpers",
dependencies: [
.product(name: "Either", package: "swift-prelude"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
]
),
.testTarget(
name: "ServerConfigMiddlewareTests",
dependencies: [
Expand All @@ -1262,9 +1263,17 @@ package.targets.append(contentsOf: [
.product(name: "Either", package: "swift-prelude"),
.product(name: "HttpPipeline", package: "swift-web"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "Prelude", package: "swift-prelude"),
]
),
.target(
name: "ServerTestHelpers",
dependencies: [
.product(name: "Either", package: "swift-prelude"),
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
]
),
.target(
name: "ShareGameMiddleware",
dependencies: [
Expand All @@ -1283,6 +1292,7 @@ package.targets.append(contentsOf: [
"SiteMiddleware",
"TestHelpers",
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
exclude: ["__Snapshots__"]
Expand Down Expand Up @@ -1318,6 +1328,7 @@ package.targets.append(contentsOf: [
"SiteMiddleware",
"TestHelpers",
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
],
exclude: ["__Snapshots__"]
Expand All @@ -1335,6 +1346,7 @@ package.targets.append(contentsOf: [
name: "SnsClientTests",
dependencies: [
"SnsClient",
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
]
),
Expand Down Expand Up @@ -1364,6 +1376,7 @@ package.targets.append(contentsOf: [
"SiteMiddleware",
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "HttpPipelineTestSupport", package: "swift-web"),
.product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
]
),
Expand Down
1 change: 0 additions & 1 deletion Sources/CubeCore/CubeSceneView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ public class CubeSceneView: SCNView, UIGestureRecognizerDelegate {

self.gameCubeNode.childNodes.forEach { $0.removeFromParentNode() }


LatticePoint.cubeIndices.forEach { index in
let cube = CubeNode(
letterGeometry: letterGeometry,
Expand Down
16 changes: 10 additions & 6 deletions Tests/AppSiteAssociationMiddlewareTests/AppSiteAssociationMiddlewareTests.swift
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
import AppSiteAssociationMiddleware
import Foundation
#if canImport(FoundationNetworking)
import FoundationNetworking
#endif
import HttpPipeline
import HttpPipelineTestSupport
import InlineSnapshotTesting
import Prelude
import ServerRouter
import SharedModels
import SiteMiddleware
import SnapshotTesting
import XCTest

#if canImport(FoundationNetworking)
import FoundationNetworking
#endif

class AppSiteAssociationMiddlewareTests: XCTestCase {
func testBasics() throws {
let request = URLRequest(url: URL(string: "/.well-known/apple-app-site-association")!)
let middleware = siteMiddleware(environment: .testValue)
let result = middleware(connection(from: request)).perform()

_assertInlineSnapshot(matching: result, as: .conn, with: #"""
assertInlineSnapshot(of: result, as: .conn) {
#"""
GET /.well-known/apple-app-site-association
200 OK
Expand Down Expand Up @@ -54,6 +56,8 @@ class AppSiteAssociationMiddlewareTests: XCTestCase {
]
}
}
"""#)
"""#
}
}
}
Loading

0 comments on commit cee0c1c

Please sign in to comment.