Merge pull request #18 from matthewpalmer/1.2.0

1.2.0
matthewpalmer · Jan 28, 2015 · 73d14af · 73d14af
2 parents 56ae2fb + c8a14a8
commit 73d14af
Show file tree

Hide file tree

Showing 19 changed files with 3,552 additions and 3,905 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,5 +11,5 @@ language: objective-c
 install:
 - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 script:
-- set -o pipefail && xcodebuild test -workspace Example/Locksmith.xcworkspace -scheme Locksmith-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
+- set -o pipefail && xcodebuild test -workspace Example/Locksmith.xcworkspace -scheme Locksmith -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
 - pod lib lint --quick
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Expecta (0.3.1)
-  - Locksmith (0.1.0)
+  - Locksmith (1.2.0)
   - Specta (0.2.1)
 
 DEPENDENCIES:
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Expecta: 03aabd0a89d8dea843baecb19a7fd7466a69a31d
-  Locksmith: b9371e929ae783d9ee80af42278258e9cedda7f6
+  Locksmith: 392ae330eb455e824dab5b714b6719eb29ef5038
   Specta: 9141310f46b1f68b676650ff2854e1ed0b74163a
 
 COCOAPODS: 0.36.0.beta.1
diff --git a/Example/Pods/Local Podspecs/Locksmith.podspec b/Example/Pods/Local Podspecs/Locksmith.podspec
diff --git a/Example/Pods/Local Podspecs/Locksmith.podspec.json b/Example/Pods/Local Podspecs/Locksmith.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock