Skip to content

Commit

Permalink
Merge pull request #30 from ReSwift/next-release
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
Ben-G authored Jun 30, 2016
2 parents 5c5d850 + 3405f66 commit 302c1a7
Show file tree
Hide file tree
Showing 274 changed files with 7,648 additions and 1,318 deletions.
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReSwift/ReSwift" ~> 1.0
github "ReSwift/ReSwift" "next-release"
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v3.2.0"
github "Quick/Quick" "v0.9.1"
github "ReSwift/ReSwift" "1.0.0"
github "Quick/Nimble" "v4.1.0"
github "Quick/Quick" "v0.9.2"
github "ReSwift/ReSwift" "ba758666e8455cb3c3ef898f1ae92070111b93cf"
1 change: 1 addition & 0 deletions Carthage/Checkouts/Nimble/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
system
17 changes: 16 additions & 1 deletion Carthage/Checkouts/Nimble/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
osx_image: xcode7.2
osx_image: xcode7.3
language: generic
matrix:
include:
- os: osx
sudo: required
env: TYPE=podspec
- os: osx
env: NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
- os: osx
env: NIMBLE_RUNTIME_TVOS_SDK_VERSION=9.0 TYPE=tvos
- os: osx
env: NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
- os: osx
env: TYPE=swiftpm
- os: osx
env: NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0 TYPE=ios
osx_image: xcode8
- os: osx
env: NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0 TYPE=tvos
osx_image: xcode8
- os: osx
env: NIMBLE_RUNTIME_OSX_SDK_VERSION=10.12 TYPE=osx
osx_image: xcode8
- os: linux
dist: trusty
sudo: required
env: TYPE=swiftpm
install:
- if [[ "$TYPE" == "swiftpm" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
- if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
script:
- ./test $TYPE
8 changes: 5 additions & 3 deletions Carthage/Checkouts/Nimble/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ The process is relatively straight forward, but here's is a useful checklist for

- Look at 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.
- The script will prompt you to create a new [GitHub release](https://github.com/Quick/Nimble/releases).
- Use the same release notes you created for the tag, but tweak up formatting for GitHub.
- Update [Quick](https://github.com/Quick/Quick)
- Update Quick's submodule reference to the newly released Nimble version
- Update Nimble version in `README.md` and Documentation in [Quick](https://github.com/Quick/Quick) if it's not a patch version update.
- Announce!
4 changes: 4 additions & 0 deletions Carthage/Checkouts/Nimble/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# A sample Gemfile
source "https://rubygems.org"

gem 'cocoapods'
63 changes: 63 additions & 0 deletions Carthage/Checkouts/Nimble/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (0.9.1)
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-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.4.0)
nap (~> 1.0)
xcodeproj (~> 0.28.2)
cocoapods-core (0.39.0)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-downloader (0.9.3)
cocoapods-plugins (0.4.2)
nap
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.5.1)
colored (1.2)
escape (0.0.4)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.4)
molinillo (0.4.4)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (0.28.2)
activesupport (>= 3)
claide (~> 0.9.1)
colored (~> 1.2)

PLATFORMS
ruby

DEPENDENCIES
cocoapods

BUNDLED WITH
1.11.2
4 changes: 3 additions & 1 deletion Carthage/Checkouts/Nimble/Nimble.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Nimble"
s.version = "3.2.0"
s.version = "4.1.0"
s.summary = "A Matcher Framework for Swift and Objective-C"
s.description = <<-DESC
Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.
Expand All @@ -14,6 +14,8 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }

s.source_files = "Sources/Nimble/**/*.{swift,h,m}"
s.private_header_files = "Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.h"
s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
s.weak_framework = "XCTest"
s.requires_arc = true
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'OTHER_LDFLAGS' => '-weak-lswiftXCTest', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }
Expand Down
Loading

0 comments on commit 302c1a7

Please sign in to comment.