Skip to content

Commit

Permalink
Merge pull request #4 from Trxy/feature/update_to_swift_4
Browse files Browse the repository at this point in the history
Update to swift 4 and Xcode 9
  • Loading branch information
modzelewski authored Sep 24, 2017
2 parents 3ddac7d + 613a0a4 commit 2fdbc14
Show file tree
Hide file tree
Showing 134 changed files with 6,642 additions and 2,145 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8
osx_image: xcode9

script:
- xcodebuild -workspace TRX.xcworkspace -scheme TRXTests -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' test
- xcodebuild -workspace TRX.xcworkspace -scheme TRXTests -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.0' test
15 changes: 3 additions & 12 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
use_frameworks!

target 'TRXTests' do
pod 'Quick', '~> 0.10.0'
pod 'Nimble', '~> 5.0.0'
pod 'Nimble-Snapshots', '~> 4.2.0'
pod 'Quick', '~> 1.1.0'
pod 'Nimble', '~> 7.0.1'
pod 'Nimble-Snapshots', '~> 6.2'
end

post_install do |installer|
installer.pods_project.build_configurations.each do |config|
# Configure Pod targets for Xcode 8 compatibility
config.build_settings['SWIFT_VERSION'] = '3.0'
config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = 'ABCDEFGHIJ/'
config.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'NO'
end
end
37 changes: 19 additions & 18 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
PODS:
- FBSnapshotTestCase (2.1.3):
- FBSnapshotTestCase/SwiftSupport (= 2.1.3)
- FBSnapshotTestCase/Core (2.1.3)
- FBSnapshotTestCase/SwiftSupport (2.1.3):
- FBSnapshotTestCase (2.1.4):
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- Nimble (5.0.0)
- Nimble-Snapshots (4.2.0):
- Nimble (7.0.1)
- Nimble-Snapshots (6.2.1):
- Nimble-Snapshots/Core (= 6.2.1)
- Nimble-Snapshots/Core (6.2.1):
- FBSnapshotTestCase (~> 2.0)
- Nimble
- Quick
- Quick (0.10.0)
- Nimble (~> 7.0)
- Quick (1.1.0)

DEPENDENCIES:
- Nimble (~> 5.0.0)
- Nimble-Snapshots (~> 4.2.0)
- Quick (~> 0.10.0)
- Nimble (~> 7.0.1)
- Nimble-Snapshots (~> 6.2)
- Quick (~> 1.1.0)

SPEC CHECKSUMS:
FBSnapshotTestCase: 4607968e0dfa1e2772ec0d0098354f8b870c5753
Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
Nimble-Snapshots: 4826e3ee211d2c7af27645e35d68b9e9917882e7
Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
Nimble-Snapshots: 31c8ef7fcebf0e68b4dff83f6e2160813a4a116b
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d

PODFILE CHECKSUM: f746eaae94bebbb82137146ebf3b472939b797b8
PODFILE CHECKSUM: 6042be8ab7fc8ac7a7e2cd21f73d4cdaa6a42836

COCOAPODS: 1.1.1
COCOAPODS: 1.3.1
37 changes: 19 additions & 18 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions Pods/Nimble-Snapshots/CurrentTestCaseTracker.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

217 changes: 217 additions & 0 deletions Pods/Nimble-Snapshots/DynamicSize/DynamicSizeSnapshot.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2fdbc14

Please sign in to comment.