more frameworks work

Cartfile

@@ -1,3 +1,3 @@
-github "ReactiveX/RxSwift" "rxswift-2.0"
+github "lfaoro/RxSwift" "rxswift-2.0"
 github "SwiftyJSON/SwiftyJSON" "xcode7"
 github "kishikawakatsumi/KeychainAccess" "swift-2.0"

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "kishikawakatsumi/KeychainAccess" "561e03d38cb17227051b6dccad1fcc33599fa509"
-github "Quick/Nimble" "e84623d953d811f74a2afcda4fa0c8121e7dad7d"
+github "kishikawakatsumi/KeychainAccess" "f2245201d4e275cee8d758aeece95d24a0aebf29"
+github "Quick/Nimble" "930aab083cd4e2054faca10431929202dc807a07"
 github "Quick/Quick" "b6e311acc3dc79835969defa52d865f1e9eb3515"
-github "ReactiveX/RxSwift" "6ee66a1ce143aca1ed06bab539842dcdb6bd527b"
+github "lfaoro/RxSwift" "23dacf919a09affd40d0175cfe59ea13d46c7acc"
 github "SwiftyJSON/SwiftyJSON" "f269523ac572979245baa99c8475eab73caf1e9b"

Carthage/Checkouts/KeychainAccess/.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: beta-xcode6.3
+osx_image: xcode7
 cache:
   directories:
     - Lib/vendor/bundle
@@ -10,6 +10,7 @@ script:
 branches:
   only:
     - master
+    - swift-2.0
 env:
   global:
     - LANG=en_US.UTF-8

Carthage/Checkouts/KeychainAccess/Lib/Rakefile

@@ -7,7 +7,9 @@ def destinations
     'name=iPhone 5,OS=8.1',
     'name=iPhone 5s,OS=8.1',
     'name=iPhone 6,OS=8.1',
-    'name=iPhone 6 Plus,OS=8.1'
+    'name=iPhone 6 Plus,OS=8.1',
+    'name=iPhone 6,OS=9.0',
+    'name=iPhone 6 Plus,OS=9.0'
   ]
 end
 

Carthage/Checkouts/Nimble/.travis.yml

@@ -0,0 +1,9 @@
+osx_image: xcode7
+language: objective-c
+
+env:
+  matrix:
+    - NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
+    - NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
+
+script: ./test $TYPE

Carthage/Checkouts/Nimble/Nimble/Utils/Poll.swift

@@ -35,9 +35,10 @@ internal class RunPromise {
     }
 }
 
+let killQueue = dispatch_queue_create("nimble.waitUntil.queue", DISPATCH_QUEUE_SERIAL)
+
 internal func stopRunLoop(runLoop: NSRunLoop, delay: NSTimeInterval) -> RunPromise {
     let promise = RunPromise()
-    let killQueue = dispatch_queue_create("nimble.waitUntil.queue", DISPATCH_QUEUE_SERIAL)
     let killTimeOffset = Int64(CDouble(delay) * CDouble(NSEC_PER_SEC))
     let killTime = dispatch_time(DISPATCH_TIME_NOW, killTimeOffset)
     dispatch_after(killTime, killQueue) {
@@ -58,7 +59,9 @@ internal func pollBlock(pollInterval pollInterval: NSTimeInterval, timeoutInterv
     // trigger run loop to make sure enqueued tasks don't block our assertion polling
     // the stop run loop task above will abort us if necessary
     runLoop.runUntilDate(startDate)
-    promise.succeed()
+    dispatch_sync(killQueue) {
+        promise.succeed()
+    }
 
     if promise.didFail {
         return .Timeout

Carthage/Checkouts/Nimble/NimbleTests/AsynchronousTest.swift

@@ -1,5 +1,6 @@
 import XCTest
 import Nimble
+import Swift
 
 class AsyncTest: XCTestCase {
     let errorToThrow = NSError(domain: NSInternalInconsistencyException, code: 42, userInfo: nil)
@@ -62,6 +63,8 @@ class AsyncTest: XCTestCase {
                 done()
             }
         }
+        // "clear" runloop to ensure this test doesn't poison other tests
+        NSRunLoop.mainRunLoop().runUntilDate(NSDate().dateByAddingTimeInterval(0.2))
     }
 
     func testWaitUntilDetectsStalledMainThreadActivity() {

Carthage/Checkouts/Quick/Externals/Nimble/.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+xcuserdata/
+build/
+.idea
+DerivedData/
+Nimble.framework.zip

Carthage/Checkouts/Quick/Externals/Nimble/CONTRIBUTING.md

@@ -0,0 +1,101 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [Welcome to Nimble!](#welcome-to-nimble!)
+  - [Reporting Bugs](#reporting-bugs)
+  - [Building the Project](#building-the-project)
+  - [Pull Requests](#pull-requests)
+    - [Style Conventions](#style-conventions)
+  - [Core Members](#core-members)
+    - [Code of Conduct](#code-of-conduct)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Welcome to Nimble!
+
+We're building a testing framework for a new generation of Swift and
+Objective-C developers.
+
+Nimble should be easy to use and easy to maintain. Let's keep things
+simple and well-tested.
+
+**tl;dr:** If you've added a file to the project, make sure it's
+included in both the OS X and iOS targets.
+
+## Reporting Bugs
+
+Nothing is off-limits. If you're having a problem, we want to hear about
+it.
+
+- See a crash? File an issue.
+- Code isn't compiling, but you don't know why? Sounds like you should
+  submit a new issue, bud.
+- Went to the kitchen, only to forget why you went in the first place?
+  Better submit an issue.
+
+## Building the Project
+
+- Use `Nimble.xcproj` to work on Nimble.
+
+## Pull Requests
+
+- Nothing is trivial. Submit pull requests for anything: typos,
+  whitespace, you name it.
+- Not all pull requests will be merged, but all will be acknowledged. If
+  no one has provided feedback on your request, ping one of the owners
+  by name.
+- Make sure your pull request includes any necessary updates to the
+  README or other documentation.
+- Be sure the unit tests for both the OS X and iOS targets of Nimble
+  before submitting your pull request. You can run all the OS X & iOS unit
+  tests using `./test`.
+- If you've added a file to the project, make sure it's included in both
+  the OS X and iOS targets.
+- To make minor updates to old versions of Nimble that support Swift
+  1.1, issue a pull request against the `swift-1.1` branch. The master
+  branch supports Swift 1.2. Travis CI will only pass for pull requests
+  issued against the `swift-1.1` branch.
+
+### Style Conventions
+
+- Indent using 4 spaces.
+- Keep lines 100 characters or shorter. Break long statements into
+  shorter ones over multiple lines.
+- In Objective-C, use `#pragma mark -` to mark public, internal,
+  protocol, and superclass methods.
+
+## Core Members
+
+If a few of your pull requests have been merged, and you'd like a
+controlling stake in the project, file an issue asking for write access
+to the repository.
+
+### Code of Conduct
+
+Your conduct as a core member is your own responsibility, but here are
+some "ground rules":
+
+- Feel free to push whatever you want to master, and (if you have
+  ownership permissions) to create any repositories you'd like.
+
+  Ideally, however, all changes should be submitted as GitHub pull
+  requests. No one should merge their own pull request, unless no
+  other core members respond for at least a few days.
+
+  If you'd like to create a new repository, it'd be nice if you created
+  a GitHub issue and gathered some feedback first.
+
+- It'd be awesome if you could review, provide feedback on, and close
+  issues or pull requests submitted to the project. Please provide kind,
+  constructive feedback. Please don't be sarcastic or snarky.
+
+### Creating a Release
+
+The process is relatively straight forward, but here's is a useful checklist for tagging:
+
+- Look a changes from the previously tagged release and write release notes: `git log v0.4.0...HEAD`
+- Run the release script: `./script/release A.B.C release-notes-file`
+- Go to [github releases](https://github.com/Quick/Nimble/releases) and mark the tagged commit as a release.
+  - Use the same release notes you created for the tag, but tweak up formatting for github.
+  - Attach the carthage release `Nimble.framework.zip` to the release.
+- Announce!

Carthage/Checkouts/Quick/Externals/Nimble/LICENSE.md

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Quick Team
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.