Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a3dbd5

Browse files
authored
Merge pull request#6 from ReSwift/switch-to-latest-release
[Dependencies] Switch to Latest ReSwift Release
2 parents009d832 +1ab349a commit1a3dbd5

File tree

1,260 files changed

+62148
-31587
lines changed

Some content is hidden

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

1,260 files changed

+62148
-31587
lines changed

‎Cartfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ github "Quick/Quick"
33
github "Quick/Nimble"
44
github "soffes/SSKeychain"
55
github "Ben-G/ListKit"
6+
github "ReSwift/ReSwift"
7+
github "ReSwift/ReSwiftRouter"

‎Cartfile.resolved‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
github "Ben-G/ListKit" "1.0.0"
2-
github "Quick/Nimble" "v3.1.0"
3-
github "Quick/Quick" "v0.9.1"
4-
github "nerdishbynature/RequestKit" "0.2.2"
5-
github "soffes/SSKeychain" "v1.3.1"
6-
github "nerdishbynature/octokit.swift" "0.5.2"
2+
github "Quick/Nimble" "v4.1.0"
3+
github "Quick/Quick" "v0.9.2"
4+
github "ReSwift/ReSwift" "2.0.0"
5+
github "nerdishbynature/RequestKit" "0.3.0"
6+
github "soffes/SSKeychain" "v1.4.0"
7+
github "ReSwift/ReSwiftRouter" "0.3.1"
8+
github "nerdishbynature/octokit.swift" "0.6.1"

‎Carthage/Checkouts/Nimble/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ Nimble.framework.zip
1111
# Carthage/Checkouts
1212

1313
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+
system
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: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,33 @@
1-
osx_image:xcode7
2-
language:objective-c
3-
4-
env:
5-
matrix:
6-
-NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
7-
-NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
8-
9-
script:./test $TYPE
1+
osx_image:xcode7.3
2+
language:generic
3+
matrix:
4+
include:
5+
-os:osx
6+
sudo:required
7+
env:TYPE=podspec
8+
-os:osx
9+
env:NIMBLE_RUNTIME_IOS_SDK_VERSION=9.0 TYPE=ios
10+
-os:osx
11+
env:NIMBLE_RUNTIME_TVOS_SDK_VERSION=9.0 TYPE=tvos
12+
-os:osx
13+
env:NIMBLE_RUNTIME_OSX_SDK_VERSION=10.10 TYPE=osx
14+
-os:osx
15+
env:TYPE=swiftpm
16+
-os:osx
17+
env:NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0 TYPE=ios
18+
osx_image:xcode8
19+
-os:osx
20+
env:NIMBLE_RUNTIME_TVOS_SDK_VERSION=10.0 TYPE=tvos
21+
osx_image:xcode8
22+
-os:osx
23+
env:NIMBLE_RUNTIME_OSX_SDK_VERSION=10.12 TYPE=osx
24+
osx_image:xcode8
25+
-os:linux
26+
dist:trusty
27+
sudo:required
28+
env:TYPE=swiftpm
29+
install:
30+
-if [[ "$TYPE" == "swiftpm" ]]; then eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"; fi
31+
-if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
32+
script:
33+
-./test $TYPE

‎Carthage/Checkouts/Nimble/CONTRIBUTING.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ The process is relatively straight forward, but here's is a useful checklist for
104104

105105
- Look at changes from the previously tagged release and write release notes:`git log v0.4.0...HEAD`
106106
- 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.
107+
- The script will prompt you to create a new[GitHub release](https://github.com/Quick/Nimble/releases).
108+
- Use the same release notes you created for the tag, but tweak up formatting for GitHub.
109+
- Update[Quick](https://github.com/Quick/Quick)
110+
- Update Quick's submodule reference to the newly released Nimble version
111+
- Update Nimble version in`README.md` and Documentation in[Quick](https://github.com/Quick/Quick) if it's not a patch version update.
110112
- Announce!

‎Carthage/Checkouts/Nimble/Gemfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# A sample Gemfile
2+
source"https://rubygems.org"
3+
4+
gem'cocoapods'
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
GEM
2+
remote:https://rubygems.org/
3+
specs:
4+
activesupport (4.2.6)
5+
i18n (~>0.7)
6+
json (~>1.7,>=1.7.7)
7+
minitest (~>5.1)
8+
thread_safe (~>0.3,>=0.3.4)
9+
tzinfo (~>1.1)
10+
claide (0.9.1)
11+
cocoapods (0.39.0)
12+
activesupport (>=4.0.2)
13+
claide (~>0.9.1)
14+
cocoapods-core (=0.39.0)
15+
cocoapods-downloader (~>0.9.3)
16+
cocoapods-plugins (~>0.4.2)
17+
cocoapods-search (~>0.1.0)
18+
cocoapods-stats (~>0.6.2)
19+
cocoapods-trunk (~>0.6.4)
20+
cocoapods-try (~>0.5.1)
21+
colored (~>1.2)
22+
escape (~>0.0.4)
23+
molinillo (~>0.4.0)
24+
nap (~>1.0)
25+
xcodeproj (~>0.28.2)
26+
cocoapods-core (0.39.0)
27+
activesupport (>=4.0.2)
28+
fuzzy_match (~>2.0.4)
29+
nap (~>1.0)
30+
cocoapods-downloader (0.9.3)
31+
cocoapods-plugins (0.4.2)
32+
nap
33+
cocoapods-search (0.1.0)
34+
cocoapods-stats (0.6.2)
35+
cocoapods-trunk (0.6.4)
36+
nap (>=0.8,<2.0)
37+
netrc (=0.7.8)
38+
cocoapods-try (0.5.1)
39+
colored (1.2)
40+
escape (0.0.4)
41+
fuzzy_match (2.0.4)
42+
i18n (0.7.0)
43+
json (1.8.3)
44+
minitest (5.8.4)
45+
molinillo (0.4.4)
46+
nap (1.1.0)
47+
netrc (0.7.8)
48+
thread_safe (0.3.5)
49+
tzinfo (1.2.2)
50+
thread_safe (~>0.1)
51+
xcodeproj (0.28.2)
52+
activesupport (>=3)
53+
claide (~>0.9.1)
54+
colored (~>1.2)
55+
56+
PLATFORMS
57+
ruby
58+
59+
DEPENDENCIES
60+
cocoapods
61+
62+
BUNDLED WITH
63+
1.11.2

‎Carthage/Checkouts/Nimble/Nimble.podspec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.newdo |s|
22
s.name="Nimble"
3-
s.version="3.1.0"
3+
s.version="4.1.0"
44
s.summary="A Matcher Framework for Swift and Objective-C"
55
s.description=<<-DESC
66
Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.
@@ -13,7 +13,9 @@ Pod::Spec.new do |s|
1313
s.tvos.deployment_target="9.0"
1414
s.source={:git=>"https://github.com/Quick/Nimble.git",:tag=>"v#{s.version}"}
1515

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp