diff --git a/Package.resolved b/Package.resolved index dc363640..1c481ddf 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "308e03b9090ee5c6d7965fe88ba3ff454b02b7e4d9f34bcc99f18bc08a32f5d5", + "originHash" : "53dd40ee0d12ba05a933cb20ee4ec3be7d13c230e10f1c54d004cec70294463f", "pins" : [ { "identity" : "combine-schedulers", @@ -55,6 +55,15 @@ "version" : "1.0.0" } }, + { + "identity" : "swift-issue-reporting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-issue-reporting", + "state" : { + "revision" : "d6adc8bc81e8ba37d3ecd094b78450853738a89f", + "version" : "2.0.0" + } + }, { "identity" : "swift-macro-testing", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 216c7275..d91b0009 100644 --- a/Package.swift +++ b/Package.swift @@ -38,14 +38,14 @@ let package = Package( .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"), .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.4"), .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"605.0.0"), ], targets: [ .target( name: "DependenciesTestObserver", dependencies: [ - .product(name: "IssueReporting", package: "xctest-dynamic-overlay") + .product(name: "IssueReporting", package: "swift-issue-reporting") ] ), .target( @@ -62,8 +62,7 @@ let package = Package( condition: .when(traits: ["CombineSchedulers"]) ), .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), ], swiftSettings: [ .enableUpcomingFeature("MemberImportVisibility") @@ -74,7 +73,7 @@ let package = Package( dependencies: [ "Dependencies", .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - .product(name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"), + .product(name: "IssueReportingTestSupport", package: "swift-issue-reporting"), ] ), .testTarget( @@ -82,7 +81,7 @@ let package = Package( dependencies: [ "Dependencies", "DependenciesTestSupport", - .product(name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"), + .product(name: "IssueReportingTestSupport", package: "swift-issue-reporting"), ], exclude: ["Dependencies.xctestplan"] ), @@ -90,8 +89,7 @@ let package = Package( name: "DependenciesMacros", dependencies: [ "DependenciesMacrosPlugin", - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), ] ), .macro( diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index a0060e69..2204f4aa 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -29,14 +29,14 @@ let package = Package( .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"), .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.4"), .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.4.0"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "2.0.0"), .package(url: "https://github.com/swiftlang/swift-syntax", "600.0.0"..<"603.0.0"), ], targets: [ .target( name: "DependenciesTestObserver", dependencies: [ - .product(name: "IssueReporting", package: "xctest-dynamic-overlay") + .product(name: "IssueReporting", package: "swift-issue-reporting") ] ), .target( @@ -45,8 +45,7 @@ let package = Package( .product(name: "Clocks", package: "swift-clocks"), .product(name: "CombineSchedulers", package: "combine-schedulers"), .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), ], swiftSettings: [ .define("Clocks"), @@ -60,7 +59,7 @@ let package = Package( dependencies: [ "Dependencies", .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - .product(name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"), + .product(name: "IssueReportingTestSupport", package: "swift-issue-reporting"), ] ), .testTarget( @@ -68,7 +67,7 @@ let package = Package( dependencies: [ "Dependencies", "DependenciesTestSupport", - .product(name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"), + .product(name: "IssueReportingTestSupport", package: "swift-issue-reporting"), ], exclude: ["Dependencies.xctestplan"] ), @@ -76,8 +75,7 @@ let package = Package( name: "DependenciesMacros", dependencies: [ "DependenciesMacrosPlugin", - .product(name: "IssueReporting", package: "xctest-dynamic-overlay"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), + .product(name: "IssueReporting", package: "swift-issue-reporting"), ] ), .macro( diff --git a/Sources/Dependencies/Internal/Exports.swift b/Sources/Dependencies/Internal/Exports.swift index f0ca499d..5254c4f5 100644 --- a/Sources/Dependencies/Internal/Exports.swift +++ b/Sources/Dependencies/Internal/Exports.swift @@ -7,5 +7,4 @@ #endif @_exported import ConcurrencyExtras @_exported import IssueReporting - @_exported import XCTestDynamicOverlay #endif diff --git a/Sources/DependenciesMacros/Internal/Exports.swift b/Sources/DependenciesMacros/Internal/Exports.swift index 73d64ec6..4ec9615e 100644 --- a/Sources/DependenciesMacros/Internal/Exports.swift +++ b/Sources/DependenciesMacros/Internal/Exports.swift @@ -1,4 +1,3 @@ #if !EXCLUDE_EXPORTS @_exported import IssueReporting - @_exported import XCTestDynamicOverlay #endif