Skip to content

Commit

Permalink
Merge pull request #232 from ashfurrow/fix/spm
Browse files Browse the repository at this point in the history 
SPM Fixes
  • Loading branch information
@ashfurrow
ashfurrow authored Sep 7, 2021
2 parents 1b5447f + 8c2726c commit 02497b8
Show file tree
Hide file tree
Showing 15 changed files with 575 additions and 554 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ Nimble_Snapshots.xcodeproj/xcuserdata/
Carthage/Checkouts
Carthage/Build

# Swift Package Manager
.swiftpm

.DS_Store
4 changes: 0 additions & 4 deletions Bootstrap/Bootstrap.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@
5EFDC76F1F8699AA001453EC /* DynamicTypeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicTypeTests.swift; sourceTree = "<group>"; };
5EFDC7761F8699F9001453EC /* BootstrapCustomFolderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootstrapCustomFolderTests.swift; sourceTree = "<group>"; };
65902858E3A876C766DEE813 /* Pods-Bootstrap-BootstrapTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bootstrap-BootstrapTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Bootstrap-BootstrapTests/Pods-Bootstrap-BootstrapTests.release.xcconfig"; sourceTree = "<group>"; };
A3B52C622E22BF8DD5DB225F /* Pods-BootstrapTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BootstrapTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BootstrapTests/Pods-BootstrapTests.release.xcconfig"; sourceTree = "<group>"; };
C973AE4C6F6F24ACE0BAF412 /* Pods-Bootstrap-BootstrapTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bootstrap-BootstrapTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Bootstrap-BootstrapTests/Pods-Bootstrap-BootstrapTests.debug.xcconfig"; sourceTree = "<group>"; };
CF2E7C50C1B84B73173ED6F7 /* Pods_Bootstrap_BootstrapTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Bootstrap_BootstrapTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CF6BEDA968312D264332A856 /* Pods-Bootstrap.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bootstrap.release.xcconfig"; path = "Pods/Target Support Files/Pods-Bootstrap/Pods-Bootstrap.release.xcconfig"; sourceTree = "<group>"; };
DF74FF8B3AD029F099535426 /* Pods-BootstrapTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BootstrapTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BootstrapTests/Pods-BootstrapTests.debug.xcconfig"; sourceTree = "<group>"; };
EC0A90E60E7AFC30BF41766C /* Pods-Bootstrap.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bootstrap.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Bootstrap/Pods-Bootstrap.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -135,8 +133,6 @@
C8BD3DA99C7599D57DBEC91F /* Pods */ = {
isa = PBXGroup;
children = (
DF74FF8B3AD029F099535426 /* Pods-BootstrapTests.debug.xcconfig */,
A3B52C622E22BF8DD5DB225F /* Pods-BootstrapTests.release.xcconfig */,
EC0A90E60E7AFC30BF41766C /* Pods-Bootstrap.debug.xcconfig */,
CF6BEDA968312D264332A856 /* Pods-Bootstrap.release.xcconfig */,
C973AE4C6F6F24ACE0BAF412 /* Pods-Bootstrap-BootstrapTests.debug.xcconfig */,
Expand Down
672 changes: 334 additions & 338 deletions Bootstrap/Pods/Pods.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Bootstrap/Pods/Target Support Files/Nimble-Snapshots/Nimble-Snapshots-umbrella.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions Nimble_Snapshots.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
D47CB5FA1EC9973C00D5588D /* XCTestObservationCenter+CurrentTestCaseTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = D47CB5F81EC9973C00D5588D /* XCTestObservationCenter+CurrentTestCaseTracker.m */; };
D4F7D47E1ED764CD00B4D2FE /* DynamicSizeSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D4781ED764CD00B4D2FE /* DynamicSizeSnapshot.swift */; };
D4F7D47F1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */; };
D4F7D4801ED764CD00B4D2FE /* NBSMockedApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = D4F7D47B1ED764CD00B4D2FE /* NBSMockedApplication.h */; settings = {ATTRIBUTES = (Public, ); }; };
D4F7D4811ED764CD00B4D2FE /* NBSMockedApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D47C1ED764CD00B4D2FE /* NBSMockedApplication.m */; };
D4F7D4821ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */; };
DD83832926E555BC0040266F /* NBSMockedApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD83832826E555BC0040266F /* NBSMockedApplication.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -35,9 +34,8 @@
D47CB5F81EC9973C00D5588D /* XCTestObservationCenter+CurrentTestCaseTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCTestObservationCenter+CurrentTestCaseTracker.m"; sourceTree = "<group>"; };
D4F7D4781ED764CD00B4D2FE /* DynamicSizeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicSizeSnapshot.swift; sourceTree = "<group>"; };
D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HaveValidDynamicTypeSnapshot.swift; sourceTree = "<group>"; };
D4F7D47B1ED764CD00B4D2FE /* NBSMockedApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBSMockedApplication.h; sourceTree = "<group>"; };
D4F7D47C1ED764CD00B4D2FE /* NBSMockedApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBSMockedApplication.m; sourceTree = "<group>"; };
D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrettyDynamicTypeSyntax.swift; sourceTree = "<group>"; };
DD83832826E555BC0040266F /* NBSMockedApplication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NBSMockedApplication.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -98,9 +96,8 @@
D4F7D4791ED764CD00B4D2FE /* DynamicType */ = {
isa = PBXGroup;
children = (
DD83832826E555BC0040266F /* NBSMockedApplication.swift */,
D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */,
D4F7D47B1ED764CD00B4D2FE /* NBSMockedApplication.h */,
D4F7D47C1ED764CD00B4D2FE /* NBSMockedApplication.m */,
D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */,
);
path = DynamicType;
Expand All @@ -114,7 +111,6 @@
buildActionMask = 2147483647;
files = (
D47CB5F91EC9973C00D5588D /* XCTestObservationCenter+CurrentTestCaseTracker.h in Headers */,
D4F7D4801ED764CD00B4D2FE /* NBSMockedApplication.h in Headers */,
095B47711D4773F000880922 /* Nimble_Snapshots.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -207,13 +203,13 @@
buildActionMask = 2147483647;
files = (
095B47911D47794300880922 /* PrettySyntax.swift in Sources */,
D4F7D4811ED764CD00B4D2FE /* NBSMockedApplication.m in Sources */,
D47CB5FA1EC9973C00D5588D /* XCTestObservationCenter+CurrentTestCaseTracker.m in Sources */,
D4F7D47F1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift in Sources */,
095B478F1D47794300880922 /* HaveValidSnapshot.swift in Sources */,
095B47901D47794300880922 /* CurrentTestCaseTracker.swift in Sources */,
D4F7D4821ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift in Sources */,
D4F7D47E1ED764CD00B4D2FE /* DynamicSizeSnapshot.swift in Sources */,
DD83832926E555BC0040266F /* NBSMockedApplication.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 3 additions & 1 deletion Nimble_Snapshots/DynamicSize/DynamicSizeSnapshot.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
13 changes: 0 additions & 13 deletions Nimble_Snapshots/DynamicType/NBSMockedApplication.h
View file

This file was deleted.

160 changes: 0 additions & 160 deletions Nimble_Snapshots/DynamicType/NBSMockedApplication.m
View file

This file was deleted.

Loading

0 comments on commit 02497b8

Please sign in to comment.