SnapshotTesting 2.0

.editorconfig

@@ -1,9 +1,8 @@
-# editorconfig.org
-
 root = true
 
 [*]
 indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
+indent_size = 4
+end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true

.swift-format

@@ -0,0 +1,62 @@
+{
+  "version" : 1,
+  "indentation" : {
+    "spaces" : 4
+  },
+  "tabWidth" : 4,
+  "fileScopedDeclarationPrivacy" : {
+    "accessLevel" : "private"
+  },
+  "spacesAroundRangeFormationOperators" : false,
+  "indentConditionalCompilationBlocks" : false,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : true,
+  "lineBreakBeforeEachGenericRequirement" : true,
+  "lineLength" : 120,
+  "maximumBlankLines" : 1,
+  "respectsExistingLineBreaks" : true,
+  "prioritizeKeepingFunctionOutputTogether" : true,
+  "rules" : {
+    "AllPublicDeclarationsHaveDocumentation" : false,
+    "AlwaysUseLiteralForEmptyCollectionInit" : false,
+    "AlwaysUseLowerCamelCase" : false,
+    "AmbiguousTrailingClosureOverload" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : false,
+    "DoNotUseSemicolons" : true,
+    "DontRepeatTypeInStaticProperties" : true,
+    "FileScopedDeclarationPrivacy" : true,
+    "FullyIndirectEnum" : true,
+    "GroupNumericLiterals" : true,
+    "IdentifiersMustBeASCII" : true,
+    "NeverForceUnwrap" : false,
+    "NeverUseForceTry" : false,
+    "NeverUseImplicitlyUnwrappedOptionals" : false,
+    "NoAccessLevelOnExtensionDeclaration" : true,
+    "NoAssignmentInExpressions" : true,
+    "NoBlockComments" : true,
+    "NoCasesWithOnlyFallthrough" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoLabelsInCasePatterns" : true,
+    "NoLeadingUnderscores" : false,
+    "NoParensAroundConditions" : true,
+    "NoVoidReturnOnFunctionSignature" : true,
+    "OmitExplicitReturns" : true,
+    "OneCasePerLine" : true,
+    "OneVariableDeclarationPerLine" : true,
+    "OnlyOneTrailingClosureArgument" : true,
+    "OrderedImports" : true,
+    "ReplaceForEachWithForLoop" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseEarlyExits" : false,
+    "UseExplicitNilCheckInConditions" : false,
+    "UseLetInEveryBoundCaseVariable" : false,
+    "UseShorthandTypeNames" : true,
+    "UseSingleLinePropertyGetter" : false,
+    "UseSynthesizedInitializer" : false,
+    "UseTripleSlashForDocumentationComments" : true,
+    "UseWhereClausesInForLoops" : false,
+    "ValidateDocumentationComments" : false
+  }
+}

Makefile

@@ -32,6 +32,6 @@ format:
 		--ignore-unparsable-files \
 		--in-place \
 		--recursive \
-		./Package.swift ./Sources ./Tests
+		Package.swift ./Tests $(find ./Sources -name "*.swift" \ -not -path "./Sources/Deprecated/*")
 
 test-all: test-linux test-macos test-ios

Package.swift

@@ -1,69 +1,135 @@
-// swift-tools-version:5.9
+// swift-tools-version: 6.1
 
 import PackageDescription
 
 let package = Package(
-  name: "swift-snapshot-testing",
-  platforms: [
-    .iOS(.v13),
-    .macOS(.v10_15),
-    .tvOS(.v13),
-    .watchOS(.v6),
-  ],
-  products: [
-    .library(
-      name: "SnapshotTesting",
-      targets: ["SnapshotTesting"]
-    ),
-    .library(
-      name: "InlineSnapshotTesting",
-      targets: ["InlineSnapshotTesting"]
-    ),
-    .library(
-      name: "SnapshotTestingCustomDump",
-      targets: ["SnapshotTestingCustomDump"]
-    ),
-  ],
-  dependencies: [
-    .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
-    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),
-  ],
-  targets: [
-    .target(
-      name: "SnapshotTesting"
-    ),
-    .testTarget(
-      name: "SnapshotTestingTests",
-      dependencies: [
-        "SnapshotTesting"
-      ],
-      exclude: [
-        "__Fixtures__",
-        "__Snapshots__",
-      ]
-    ),
-    .target(
-      name: "InlineSnapshotTesting",
-      dependencies: [
-        "SnapshotTesting",
-        "SnapshotTestingCustomDump",
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-      ]
-    ),
-    .testTarget(
-      name: "InlineSnapshotTestingTests",
-      dependencies: [
-        "InlineSnapshotTesting"
-      ]
-    ),
-    .target(
-      name: "SnapshotTestingCustomDump",
-      dependencies: [
-        "SnapshotTesting",
-        .product(name: "CustomDump", package: "swift-custom-dump"),
-      ]
-    ),
-  ]
+    name: "swift-snapshot-testing",
+    platforms: [
+        .iOS(.v13),
+        .macOS(.v10_15),
+        .tvOS(.v13),
+        .watchOS(.v6),
+    ],
+    products: [
+        .library(
+            name: "XCSnapshotTesting",
+            targets: ["XCSnapshotTesting"]
+        ),
+        .library(
+            name: "SnapshotTesting",
+            targets: ["SnapshotTesting"]
+        ),
+        .library(
+            name: "SnapshotTestingCustomDump",
+            targets: ["SnapshotTestingCustomDump"]
+        ),
+        .library(
+            name: "InlineSnapshotTesting",
+            targets: ["InlineSnapshotTesting"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
+        .package(url: "https://github.com/swiftlang/swift-syntax", "601.0.0"..<"602.0.0"),
+    ],
+    targets: [
+        /* DEPRECATED TARGETS */
+        .target(
+            name: "_SnapshotTesting",
+            path: "Sources/Deprecated/SnapshotTesting",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .target(
+            name: "_SnapshotTestingCustomDump",
+            dependencies: [
+                "_SnapshotTesting",
+                .product(name: "CustomDump", package: "swift-custom-dump"),
+            ],
+            path: "Sources/Deprecated/SnapshotTestingCustomDump",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .target(
+            name: "_InlineSnapshotTesting",
+            dependencies: [
+                "_SnapshotTesting",
+                "_SnapshotTestingCustomDump",
+                .product(name: "SwiftParser", package: "swift-syntax"),
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
+            ],
+            path: "Sources/Deprecated/InlineSnapshotTesting",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        /* TARGETS */
+        .target(
+            name: "XCSnapshotTesting",
+            dependencies: ["_SnapshotTesting"]
+        ),
+        .target(
+            name: "SnapshotTesting",
+            dependencies: ["XCSnapshotTesting"]
+        ),
+        .target(
+            name: "SnapshotTestingCustomDump",
+            dependencies: [
+                "XCSnapshotTesting",
+                .product(name: "CustomDump", package: "swift-custom-dump"),
+                "_SnapshotTestingCustomDump",
+            ]
+        ),
+        .target(
+            name: "InlineSnapshotTesting",
+            dependencies: [
+                "SnapshotTesting",
+                "SnapshotTestingCustomDump",
+                .product(name: "SwiftParser", package: "swift-syntax"),
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
+                "_InlineSnapshotTesting",
+            ]
+        ),
+        /* DEPRECATED TESTS */
+        .testTarget(
+            name: "_SnapshotTestingTests",
+            dependencies: ["XCSnapshotTesting", "SnapshotTesting"],
+            path: "Tests/Deprecated/SnapshotTestingTests",
+            exclude: [
+                "__Fixtures__",
+                "__Snapshots__",
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .testTarget(
+            name: "_InlineSnapshotTestingTests",
+            dependencies: ["InlineSnapshotTesting"],
+            path: "Tests/Deprecated/InlineSnapshotTestingTests",
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        /* TESTS */
+        .testTarget(
+            name: "XCSnapshotTestingTests",
+            dependencies: ["XCSnapshotTesting"],
+            exclude: [
+                "__Fixtures__",
+                "__Snapshots__",
+            ]
+        ),
+        .testTarget(
+            name: "SnapshotTestingTests",
+            dependencies: ["SnapshotTesting"],
+            exclude: ["__Snapshots__"]
+        ),
+        .testTarget(
+            name: "SnapshotTestingCustomDumpTests",
+            dependencies: [
+                "SnapshotTestingCustomDump"
+            ]
+        ),
+        .testTarget(
+            name: "InlineSnapshotTestingTests",
+            dependencies: [
+                "InlineSnapshotTesting"
+            ]
+        ),
+    ]
 )