Skip to content

Commit 6be3550

Browse files
authored
Merge pull request #4 from manGoweb/swift4
swift 4 support
2 parents b66b3aa + 1bd9897 commit 6be3550

File tree

126 files changed

+4698
-2483
lines changed

Some content is hidden

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

126 files changed

+4698
-2483
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1
1+
4.0

Example/Podfile

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
platform :ios, '9.1'
1+
platform :ios, '10.3'
22

33
#inhibit_all_warnings!
44
use_frameworks!
55

66

77
target 'SpecToolsExample' do
8-
9-
pod 'SnapKit', '~> 3.2.0'
10-
11-
target 'SpecToolsExampleTests' do
12-
inherit! :search_paths
13-
14-
pod 'SpecTools', :path => '../'
15-
pod 'Quick', '~> 1.0.0'
16-
pod 'Nimble', '~> 5.1.1'
17-
pod 'FBSnapshotTestCase'
18-
pod 'Nimble-Snapshots'
19-
end
8+
pod 'SnapKit'
9+
10+
target 'SpecToolsExampleTests' do
11+
inherit! :search_paths
12+
13+
pod 'SpecTools', :path => '../'
14+
pod 'Quick', :git => 'https://github.com/Quick/Quick.git', :branch => 'master'
15+
pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git', :branch => 'master'
16+
pod 'FBSnapshotTestCase'
17+
pod 'Nimble-Snapshots'
18+
end
2019
end

Example/Podfile.lock

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,51 @@ PODS:
44
- FBSnapshotTestCase/Core (2.1.4)
55
- FBSnapshotTestCase/SwiftSupport (2.1.4):
66
- FBSnapshotTestCase/Core
7-
- Nimble (5.1.1)
7+
- Nimble (7.0.1)
88
- Nimble-Snapshots (4.4.0):
99
- Nimble-Snapshots/Core (= 4.4.0)
1010
- Nimble-Snapshots/Core (4.4.0):
1111
- FBSnapshotTestCase (~> 2.0)
1212
- Nimble
1313
- Quick
14-
- Quick (1.0.0)
15-
- SnapKit (3.2.0)
16-
- SpecTools (0.0.2)
14+
- Quick (1.1.0)
15+
- SnapKit (4.0.0)
16+
- SpecTools (1.0.0)
1717

1818
DEPENDENCIES:
1919
- FBSnapshotTestCase
20-
- Nimble (~> 5.1.1)
20+
- Nimble (from `https://github.com/Quick/Nimble.git`, branch `master`)
2121
- Nimble-Snapshots
22-
- Quick (~> 1.0.0)
23-
- SnapKit (~> 3.2.0)
22+
- Quick (from `https://github.com/Quick/Quick.git`, branch `master`)
23+
- SnapKit
2424
- SpecTools (from `../`)
2525

2626
EXTERNAL SOURCES:
27+
Nimble:
28+
:branch: master
29+
:git: https://github.com/Quick/Nimble.git
30+
Quick:
31+
:branch: master
32+
:git: https://github.com/Quick/Quick.git
2733
SpecTools:
2834
:path: ../
2935

36+
CHECKOUT OPTIONS:
37+
Nimble:
38+
:commit: a63252b16eba6cdebec4e4936388c90552165a68
39+
:git: https://github.com/Quick/Nimble.git
40+
Quick:
41+
:commit: 3665ae9570b682a562df847cccbb46811864676a
42+
:git: https://github.com/Quick/Quick.git
43+
3044
SPEC CHECKSUMS:
3145
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
32-
Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
46+
Nimble: 1b6670c36e5750169b9e4cc2e9cfa82a7603c69e
3347
Nimble-Snapshots: e743439f26c2fa99d8f7e0d7c01c99bcb40aa6f2
34-
Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
35-
SnapKit: 1ca44df72cfa543218d177cb8aab029d10d86ea7
36-
SpecTools: fa0517363fe68eba12bba6c4db562aa1a73fc544
48+
Quick: 4700beb8056662b579facd79eaca7f04fb3d48e6
49+
SnapKit: a42d492c16e80209130a3379f73596c3454b7694
50+
SpecTools: 731138aa656c7d9a91def6ab594f5bfaf9dc3f04
3751

38-
PODFILE CHECKSUM: 4785087ea69597b09cf0abc795b1c14fe5e761fc
52+
PODFILE CHECKSUM: dbc3aff592696d2f00d42e1ebbdaa97028d40e87
3953

4054
COCOAPODS: 1.3.1

Example/Pods/Local Podspecs/Nimble.podspec.json

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Local Podspecs/Quick.podspec.json

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Local Podspecs/SnapKit.podspec.json

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Local Podspecs/SpecTools.podspec.json

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 26 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/LICENSE.md renamed to Example/Pods/Nimble/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)