Skip to content

Commit

Permalink
Update to work with Xcode 7.3
Browse files Browse the repository at this point in the history
- Update FBSnapshot
- Use CocoaPods 0.39
- Rebuild integration tests
  • Loading branch information
segiddins committed May 9, 2016
1 parent 757f981 commit cfb9cd4
Show file tree
Hide file tree
Showing 31 changed files with 63 additions and 23 deletions.
39 changes: 38 additions & 1 deletion Example/Espressos.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
E9B3C6E41A32C2DB00D43DF9 /* Frameworks */,
E9B3C6E51A32C2DB00D43DF9 /* Resources */,
D864B42A8ED05D61B246E908 /* Copy Pods Resources */,
24DB63522955B1E4CE17AB6F /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -238,6 +239,7 @@
F877A35913782AF10022A8AB /* Frameworks */,
F877A35A13782AF10022A8AB /* Resources */,
042203FAF8DD572FA1E9C16A /* Copy Pods Resources */,
0CF66B7E90C5EF719FE09527 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -254,7 +256,7 @@
F877A35313782AF10022A8AB /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0500;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = Gowalla;
TargetAttributes = {
E9B3C6E61A32C2DB00D43DF9 = {
Expand Down Expand Up @@ -316,6 +318,36 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Espressos/Pods-Espressos-resources.sh\"\n";
showEnvVarsInLog = 0;
};
0CF66B7E90C5EF719FE09527 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Espressos/Pods-Espressos-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
24DB63522955B1E4CE17AB6F /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TTTAttributedLabelTests/Pods-TTTAttributedLabelTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
3CD1DD63CE5A05DF88839E86 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -426,6 +458,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "TTTAttributedLabel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Espressos.app/Espressos";
};
Expand Down Expand Up @@ -456,6 +489,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "TTTAttributedLabel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Espressos.app/Espressos";
VALIDATE_PRODUCT = YES;
Expand All @@ -478,6 +512,7 @@
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -573,6 +608,7 @@
GCC_PREFIX_HEADER = Prefix.pch;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
WRAPPER_EXTENSION = app;
Expand All @@ -594,6 +630,7 @@
GCC_PREFIX_HEADER = Prefix.pch;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
VALIDATE_PRODUCT = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:Espressos.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand All @@ -93,10 +96,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
2 changes: 1 addition & 1 deletion Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIcons~ipad</key>
<dict/>
<key>CFBundleIdentifier</key>
<string>com.mattt.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ end

target :TTTAttributedLabelTests, :exclusive => true do
install_pods
pod 'FBSnapshotTestCase'
pod 'FBSnapshotTestCase/Core'
pod 'Expecta'
pod 'OCMock'
pod 'KIF'
Expand Down
28 changes: 14 additions & 14 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- Expecta (1.0.0)
- FBSnapshotTestCase (1.8.1)
- KIF (3.2.3):
- KIF/XCTest (= 3.2.3)
- KIF/XCTest (3.2.3)
- OCMock (3.1.2)
- Expecta (1.0.5)
- FBSnapshotTestCase/Core (2.1.0)
- KIF (3.4.2):
- KIF/Core (= 3.4.2)
- KIF/Core (3.4.2)
- OCMock (3.3)
- TTTAttributedLabel (2.0.0)

DEPENDENCIES:
- Expecta
- FBSnapshotTestCase
- FBSnapshotTestCase/Core
- KIF
- OCMock
- TTTAttributedLabel (from `../`)

EXTERNAL SOURCES:
TTTAttributedLabel:
:path: "../"
:path: ../

SPEC CHECKSUMS:
Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024
FBSnapshotTestCase: 3dc3899168747a0319c5278f5b3445c13a6532dd
KIF: a94bffe9c97e449e44f8fa481c53243d21309e1e
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
TTTAttributedLabel: 92aaa37822677380b7ec0baff50bd8010eef08f8
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
FBSnapshotTestCase: 366ecd378511d7716c79991cd8067d1eed23578d
KIF: b518c9831453abea5afdbbde3908ec47832d6d56
OCMock: d68685bde31f69cb61d518dcb39269080c78b5ed
TTTAttributedLabel: ab01c5db9274830e28e7ac26d8ab69c576602a32

COCOAPODS: 0.38.2
COCOAPODS: 0.39.0
2 changes: 1 addition & 1 deletion Example/TTTAttributedLabelTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>TTTAttributedLabel.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
Binary file modified ...ReferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ReferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...enceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...eImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/ReferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...eImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ts/ReferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/ReferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...mages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ferenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ges_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...erenceImages_64/TTTAttributedLabelTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cfb9cd4

Please sign in to comment.