Fix SPM integration

Adjust supported swift versions Fix FileString conversion Add missing import
ashfurrow · Sep 5, 2021 · 0f72420 · 0f72420
1 parent 1b5447f
commit 0f72420
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/Nimble_Snapshots/DynamicSize/DynamicSizeSnapshot.swift b/Nimble_Snapshots/DynamicSize/DynamicSizeSnapshot.swift
@@ -203,11 +203,13 @@ func performDynamicSizeSnapshotTest(_ name: String?,
 
         resizer.resize(view: view, for: size)
 
+        let filename = "\(actualExpression.location.file)"
+
         return FBSnapshotTest.compareSnapshot(instance, isDeviceAgnostic: isDeviceAgnostic, usesDrawRect: usesDrawRect,
                                               snapshot: finalSnapshotName, record: isRecord,
                                               referenceDirectory: referenceImageDirectory, tolerance: tolerance,
                                               perPixelTolerance: pixelTolerance,
-                                              filename: actualExpression.location.file, identifier: nil,
+                                              filename: filename, identifier: nil,
                                               shouldIgnoreScale: shouldIgnoreScale)
     }
 

diff --git a/Nimble_Snapshots/DynamicType/PrettyDynamicTypeSyntax.swift b/Nimble_Snapshots/DynamicType/PrettyDynamicTypeSyntax.swift
@@ -1,4 +1,5 @@
 import Nimble
+import UIKit
 
 // MARK: - Nicer syntax using == operator
 

diff --git a/Nimble_Snapshots/HaveValidSnapshot.swift b/Nimble_Snapshots/HaveValidSnapshot.swift
@@ -124,7 +124,7 @@ public func recordAllSnapshots() {
     switchChecksWithRecords = true
 }
 
-func getDefaultReferenceDirectory(_ sourceFileName: String) -> String {
+func getDefaultReferenceDirectory(_ sourceFileName: FileString) -> String {
     if let globalReference = FBSnapshotTest.sharedInstance.referenceImagesDirectory {
         return globalReference
     }
@@ -137,7 +137,8 @@ func getDefaultReferenceDirectory(_ sourceFileName: String) -> String {
     // then append "/ReferenceImages" and use that.
 
     // Grab the file's path
-    let pathComponents = (sourceFileName as NSString).pathComponents as NSArray
+    let fileName = NSString(string: "\(sourceFileName)")
+    let pathComponents = fileName.pathComponents as NSArray
 
     // Find the directory in the path that ends with a test suffix.
     let testPath = pathComponents.first { component -> Bool in
@@ -211,12 +212,13 @@ private func performSnapshotTest(_ name: String?,
     let snapshotName = sanitizedTestName(name)
     let tolerance = tolerance ?? getTolerance()
     let pixelTolerance = pixelTolerance ?? getPixelTolerance()
+    let filename = "\(actualExpression.location.file)"
 
     let result = FBSnapshotTest.compareSnapshot(instance, isDeviceAgnostic: isDeviceAgnostic,
                                                 usesDrawRect: usesDrawRect, snapshot: snapshotName, record: false,
                                                 referenceDirectory: referenceImageDirectory, tolerance: tolerance,
                                                 perPixelTolerance: pixelTolerance,
-                                                filename: actualExpression.location.file, identifier: identifier, shouldIgnoreScale: shouldIgnoreScale)
+                                                filename: filename, identifier: identifier, shouldIgnoreScale: shouldIgnoreScale)
 
     return PredicateResult(status: PredicateStatus(bool: result),
                            message: .fail("expected a matching snapshot in \(snapshotName)"))
@@ -235,6 +237,7 @@ private func recordSnapshot(_ name: String?,
     let snapshotName = sanitizedTestName(name)
     let tolerance = getTolerance()
     let pixelTolerance = getPixelTolerance()
+    let filename = "\(actualExpression.location.file)"
     var message: String = ""
 
     if FBSnapshotTest.compareSnapshot(instance,
@@ -245,7 +248,7 @@ private func recordSnapshot(_ name: String?,
                                       referenceDirectory: referenceImageDirectory,
                                       tolerance: tolerance,
                                       perPixelTolerance: pixelTolerance,
-                                      filename: actualExpression.location.file,
+                                      filename: filename,
                                       identifier: identifier,
                                       shouldIgnoreScale: shouldIgnoreScale) {
         let name = name ?? snapshotName

diff --git a/Nimble_Snapshots/Nimble_Snapshots.h b/Nimble_Snapshots/Nimble_Snapshots.h
@@ -8,4 +8,6 @@ FOUNDATION_EXPORT const unsigned char Nimble_SnapshotsVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <Nimble_Snapshots/PublicHeader.h>
 
+#if __has_include("NBSMockedApplication.h")
 #import "NBSMockedApplication.h"
+#endif
diff --git a/Nimble_Snapshots/XCTestObservationCenter+CurrentTestCaseTracker.m b/Nimble_Snapshots/XCTestObservationCenter+CurrentTestCaseTracker.m
@@ -1,6 +1,8 @@
 #import "XCTestObservationCenter+CurrentTestCaseTracker.h"
 #if __has_include("Nimble_Snapshots-Swift.h")
     #import "Nimble_Snapshots-Swift.h"
+#elif SWIFT_PACKAGE
+@import NimbleSnapshotsSwift;
 #else
     #import <Nimble_Snapshots/Nimble_Snapshots-Swift.h>
 #endif

diff --git a/Package.swift b/Package.swift
@@ -9,20 +9,22 @@ let package = Package(
     products: [
         .library(
             name: "Nimble-Snapshots",
-            targets: ["NimbleSnapshotsSwift",
-                      "NimbleSnapshotsObjc"]),
+            targets: ["NimbleSnapshotsObjc"])
     ],
     dependencies: [
-        .package(url: "https://github.com/uber/ios-snapshot-test-case.git", .upToNextMajor(from: "7.0.0")),
-        .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0"))
+        .package(name: "FBSnapshotTestCase",
+                 url: "https://github.com/uber/ios-snapshot-test-case.git",
+                 .upToNextMajor(from: "7.0.0")),
+        .package(url: "https://github.com/Quick/Nimble.git",
+                 .upToNextMajor(from: "9.0.0"))
     ],
     targets: [
         .target(
             name: "NimbleSnapshotsSwift",
-            dependencies: ["NimbleSnapshotsObjc"],
+            dependencies: ["FBSnapshotTestCase",
+                           "Nimble"],
             path: "Nimble_Snapshots",
-            exclude: ["Nimble_Snapshots.h",
-                      "XCTestObservationCenter+CurrentTestCaseTracker.h",
+            exclude: ["XCTestObservationCenter+CurrentTestCaseTracker.h",
                       "XCTestObservationCenter+CurrentTestCaseTracker.m",
                       "DynamicType/NBSMockedApplication.h",
                       "DynamicType/NBSMockedApplication.m",
@@ -37,9 +39,11 @@ let package = Package(
         ),
         .target(
             name: "NimbleSnapshotsObjc",
+            dependencies: [
+                "NimbleSnapshotsSwift"
+            ],
             path: "Nimble_Snapshots",
-            exclude: ["Nimble_Snapshots.h",
-                      "CurrentTestCaseTracker.swift",
+            exclude: ["CurrentTestCaseTracker.swift",
                       "HaveValidSnapshot.swift",
                       "PrettySyntax.swift",
                       "DynamicSize/DynamicSizeSnapshot.swift",
@@ -51,7 +55,7 @@ let package = Package(
                       "XCTestObservationCenter+CurrentTestCaseTracker.m",
                       "DynamicType/NBSMockedApplication.h",
                       "DynamicType/NBSMockedApplication.m"]
-        ),
+        )
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageVersions: [.v4_2, .v5]
 )