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

chore: support specta 2 #48

Merged
merged 10 commits into from
Apr 9, 2024
Merged

chore: support specta 2 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f602d8f
just try supporting specta 2
brainbicycle Apr 3, 2024
90c6ed6
try update snapshot test case as well
brainbicycle Apr 3, 2024
8dd6f91
update cocoapods to latest to fix install issues
brainbicycle Apr 3, 2024
f09db99
update min version in project
brainbicycle Apr 3, 2024
f1a6194
workaround for specta build problems
brainbicycle Apr 3, 2024
33b4b4c
undo unnecessary change to podspec
brainbicycle Apr 3, 2024
c486c24
bad merge
brainbicycle Apr 8, 2024
1b362dc
noise from merge in gemfile
brainbicycle Apr 8, 2024
65c4e84
accidental podspec downgrade in merge
brainbicycle Apr 8, 2024
da3f4ea
update changelog
brainbicycle Apr 8, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

### 3.x (Next)

* [#48](https://github.com/dblock/ios-snapshot-test-case-expecta/pull/48): Support Specta 2.0 - [@brainbicycle](https://github.com/brainbicycle).
* [#49](https://github.com/dblock/ios-snapshot-test-case-expecta/pull/49): Migrate CI to GitHub actions - [@brainbicycle](https://github.com/brainbicycle).

### 3.1.1 (02/25/2017)
Expand Down
4 changes: 2 additions & 2 deletions Expecta+Snapshots.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.source_files = '*.{h,m}'
s.frameworks = 'Foundation', 'XCTest'
s.dependency 'iOSSnapshotTestCase', '~> 6.2'
s.dependency 'iOSSnapshotTestCase', '~> 8.0'
s.dependency 'Expecta', '~> 1.0'
s.dependency 'Specta', '~> 1.0'
s.dependency 'Specta', '~> 2.0'

s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
end
40 changes: 14 additions & 26 deletions FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@
A24E011B17F9A42A001252DB /* Frameworks */,
A24E011C17F9A42A001252DB /* Resources */,
279D0DCE5C316DE54BD5FF49 /* [CP] Embed Pods Frameworks */,
F04559B5D97B33B48486C223 /* [CP] Copy Pods Resources */,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

believe most of these changes are due to cocoapods version update + updating minimum deployment target but let me know if needs cleanup

);
buildRules = (
);
Expand Down Expand Up @@ -285,18 +284,23 @@
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
"${BUILT_PRODUCTS_DIR}/Expecta+Snapshots/Expecta_Snapshots.framework",
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
"${BUILT_PRODUCTS_DIR}/iOSSnapshotTestCase/FBSnapshotTestCase.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta_Snapshots.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSnapshotTestCase.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EA05C8CADBBEE1AD2725EB33 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -307,34 +311,18 @@
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-FBSnapshotTestCaseDemoTests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F04559B5D97B33B48486C223 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-resources.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
Loading