Skip to content

Commit 4d06bda

Browse files
committed
Merge pull request #21 from ReSwift/benji/fix-carthage
[Dependencies] Re-Add Carthage/Checkout
2 parents 3f51481 + 1854654 commit 4d06bda

File tree

432 files changed

+36906
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

432 files changed

+36906
-237
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ xcuserdata
4444
# Carthage
4545
#
4646
# Add this line if you want to avoid checking in source code from Carthage dependencies.
47-
Carthage/Checkouts
47+
# Carthage/Checkouts
4848
Carthage/Build
4949

5050
# fastlane
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.DS_Store
2+
xcuserdata/
3+
build/
4+
.idea
5+
DerivedData/
6+
Nimble.framework.zip
7+
8+
# Carthage
9+
#
10+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
11+
# Carthage/Checkouts
12+
13+
Carthage/Build
14+
15+
# Swift Package Manager
16+
#
17+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
18+
# Packages/
19+
.build/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DEVELOPMENT-SNAPSHOT-2016-02-25-a
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
osx_image: xcode7.2
2+
language: generic
3+
matrix:
4+
include:
5+
- os: osx
6+
env: NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
7+
- os: osx
8+
env: NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
9+
- os: osx
10+
env: TYPE=swiftpm
11+
- os: linux
12+
dist: trusty
13+
sudo: required
14+
env: TYPE=swiftpm
15+
install:
16+
- if [[ "$TYPE" == "swiftpm" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
17+
script:
18+
- ./test $TYPE
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
2+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
3+
4+
- [Welcome to Nimble!](#welcome-to-nimble!)
5+
- [Reporting Bugs](#reporting-bugs)
6+
- [Building the Project](#building-the-project)
7+
- [Pull Requests](#pull-requests)
8+
- [Style Conventions](#style-conventions)
9+
- [Core Members](#core-members)
10+
- [Code of Conduct](#code-of-conduct)
11+
12+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
13+
14+
# Welcome to Nimble!
15+
16+
We're building a testing framework for a new generation of Swift and
17+
Objective-C developers.
18+
19+
Nimble should be easy to use and easy to maintain. Let's keep things
20+
simple and well-tested.
21+
22+
**tl;dr:** If you've added a file to the project, make sure it's
23+
included in both the OS X and iOS targets.
24+
25+
## Reporting Bugs
26+
27+
Nothing is off-limits. If you're having a problem, we want to hear about
28+
it.
29+
30+
- See a crash? File an issue.
31+
- Code isn't compiling, but you don't know why? Sounds like you should
32+
submit a new issue, bud.
33+
- Went to the kitchen, only to forget why you went in the first place?
34+
Better submit an issue.
35+
36+
Be sure to include in your issue:
37+
38+
- Your Xcode version (eg - Xcode 7.0.1 7A1001)
39+
- Your version of Nimble (eg - v2.0.0 or git sha `20a3f3b4e63cc8d97c92c4164bf36f2a2c9a6e1b`)
40+
- What are the steps to reproduce this issue?
41+
- What platform are you using? (eg - OS X, iOS, watchOS, tvOS)
42+
- If the problem is on a UI Testing Bundle, Unit Testing Bundle, or some other target configuration
43+
- Are you using carthage or cocoapods?
44+
45+
## Building the Project
46+
47+
- Use `Nimble.xcodeproj` to work on Nimble.
48+
49+
## Pull Requests
50+
51+
- Nothing is trivial. Submit pull requests for anything: typos,
52+
whitespace, you name it.
53+
- Not all pull requests will be merged, but all will be acknowledged. If
54+
no one has provided feedback on your request, ping one of the owners
55+
by name.
56+
- Make sure your pull request includes any necessary updates to the
57+
README or other documentation.
58+
- Be sure the unit tests for both the OS X and iOS targets of Nimble
59+
before submitting your pull request. You can run all the OS X & iOS unit
60+
tests using `./test`.
61+
- If you've added a file to the project, make sure it's included in both
62+
the OS X and iOS targets.
63+
- The `master` branch will always support the stable Xcode version. Other
64+
branches will point to their corresponding versions they support.
65+
- If you're making a configuration change, make sure to edit both the xcode
66+
project and the podspec file.
67+
68+
### Style Conventions
69+
70+
- Indent using 4 spaces.
71+
- Keep lines 100 characters or shorter. Break long statements into
72+
shorter ones over multiple lines.
73+
- In Objective-C, use `#pragma mark -` to mark public, internal,
74+
protocol, and superclass methods.
75+
76+
## Core Members
77+
78+
If a few of your pull requests have been merged, and you'd like a
79+
controlling stake in the project, file an issue asking for write access
80+
to the repository.
81+
82+
### Code of Conduct
83+
84+
Your conduct as a core member is your own responsibility, but here are
85+
some "ground rules":
86+
87+
- Feel free to push whatever you want to master, and (if you have
88+
ownership permissions) to create any repositories you'd like.
89+
90+
Ideally, however, all changes should be submitted as GitHub pull
91+
requests. No one should merge their own pull request, unless no
92+
other core members respond for at least a few days.
93+
94+
If you'd like to create a new repository, it'd be nice if you created
95+
a GitHub issue and gathered some feedback first.
96+
97+
- It'd be awesome if you could review, provide feedback on, and close
98+
issues or pull requests submitted to the project. Please provide kind,
99+
constructive feedback. Please don't be sarcastic or snarky.
100+
101+
### Creating a Release
102+
103+
The process is relatively straight forward, but here's is a useful checklist for tagging:
104+
105+
- Look at changes from the previously tagged release and write release notes: `git log v0.4.0...HEAD`
106+
- Run the release script: `./script/release A.B.C release-notes-file`
107+
- Go to [github releases](https://github.com/Quick/Nimble/releases) and mark the tagged commit as a release.
108+
- Use the same release notes you created for the tag, but tweak up formatting for github.
109+
- Attach the carthage release `Nimble.framework.zip` to the release.
110+
- Announce!
Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2014 Quick Team
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Pod::Spec.new do |s|
2+
s.name = "Nimble"
3+
s.version = "3.2.0"
4+
s.summary = "A Matcher Framework for Swift and Objective-C"
5+
s.description = <<-DESC
6+
Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.
7+
DESC
8+
s.homepage = "https://github.com/Quick/Nimble"
9+
s.license = { :type => "Apache 2.0", :file => "LICENSE.md" }
10+
s.author = "Quick Contributors"
11+
s.ios.deployment_target = "7.0"
12+
s.osx.deployment_target = "10.9"
13+
s.tvos.deployment_target = "9.0"
14+
s.source = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }
15+
16+
s.source_files = "Sources/Nimble/**/*.{swift,h,m}"
17+
s.weak_framework = "XCTest"
18+
s.requires_arc = true
19+
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'OTHER_LDFLAGS' => '-weak-lswiftXCTest', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }
20+
end

0 commit comments

Comments
 (0)