From 93acbf1146c5ce9db535b4b1cee573b21dd74217 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Tue, 20 Oct 2015 13:07:56 -0400 Subject: [PATCH 1/4] Allow Xcode 7 project change recommendations --- .gitignore | 2 ++ DeepLinkKit.xcodeproj/project.pbxproj | 18 +++++++++++++++--- .../xcschemes/ReceiverDemo.xcscheme | 19 ++++++++++++------- .../xcschemes/SenderDemo.xcscheme | 13 ++++++++----- .../SupportingFiles/ReceiverDemo-Info.plist | 2 +- SampleApps/ReceiverDemoSwift/Info.plist | 2 +- .../SupportingFiles/SenderDemo-Info.plist | 2 +- Tests/SupportingFiles/Tests-Info.plist | 2 +- 8 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 39b1ec8..304a5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ profile DerivedData *.hmap *.ipa +*.gcda +*.gcno # Bundler .bundle diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj index d88bffd..01ae482 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -16,7 +16,6 @@ 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; 62335E031B57007F00E3818C /* DPLReceiverSwiftAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62335DFB1B57007F00E3818C /* DPLReceiverSwiftAppDelegate.swift */; }; - 62335E071B57007F00E3818C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 62335E011B57007F00E3818C /* Info.plist */; }; 62335E091B5700AF00E3818C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 62335E0A1B5700B400E3818C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 62335E0B1B5700BC00E3818C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; @@ -738,7 +737,8 @@ isa = PBXProject; attributes = { CLASSPREFIX = DPL; - LastUpgradeCheck = 0610; + LastSwiftUpdateCheck = 0700; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Button, Inc."; TargetAttributes = { 6003F5AD195388D20070C39A = { @@ -797,7 +797,6 @@ buildActionMask = 2147483647; files = ( 62891E891B57FA9D00C2AF4F /* Images.xcassets in Resources */, - 62335E071B57007F00E3818C /* Info.plist in Resources */, 62891E881B57FA7F00C2AF4F /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1061,6 +1060,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_TEST_COVERAGE_FILES = YES; @@ -1129,6 +1129,7 @@ GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch"; INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; @@ -1145,6 +1146,7 @@ GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch"; INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; @@ -1159,6 +1161,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch"; INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo"; WRAPPER_EXTENSION = xctest; @@ -1173,6 +1176,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch"; INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo"; WRAPPER_EXTENSION = xctest; @@ -1205,6 +1209,7 @@ "-fprofile-arcs", "-ftest-coverage", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1235,6 +1240,7 @@ "-fprofile-arcs", "-ftest-coverage", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; TARGETED_DEVICE_FAMILY = 1; @@ -1264,6 +1270,7 @@ "-fprofile-arcs", "-ftest-coverage", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; TARGETED_DEVICE_FAMILY = 1; @@ -1322,6 +1329,7 @@ GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; @@ -1345,6 +1353,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; }; @@ -1358,6 +1367,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/SupportingFiles/Tests-Prefix.pch"; INFOPLIST_FILE = "Tests/SupportingFiles/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ReceiverDemo.app/ReceiverDemo"; WRAPPER_EXTENSION = xctest; @@ -1381,6 +1391,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; }; @@ -1399,6 +1410,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme b/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme index c79f4e8..126bf16 100644 --- a/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme +++ b/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,17 +48,21 @@ ReferencedContainer = "container:DeepLinkKit.xcodeproj"> + + - + - + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:DeepLinkKit.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist b/SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist index 1a14ab1..d938311 100644 --- a/SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist +++ b/SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.usebutton.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/SampleApps/ReceiverDemoSwift/Info.plist b/SampleApps/ReceiverDemoSwift/Info.plist index 70457d2..06a9b21 100644 --- a/SampleApps/ReceiverDemoSwift/Info.plist +++ b/SampleApps/ReceiverDemoSwift/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.usebutton.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/SampleApps/SenderDemo/SupportingFiles/SenderDemo-Info.plist b/SampleApps/SenderDemo/SupportingFiles/SenderDemo-Info.plist index de05060..55c2148 100644 --- a/SampleApps/SenderDemo/SupportingFiles/SenderDemo-Info.plist +++ b/SampleApps/SenderDemo/SupportingFiles/SenderDemo-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.usebutton.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Tests/SupportingFiles/Tests-Info.plist b/Tests/SupportingFiles/Tests-Info.plist index 41520ed..169b6f7 100644 --- a/Tests/SupportingFiles/Tests-Info.plist +++ b/Tests/SupportingFiles/Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType From f5d8e147f6414e04aa077171177d9b73e495b7cc Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Tue, 20 Oct 2015 14:13:29 -0400 Subject: [PATCH 2/4] update to CocoaPods 0.39.0 --- DeepLinkKit.xcodeproj/project.pbxproj | 64 ++++++++++++++++++++++++++ Gemfile.lock | 66 ++++++++++++++------------- Podfile | 2 +- Podfile.lock | 4 +- 4 files changed, 102 insertions(+), 34 deletions(-) diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj index 01ae482..ce141c8 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -662,6 +662,7 @@ 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, 213419298EA5AA6429BEFD28 /* Copy Pods Resources */, + 4025AE564DBFB183CA53A923 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -681,6 +682,7 @@ 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, 0D3359342B62D92CA67C2E04 /* Copy Pods Resources */, + A891777DE50BB01821DC55E8 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -701,6 +703,7 @@ 62335DD31B57003300E3818C /* Frameworks */, 62335DD41B57003300E3818C /* Resources */, 9AC6E46B330C620FAB6621E4 /* Copy Pods Resources */, + F7AECAC5E12B21557769080B /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -720,6 +723,7 @@ DEDB148A1A3F944D00A837F8 /* Frameworks */, DEDB148B1A3F944D00A837F8 /* Resources */, 82E3829DCB61E29D4B984C4F /* Copy Pods Resources */, + 3D9B225BD699DD9D3E3783DD /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -888,6 +892,36 @@ 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; }; + 3D9B225BD699DD9D3E3783DD /* 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-SenderDemo/Pods-SenderDemo-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 4025AE564DBFB183CA53A923 /* 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-ReceiverDemo/Pods-ReceiverDemo-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 7E4A77AFF27B0E5465184209 /* Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -933,6 +967,36 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift-resources.sh\"\n"; showEnvVarsInLog = 0; }; + A891777DE50BB01821DC55E8 /* 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-Tests/Pods-Tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + F7AECAC5E12B21557769080B /* 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-ReceiverDemoSwift/Pods-ReceiverDemoSwift-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Gemfile.lock b/Gemfile.lock index a8e18a7..a8b9676 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,61 +1,62 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.1) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (0.8.1) + claide (0.9.1) clamp (0.6.5) - cocoapods (0.37.1) - activesupport (>= 3.2.15) - claide (~> 0.8.1) - cocoapods-core (= 0.37.1) - cocoapods-downloader (~> 0.9.0) + cocoapods (0.39.0) + activesupport (>= 4.0.2) + claide (~> 0.9.1) + cocoapods-core (= 0.39.0) + cocoapods-downloader (~> 0.9.3) cocoapods-plugins (~> 0.4.2) - cocoapods-trunk (~> 0.6.0) - cocoapods-try (~> 0.4.4) + cocoapods-search (~> 0.1.0) + cocoapods-stats (~> 0.6.2) + cocoapods-trunk (~> 0.6.4) + cocoapods-try (~> 0.5.1) colored (~> 1.2) escape (~> 0.0.4) - molinillo (~> 0.2.3) - nap (~> 0.8) - xcodeproj (~> 0.24.1) - cocoapods-core (0.37.1) - activesupport (>= 3.2.15) + molinillo (~> 0.4.0) + nap (~> 1.0) + xcodeproj (~> 0.28.2) + cocoapods-core (0.39.0) + activesupport (>= 4.0.2) fuzzy_match (~> 2.0.4) - nap (~> 0.8.0) - cocoapods-downloader (0.9.0) + nap (~> 1.0) + cocoapods-downloader (0.9.3) cocoapods-plugins (0.4.2) nap - cocoapods-trunk (0.6.0) - nap (>= 0.8) + cocoapods-search (0.1.0) + cocoapods-stats (0.6.2) + cocoapods-trunk (0.6.4) + nap (>= 0.8, < 2.0) netrc (= 0.7.8) - cocoapods-try (0.4.4) + cocoapods-try (0.5.1) colored (1.2) escape (0.0.4) fuzzy_match (2.0.4) i18n (0.7.0) - json (1.8.2) - mini_portile (0.6.2) - minitest (5.6.1) - molinillo (0.2.3) - nap (0.8.0) + json (1.8.3) + minitest (5.8.1) + molinillo (0.4.0) + nap (1.0.0) netrc (0.7.8) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - slather (1.7.1) + slather (1.3.0) clamp (~> 0.6) - nokogiri (~> 1.6.3) - xcodeproj (~> 0.24.1) + xcodeproj (~> 0.17) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (0.24.1) + xcodeproj (0.28.2) activesupport (>= 3) + claide (~> 0.9.1) colored (~> 1.2) - xcpretty (0.1.10) + xcpretty (0.1.12) PLATFORMS ruby @@ -64,3 +65,6 @@ DEPENDENCIES cocoapods slather xcpretty + +BUNDLED WITH + 1.10.6 diff --git a/Podfile b/Podfile index e02baaf..8440a2e 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,5 @@ xcodeproj 'DeepLinkKit.xcodeproj', 'Test' => :debug -plugin 'slather' +inhibit_all_warnings! target 'SenderDemo', :exclusive => true do diff --git a/Podfile.lock b/Podfile.lock index ad11872..691c491 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -19,10 +19,10 @@ EXTERNAL SOURCES: :path: . SPEC CHECKSUMS: - DeepLinkKit: 3979713c8a0b6bd3259fb7917e572acf56645a35 + DeepLinkKit: 83cba3b73a997fffa9cf5ddda2bcba8bbed0788a Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 KIF: a94bffe9c97e449e44f8fa481c53243d21309e1e OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92 Specta: 9cec98310dca411f7c7ffd6943552b501622abfe -COCOAPODS: 0.37.1 +COCOAPODS: 0.39.0 From 7a8e385d54068d4c93306963341664348b1a0aba Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Tue, 20 Oct 2015 14:41:03 -0400 Subject: [PATCH 3/4] update pods --- Podfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 691c491..5d7be24 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,11 +1,11 @@ PODS: - DeepLinkKit (1.1.0) - - Expecta (1.0.0) - - KIF (3.2.3): - - KIF/XCTest (= 3.2.3) - - KIF/XCTest (3.2.3) - - OCMock (3.1.2) - - Specta (1.0.2) + - Expecta (1.0.3) + - KIF (3.3.0): + - KIF/Core (= 3.3.0) + - KIF/Core (3.3.0) + - OCMock (3.2) + - Specta (1.0.4) DEPENDENCIES: - DeepLinkKit (from `.`) @@ -20,9 +20,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: DeepLinkKit: 83cba3b73a997fffa9cf5ddda2bcba8bbed0788a - Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 - KIF: a94bffe9c97e449e44f8fa481c53243d21309e1e - OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92 - Specta: 9cec98310dca411f7c7ffd6943552b501622abfe + Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 + KIF: 0a82046d06f3648799cac522d2d0f7934214caac + OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb + Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 COCOAPODS: 0.39.0 From 7735a9c03bc94e2acef0fb48f37fa209e2b43129 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Tue, 20 Oct 2015 14:51:37 -0400 Subject: [PATCH 4/4] warn on specta focus --- DeepLinkKit.xcodeproj/project.pbxproj | 25 ++++++++++++++++++++++++ Tests/BuildScripts/specta-focus-check.sh | 4 ++++ 2 files changed, 29 insertions(+) create mode 100755 Tests/BuildScripts/specta-focus-check.sh diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj index ce141c8..ead3900 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -130,6 +130,7 @@ DE3E61091A3B4485008D6DFC /* NSString+DPLJSON.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+DPLJSON.m"; sourceTree = ""; }; DE3E610D1A3B4492008D6DFC /* NSString_DPLJSONSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSString_DPLJSONSpec.m; sourceTree = ""; }; DE4128901A8BBE500089DAA2 /* AppLinks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppLinks.h; sourceTree = ""; }; + DE56F9AD1BD6B0B70090BF8C /* specta-focus-check.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "specta-focus-check.sh"; path = "BuildScripts/specta-focus-check.sh"; sourceTree = ""; }; DE87B1EC1A5DEFD400204A35 /* DPLProductRouteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProductRouteHandler.h; sourceTree = ""; }; DE87B1ED1A5DEFD400204A35 /* DPLProductRouteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLProductRouteHandler.m; sourceTree = ""; }; DE87B1EF1A5DF49F00204A35 /* DPLProduct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProduct.h; sourceTree = ""; }; @@ -482,6 +483,14 @@ path = Categories; sourceTree = ""; }; + DE56F9AC1BD6B04E0090BF8C /* BuildScripts */ = { + isa = PBXGroup; + children = ( + DE56F9AD1BD6B0B70090BF8C /* specta-focus-check.sh */, + ); + name = BuildScripts; + sourceTree = ""; + }; DE5DD32C19E0643F007FD439 /* DeepLinkKit */ = { isa = PBXGroup; children = ( @@ -565,6 +574,7 @@ DEAD328119E079D3003C8D65 /* Tests */ = { isa = PBXGroup; children = ( + DE56F9AC1BD6B04E0090BF8C /* BuildScripts */, 2F4988DC1AE71A930069EF2B /* IntegrationTests */, DEEBD4A61AAB7928000BCA84 /* Fixtures */, 4D4F41291B02A95800B710DB /* Regex */, @@ -683,6 +693,7 @@ 6003F5AC195388D20070C39A /* Resources */, 0D3359342B62D92CA67C2E04 /* Copy Pods Resources */, A891777DE50BB01821DC55E8 /* Embed Pods Frameworks */, + DE56F9AB1BD6B0140090BF8C /* Specta Focus Check */, ); buildRules = ( ); @@ -997,6 +1008,20 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + DE56F9AB1BD6B0140090BF8C /* Specta Focus Check */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Specta Focus Check"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Tests/BuildScripts/specta-focus-check.sh\""; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Tests/BuildScripts/specta-focus-check.sh b/Tests/BuildScripts/specta-focus-check.sh new file mode 100755 index 0000000..6a1798a --- /dev/null +++ b/Tests/BuildScripts/specta-focus-check.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +FOCUS="fit\(|fdescribe\(|fcontext\(" +find "${SRCROOT}/Tests" \( -name "*.m" \) -print0 | xargs -0 egrep --with-filename --line-number --only-matching "($FOCUS).*\$" | perl -p -e "s/($FOCUS)/ warning: \$1/"