Skip to content
Open

6.2 #422

Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Install Swift
uses: tayloraswift/swift-install-action@master
with:
swift-prefix: "swift-6.1.2-release/ubuntu2404/swift-6.1.2-RELEASE"
swift-id: "swift-6.1.2-RELEASE-ubuntu24.04"
swift-prefix: "swift-6.2-release/ubuntu2404/swift-6.2-RELEASE"
swift-id: "swift-6.2-RELEASE-ubuntu24.04"

# This installs an older version of Unidoc, not the one we are testing.
# We use `--static-swift-stdlib` so it doesn’t matter if the Unidoc binary was
Expand All @@ -33,9 +33,9 @@ jobs:

- name: Build documentation
run: |
unidoc compile -I .. \
unidoc build \
--ci fail-on-errors \
--package-name swift-unidoc \
--project-path . \
--swift-toolchain $SWIFT_INSTALLATION

macos:
Expand All @@ -53,6 +53,6 @@ jobs:

- name: Build documentation
run: |
unidoc compile -I .. \
unidoc build \
--ci fail-on-errors \
--package-name swift-unidoc
--project-path .
6 changes: 3 additions & 3 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
-v $PWD:/swift/swift-unidoc \
-w /swift/swift-unidoc \
-e SWIFT_INSTALLATION=/usr \
swift:6.1.2-noble \
swift:6.2-noble \
/bin/bash Scripts/Linux/TestAll

linux:
Expand All @@ -47,8 +47,8 @@ jobs:
- name: Install Swift
uses: tayloraswift/swift-install-action@master
with:
swift-prefix: "swift-6.1.2-release/ubuntu2404/swift-6.1.2-RELEASE"
swift-id: "swift-6.1.2-RELEASE-ubuntu24.04"
swift-prefix: "swift-6.2-release/ubuntu2404/swift-6.2-RELEASE"
swift-id: "swift-6.2-RELEASE-ubuntu24.04"

- name: Checkout repository
uses: actions/checkout@v3
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
.ssgc
.testing
.unidoc
.vscode
.DS_Store

/.vscode/launch.json
/.vscode/settings.json

/*.tar.gz
/unidoc
Expand Down
159 changes: 159 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "swift",
"args": [
"build",
"-c",
"debug",
"--build-tests",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Build All",
"detail": "swift build"
},
{
"type": "swift",
"args": [
"build",
"-c",
"release",
"--build-tests",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Build All (release)",
"detail": "swift build -c release"
},
{
"type": "swift",
"args": [
"test",
"-c",
"release",
"--skip-build",
"--skip",
"SymbolGraphValidationTests",
"--no-parallel",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Test All (release)",
"detail": "swift test -c release"
},
{
"type": "swift",
"args": [
"test",
"--skip-build",
"--filter",
"UCFTests",
"--no-parallel",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Test UCF",
"detail": "swift test"
},
{
"type": "swift",
"args": [
"test",
"--skip-build",
"--filter",
"MarkdownPluginSwiftTests",
"--no-parallel",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Test MarkdownPluginSwift",
"detail": "swift test"
},
{
"type": "swift",
"args": [
"test",
"--skip-build",
"--filter",
"MarkdownRenderingTests",
"--no-parallel",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Test MarkdownRendering",
"detail": "swift test"
},
{
"type": "swift",
"args": [
"test",
"--skip-build",
"--filter",
"SymbolGraphLinkerTests",
"--no-parallel",
"--explicit-target-dependency-import-check=error",
"--destination", "Scripts/Linux/x86_64/x86_64.json"
],
"env": {
"UNIDOC_ENABLE_INDEXSTORE": "1"
},
"disableTaskQueue": true,
"problemMatcher": [
"$swiftc"
],
"group": "build",
"label": "swift: Test SymbolGraphLinkerTests",
"detail": "swift test"
},
]
}
30 changes: 15 additions & 15 deletions Package.resolved

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

9 changes: 6 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:6.0
// swift-tools-version:6.2
import class Foundation.ProcessInfo
import PackageDescription
import CompilerPluginSupport
Expand Down Expand Up @@ -77,7 +77,7 @@ let package:Package = .init(
.package(url: "https://github.com/tayloraswift/swift-bson", .upToNextMinor(
from: "1.0.0")),
.package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
from: "1.1.0")),
from: "1.2.0")),
.package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
from: "0.5.0")),
.package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
Expand Down Expand Up @@ -113,7 +113,7 @@ let package:Package = .init(
.package(url: "https://github.com/apple/swift-markdown", .upToNextMinor(
from: "0.4.0")),
.package(url: "https://github.com/apple/swift-syntax",
from: "600.0.1"),
from: "602.0.0"),
],
targets: [
.executableTarget(name: "ssgc",
Expand Down Expand Up @@ -733,6 +733,9 @@ for target:PackageDescription.Target in package.targets
settings.append(.enableUpcomingFeature("ExistentialAny"))
settings.append(.enableExperimentalFeature("StrictConcurrency"))

settings.append(.treatWarning("ExistentialAny", as: .error))
settings.append(.treatWarning("MutableGlobalVariable", as: .error))

settings.append(.define("DEBUG", .when(configuration: .debug)))

$0 = settings
Expand Down
4 changes: 0 additions & 4 deletions Sources/HTTPClient/HTTP2/HTTP.Client2.InterfaceHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ import NIOCore
import NIOHPACK
import NIOHTTP2

extension ChannelHandlerContext:@retroactive @unchecked Sendable
{
}

extension HTTP.Client2
{
/// An HTTP/2 handler whose sole purpose is to initiate HTTP/2 streams in parallel by
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ extension SignatureSyntax.Autographer
}
}

mutating
func encode(type:GenericArgumentSyntax.Argument, stem:Bool = false)
{
switch type
{
case .type(let type):
self.encode(type: type, stem: stem)

case .expr:
self.autograph.append("_")
}
}
mutating
func encode(type:TypeSyntax, stem:Bool = false)
{
Expand Down Expand Up @@ -191,7 +203,7 @@ extension SignatureSyntax.Autographer
{
if let arguments:GenericArgumentListSyntax, resugar
{
let arguments:[TypeSyntax] = arguments.map(\.argument)
let arguments:[GenericArgumentSyntax.Argument] = arguments.map(\.argument)
let position:Int = name.positionAfterSkippingLeadingTrivia.utf8Offset

if self.sugarMap.arrays.contains(position), arguments.count == 1
Expand Down
2 changes: 1 addition & 1 deletion Sources/SourceDiagnostics/Contexts/DiagnosticContext.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Sources

@frozen @usableFromInline
struct DiagnosticContext<File>
struct DiagnosticContext<File>:SendableMetatype
{
@usableFromInline
let location:SourceLocation<File>?
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing_/TestBattery.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
public
protocol TestBattery
protocol TestBattery:SendableMetatype
{
static
var name:String { get }
Expand Down
Loading
Loading