Skip to content

Commit

Permalink
Merge pull request #327 from hello/jimmy/release-113
Browse files Browse the repository at this point in the history
Merging fixes for iOS 7, bumping to 1.1.3.6
  • Loading branch information
jimmymlu committed Sep 5, 2015
2 parents 42b4399 + 58c3ba0 commit aa76629
Show file tree
Hide file tree
Showing 150 changed files with 7,434 additions and 5,321 deletions.
3 changes: 3 additions & 0 deletions .circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
machine:
xcode:
version: "6.3.1"
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 1.1.3.6

Fixes:

* fix crasher that occurs in iOS 7 devices due to a selector used that is only available to iOS 8 devices

## 1.1.3.5

Fixes:
Expand Down
1 change: 1 addition & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ end

target 'Tests', :exclusive => true do
pod 'Kiwi'
pod 'Nocilla'
end
3 changes: 3 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ PODS:
- Mixpanel/MPCategoryHelpers (2.7.2)
- MSDynamicsDrawerViewController (1.5.1)
- NAPickerView (0.0.1)
- Nocilla (0.10.0)
- NSJSONSerialization-NSNullRemoval (1.0.1)
- SenseKit (0.1.0):
- SenseKit/Analytics (= 0.1.0)
Expand Down Expand Up @@ -81,6 +82,7 @@ DEPENDENCIES:
- LGBluetooth (from `git@github.com:hello/LGBluetooth.git`)
- MSDynamicsDrawerViewController (= 1.5.1)
- NAPickerView (from `git@github.com:hello/NAPickerView.git`)
- Nocilla
- SenseKit (from `git@github.com:hello/SenseKit.git`)
- SHSProtoBuf (from `git@github.com:hello/protobuf-objc.git`)
- SORelativeDateTransformer (~> 1.1.10)
Expand Down Expand Up @@ -148,6 +150,7 @@ SPEC CHECKSUMS:
Mixpanel: e9bcb16eb0e2a98fc330ceeb0d8b7f4aec4182ab
MSDynamicsDrawerViewController: 2874df90f5e9453dc7d4e32f8038b50615d4baa7
NAPickerView: cac3bd6f38e36374e53309335e28f4fc9cd93c94
Nocilla: ae0a2b05f3087b473624ac2b25903695df51246a
NSJSONSerialization-NSNullRemoval: 4c50d948b7805807ea8ce690d48e05ee679ef5b7
SenseKit: 80ec61d63f9281ba0ce0c1168b379388e967726c
SHSProtoBuf: 89a179d27f35dea460139a630e8ac22378eabbe3
Expand Down
1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/ASIHTTPRequestStub.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSASIHTTPRequestAdapter.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSASIHTTPRequestHook.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSDataMatcher.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPBody.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPClientHook.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPRequest.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPRequestDiff.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPResponse.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSHTTPStubURLProtocol.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSMatcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSMatcher.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSNSURLHook.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSNSURLSessionHook.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSNocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSRegexMatcher.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSStringMatcher.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSStubRequest.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSStubRequestDSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSStubResponse.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/LSStubResponseDSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSData+Matcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSData+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSString+Matcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSString+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSURLRequest+DSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/NSURLRequest+LSHTTPRequest.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/Nocilla/Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/LSHTTPBody.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/LSMatcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/LSNocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/LSStubRequestDSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/LSStubResponseDSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/NSData+Matcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/NSData+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/NSString+Matcheable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/NSString+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/Nocilla/Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions Pods/Nocilla/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Pods/Nocilla/Nocilla/Categories/NSData+Nocilla.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions Pods/Nocilla/Nocilla/Categories/NSString+Nocilla.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions Pods/Nocilla/Nocilla/DSL/LSHTTPRequestDSLRepresentation.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions Pods/Nocilla/Nocilla/DSL/LSStubRequestDSL.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit aa76629

Please sign in to comment.