Skip to content

Commit

Permalink
update swift-hash and swift-grammar dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tayloraswift committed Jun 1, 2024
1 parent 14a720b commit fee79d9
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 49 deletions.
60 changes: 29 additions & 31 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
{
"object": {
"pins": [
{
"package": "swift-atomics",
"repositoryURL": "https://github.com/apple/swift-atomics.git",
"state": {
"branch": null,
"revision": "cd142fd2f64be2100422d658e7411e39489da985",
"version": "1.2.0"
}
},
{
"package": "Swift Grammar",
"repositoryURL": "https://github.com/tayloraswift/swift-grammar",
"state": {
"branch": null,
"revision": "6db3dd8912fc7acb821021cd96677b2e0eeb09f0",
"version": "0.3.4"
}
},
{
"package": "swift-hash",
"repositoryURL": "https://github.com/tayloraswift/swift-hash",
"state": {
"branch": null,
"revision": "c7ba0cde5eb63042c2196b02b65a770101c1ac11",
"version": "0.5.0"
}
"pins" : [
{
"identity" : "swift-atomics",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
"version" : "1.2.0"
}
]
},
"version": 1
},
{
"identity" : "swift-grammar",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tayloraswift/swift-grammar",
"state" : {
"revision" : "642d5957896f06b03e35c48fc439488367d3fd21",
"version" : "0.4.0"
}
},
{
"identity" : "swift-hash",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tayloraswift/swift-hash",
"state" : {
"revision" : "7798c344afd5a96b689fa9904ad52242a85b5068",
"version" : "0.6.0"
}
}
],
"version" : 2
}
14 changes: 7 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import PackageDescription

let package:Package = .init(name: "swift-png",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
platforms: [.macOS("13.3"), .iOS("16.4"), .tvOS("16.4"), .watchOS("9.4")],
products: [
.library(name: "LZ77", targets: ["LZ77"]),
.library(name: "PNG", targets: ["PNG"]),
Expand All @@ -12,9 +12,9 @@ let package:Package = .init(name: "swift-png",
],
dependencies: [
.package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
from: "0.5.0")),
from: "0.6.0")),
.package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
from: "0.3.4")),
from: "0.4.0")),
],
targets: [
.target(name: "LZ77",
Expand All @@ -35,7 +35,7 @@ let package:Package = .init(name: "swift-png",
.executableTarget(name: "LZ77Tests",
dependencies: [
.target(name: "LZ77"),
.product(name: "Testing", package: "swift-grammar"),
.product(name: "Testing_", package: "swift-grammar"),
],
swiftSettings: [
.define("DEBUG", .when(configuration: .debug))
Expand All @@ -44,7 +44,7 @@ let package:Package = .init(name: "swift-png",
.executableTarget(name: "PNGTests",
dependencies: [
.target(name: "PNG"),
.product(name: "Testing", package: "swift-grammar"),
.product(name: "Testing_", package: "swift-grammar"),
],
swiftSettings: [
.define("DEBUG", .when(configuration: .debug))
Expand All @@ -53,7 +53,7 @@ let package:Package = .init(name: "swift-png",
.executableTarget(name: "PNGIntegrationTests",
dependencies: [
.target(name: "PNG"),
.product(name: "Testing", package: "swift-grammar"),
.product(name: "Testing_", package: "swift-grammar"),
],
exclude: [
"PngSuite.LICENSE",
Expand All @@ -66,7 +66,7 @@ let package:Package = .init(name: "swift-png",
.executableTarget(name: "PNGCompressionTests",
dependencies: [
.target(name: "PNG"),
.product(name: "Testing", package: "swift-grammar"),
.product(name: "Testing_", package: "swift-grammar"),
]),

.executableTarget(name: "PNGCompressionBenchmarks",
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.Bitstreams.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if DEBUG
@testable
import LZ77
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.Compression.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import LZ77
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.CompressionMicro.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import LZ77
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.F14.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if DEBUG
@testable
import LZ77
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.Matching.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if DEBUG
@testable
import LZ77
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/LZ77Tests/Main.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Testing
import Testing_

@main
enum Main:TestMain
Expand Down
2 changes: 1 addition & 1 deletion Sources/PNGCompressionTests/Main.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PNG
import Testing
import Testing_

struct _TestFailure:Error
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/PNGIntegrationTests/Main.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PNG
import Testing
import Testing_

struct _TestFailure:Error
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/PNGTests/Main.Filtering.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if DEBUG
@testable
import PNG
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/PNGTests/Main.Premultiplication.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PNG
import Testing
import Testing_

extension Main
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/PNGTests/Main.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Testing
import Testing_

@main
enum Main:TestMain
Expand Down

0 comments on commit fee79d9

Please sign in to comment.