Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dependency versions, adapt to swift-macro-testing updates #2

Merged
merged 1 commit into from
Oct 7, 2023
Merged

Fix dependency versions, adapt to swift-macro-testing updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ let package = Package(
// Tools for macro development
.package(
url: "https://github.com/stackotter/swift-macro-toolkit",
branch: "main"
from: "0.3.0"
),

// Tools for macro development
.package(
url: "https://github.com/pointfreeco/swift-macro-testing",
branch: "main"
from: "0.2.1"
),
],
targets: [
Expand Down
56 changes: 28 additions & 28 deletions Tests/MacroCodableKitTests/AllOfCodable/AllOfMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@AllOfCodable
enum A {}
"""
} matches: {
} diagnostics: {
"""
@AllOfCodable
┬────────────
Expand All @@ -45,7 +45,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A {
let brand: Brand
Expand Down Expand Up @@ -74,7 +74,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Encodable {
let brand: Brand
Expand All @@ -99,7 +99,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A {
let brand: Brand?
Expand Down Expand Up @@ -128,7 +128,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Decodable {
let brand: Brand
Expand All @@ -152,7 +152,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Codable {
let brand: Brand
Expand All @@ -169,7 +169,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
public struct A {
let brand: Brand
Expand Down Expand Up @@ -198,7 +198,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand Down Expand Up @@ -228,7 +228,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand Down Expand Up @@ -257,7 +257,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand Down Expand Up @@ -288,7 +288,7 @@
@AllOfDecodable
enum A {}
"""
} matches: {
} diagnostics: {
"""
@AllOfDecodable
┬──────────────
Expand All @@ -305,7 +305,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A {
let brand: Brand
Expand All @@ -330,7 +330,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Encodable {
let brand: Brand
Expand All @@ -355,7 +355,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Decodable {
let brand: Brand
Expand All @@ -372,7 +372,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Codable {
let brand: Brand
Expand All @@ -389,7 +389,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
public struct A {
let brand: Brand
Expand All @@ -414,7 +414,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand All @@ -440,7 +440,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand All @@ -466,7 +466,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand Down Expand Up @@ -495,7 +495,7 @@
@AllOfEncodable
enum A {}
"""
} matches: {
} diagnostics: {
"""
@AllOfEncodable
┬──────────────
Expand All @@ -512,7 +512,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A {
let brand: Brand
Expand All @@ -536,7 +536,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Encodable {
let brand: Brand
Expand All @@ -553,7 +553,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Decodable {
let brand: Brand
Expand All @@ -577,7 +577,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
struct A: Codable {
let brand: Brand
Expand All @@ -594,7 +594,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
public struct A {
let brand: Brand
Expand All @@ -618,7 +618,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand All @@ -643,7 +643,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand All @@ -668,7 +668,7 @@
let company: Company
}
"""
} matches: {
} expansion: {
"""
private struct A {
let brand: Brand
Expand Down
2 changes: 1 addition & 1 deletion Tests/MacroCodableKitTests/Annotations/Macro/AnnotationsMixMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ final class AnnotationsMixMacroTests: XCTestCase {
let boolean2: Bool?
}
"""
} matches: {
} expansion: {
"""
struct DefaultValueBool {
let boolean1: Bool
Expand Down
10 changes: 5 additions & 5 deletions Tests/MacroCodableKitTests/Annotations/Macro/CustomCodingMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class CustomCodingMacroTests: XCTestCase {
let safeStrings: [String]
}
"""
} matches: {
} expansion: {
"""
struct SafeCodingArray1: Equatable {
let strings: [String]
Expand Down Expand Up @@ -72,7 +72,7 @@ final class CustomCodingMacroTests: XCTestCase {
let safeStrings: [String]?
}
"""
} matches: {
} expansion: {
"""
struct SafeCodingArray2: Equatable {
@CustomCoding(SafeDecoding)
Expand Down Expand Up @@ -109,7 +109,7 @@ final class CustomCodingMacroTests: XCTestCase {
let safeStringByInt: [Int: String]
}
"""
} matches: {
} expansion: {
"""
struct SafeCodingDictionary2 {
let stringByInt: [Int: String]
Expand Down Expand Up @@ -151,7 +151,7 @@ final class CustomCodingMacroTests: XCTestCase {
let safeIntByString: [String: Int]?
}
"""
} matches: {
} expansion: {
"""
struct SafeCodingDictionary3 {
let intByString: [String: Int]
Expand Down Expand Up @@ -191,7 +191,7 @@ final class CustomCodingMacroTests: XCTestCase {
let someType: SomeType?
}
"""
} matches: {
} expansion: {
"""
struct SomeTypeCustomCoding {
@CustomCoding(XXXX)
Expand Down
6 changes: 3 additions & 3 deletions Tests/MacroCodableKitTests/Annotations/Macro/DefaultValueMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ final class DefaultValueMacroTests: XCTestCase {
let boolean5: Bool?
}
"""
} matches: {
} expansion: {
"""
struct DefaultValueBool {
let boolean1: Bool
Expand Down Expand Up @@ -109,7 +109,7 @@ final class DefaultValueMacroTests: XCTestCase {
let int4: Int?
}
"""
} matches: {
} expansion: {
"""
struct DefaultValueInt {
let int1: Int
Expand Down Expand Up @@ -167,7 +167,7 @@ final class DefaultValueMacroTests: XCTestCase {
let string: String
}
"""
} matches: {
} expansion: {
"""
struct A {
let int1: Bool
Expand Down
2 changes: 1 addition & 1 deletion Tests/MacroCodableKitTests/Annotations/Macro/ValueStrategyMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class ValueStrategyMacroTests: XCTestCase {
let data: Data?
}
"""
} matches: {
} expansion: {
"""
struct Base64Struct {
let data: Data
Expand Down
Loading