diff --git a/.travis.yml b/.travis.yml index ba58391..1e79af3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c osx_image: xcode7.3 before_script: - - gem install cocoapods -v 0.39.0 --no-ri --no-rdoc + - gem install cocoapods -v 1.0.0 --no-ri --no-rdoc script: ./build.sh diff --git a/FBSnapshotTestCase.modulemap b/FBSnapshotTestCase.modulemap deleted file mode 100644 index 733e78b..0000000 --- a/FBSnapshotTestCase.modulemap +++ /dev/null @@ -1,15 +0,0 @@ -framework module FBSnapshotTestCase { - umbrella header "FBSnapshotTestCase.h" - - export * - module * { export * } - - header "FBSnapshotTestCase.h" - header "FBSnapshotTestCasePlatform.h" - header "FBSnapshotTestController.h" - - private header "UIImage+Compare.h" - private header "UIImage+Diff.h" - private header "UIImage+Snapshot.h" -} - diff --git a/FBSnapshotTestCase.podspec b/FBSnapshotTestCase.podspec index 2d96893..6858eaa 100644 --- a/FBSnapshotTestCase.podspec +++ b/FBSnapshotTestCase.podspec @@ -19,7 +19,6 @@ Pod::Spec.new do |s| s.frameworks = 'XCTest','UIKit','Foundation','QuartzCore' s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' } s.default_subspecs = 'SwiftSupport' - s.module_map = 'FBSnapshotTestCase.modulemap' s.subspec 'Core' do |cs| cs.source_files = 'FBSnapshotTestCase/**/*.{h,m}', 'FBSnapshotTestCase/*.{h,m}' cs.public_header_files = 'FBSnapshotTestCase/FBSnapshotTestCase.h','FBSnapshotTestCase/FBSnapshotTestCasePlatform.h','FBSnapshotTestCase/FBSnapshotTestController.h' diff --git a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemo.xcodeproj/project.pbxproj b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemo.xcodeproj/project.pbxproj index f7b6842..c59ddfa 100644 --- a/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemo.xcodeproj/project.pbxproj +++ b/FBSnapshotTestCaseDemo/FBSnapshotTestCaseDemo.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - A52928F81BF86210D3AACDD2 /* Pods_FBSnapshotTestCaseDemoTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2F94786ED7FC097D31026B6 /* Pods_FBSnapshotTestCaseDemoTests.framework */; }; + 0C73704BAABBD042032D31D6 /* Pods_FBSnapshotTestCaseDemoTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51981578E01AB0BBBF9AD774 /* Pods_FBSnapshotTestCaseDemoTests.framework */; }; B30449081AB794320067C75D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B30449071AB794320067C75D /* main.m */; }; B30449221AB794320067C75D /* FBSnapshotTestCaseDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B30449211AB794320067C75D /* FBSnapshotTestCaseDemoTests.m */; }; B30449351AB795230067C75D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B304492C1AB795230067C75D /* InfoPlist.strings */; }; @@ -28,8 +28,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 42711825EC840732F7632DB1 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FBSnapshotTestCaseDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests.release.xcconfig"; sourceTree = ""; }; - 89032B249B2E1256F91C7504 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig"; sourceTree = ""; }; + 51981578E01AB0BBBF9AD774 /* Pods_FBSnapshotTestCaseDemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FBSnapshotTestCaseDemoTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7A0C46280D01BD793DF00625 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FBSnapshotTestCaseDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests.release.xcconfig"; sourceTree = ""; }; + A3A63210980854148203C1F0 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig"; sourceTree = ""; }; B30449021AB794320067C75D /* FBSnapshotTestCaseDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FBSnapshotTestCaseDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; B30449071AB794320067C75D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; B304491B1AB794320067C75D /* FBSnapshotTestCaseDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FBSnapshotTestCaseDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -43,7 +44,6 @@ B30449341AB795230067C75D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; BCF12A241C396B2600789343 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; F02D88441B1F246300BFBC1D /* FBSnapshotTestCaseSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FBSnapshotTestCaseSwiftTests.swift; sourceTree = ""; }; - F2F94786ED7FC097D31026B6 /* Pods_FBSnapshotTestCaseDemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FBSnapshotTestCaseDemoTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,30 +58,38 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A52928F81BF86210D3AACDD2 /* Pods_FBSnapshotTestCaseDemoTests.framework in Frameworks */, + 0C73704BAABBD042032D31D6 /* Pods_FBSnapshotTestCaseDemoTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - A01067CB25E73F7B9122D375 /* Pods */ = { + 0CC44285F6C476327AB77B9C /* Pods */ = { isa = PBXGroup; children = ( - 89032B249B2E1256F91C7504 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */, - 42711825EC840732F7632DB1 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */, + A3A63210980854148203C1F0 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */, + 7A0C46280D01BD793DF00625 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */, ); name = Pods; sourceTree = ""; }; + 8F54C791A73198B06F3A32A6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 51981578E01AB0BBBF9AD774 /* Pods_FBSnapshotTestCaseDemoTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; B30448F91AB794320067C75D = { isa = PBXGroup; children = ( B30449041AB794320067C75D /* FBSnapshotTestCaseDemo */, B304491E1AB794320067C75D /* FBSnapshotTestCaseDemoTests */, B30449031AB794320067C75D /* Products */, - A01067CB25E73F7B9122D375 /* Pods */, - B7DD931F31D340869FC40B05 /* Frameworks */, + 0CC44285F6C476327AB77B9C /* Pods */, + 8F54C791A73198B06F3A32A6 /* Frameworks */, ); indentWidth = 2; sourceTree = ""; @@ -145,14 +153,6 @@ path = en.lproj; sourceTree = ""; }; - B7DD931F31D340869FC40B05 /* Frameworks */ = { - isa = PBXGroup; - children = ( - F2F94786ED7FC097D31026B6 /* Pods_FBSnapshotTestCaseDemoTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -177,12 +177,12 @@ isa = PBXNativeTarget; buildConfigurationList = B30449281AB794320067C75D /* Build configuration list for PBXNativeTarget "FBSnapshotTestCaseDemoTests" */; buildPhases = ( - D73636094A7C4E425DC3C909 /* Check Pods Manifest.lock */, + 2446417C513BDAF88B9890FC /* 📦 Check Pods Manifest.lock */, B30449171AB794320067C75D /* Sources */, B30449181AB794320067C75D /* Frameworks */, B30449191AB794320067C75D /* Resources */, - 5D5C191A192999984193BD99 /* Copy Pods Resources */, - CA9614629B60310FBFBBF9B7 /* Embed Pods Frameworks */, + EB64CD802D89DDA691FA7827 /* 📦 Embed Pods Frameworks */, + 30B7BE4963F35A6D89E72AFF /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -253,49 +253,49 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 5D5C191A192999984193BD99 /* Copy Pods Resources */ = { + 2446417C513BDAF88B9890FC /* 📦 Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "📦 Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-resources.sh\"\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - CA9614629B60310FBFBBF9B7 /* Embed Pods Frameworks */ = { + 30B7BE4963F35A6D89E72AFF /* 📦 Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "📦 Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - D73636094A7C4E425DC3C909 /* Check Pods Manifest.lock */ = { + EB64CD802D89DDA691FA7827 /* 📦 Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "📦 Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FBSnapshotTestCaseDemoTests/Pods-FBSnapshotTestCaseDemoTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -443,7 +443,7 @@ }; B30449291AB794320067C75D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89032B249B2E1256F91C7504 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */; + baseConfigurationReference = A3A63210980854148203C1F0 /* Pods-FBSnapshotTestCaseDemoTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( @@ -464,7 +464,7 @@ }; B304492A1AB794320067C75D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 42711825EC840732F7632DB1 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */; + baseConfigurationReference = 7A0C46280D01BD793DF00625 /* Pods-FBSnapshotTestCaseDemoTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( diff --git a/FBSnapshotTestCaseDemo/Podfile.lock b/FBSnapshotTestCaseDemo/Podfile.lock index dc6aeaa..53e62d3 100644 --- a/FBSnapshotTestCaseDemo/Podfile.lock +++ b/FBSnapshotTestCaseDemo/Podfile.lock @@ -10,9 +10,11 @@ DEPENDENCIES: EXTERNAL SOURCES: FBSnapshotTestCase: - :path: ".." + :path: .. SPEC CHECKSUMS: - FBSnapshotTestCase: 366ecd378511d7716c79991cd8067d1eed23578d + FBSnapshotTestCase: 68c3221ddd3bf5bbe783c1015f8acc12c3768a4d -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: f0c8c3073f8e31e4718d87d66744e7fa5953f5c4 + +COCOAPODS: 1.0.0