Swift 3.0 #326

ikesyo · 2016-09-03T09:13:04Z

This succeeds the @norio-nomura's work of #277.

Test cases will need to be `final` for now due to the `Self` reference on the new `allTests` type. Once codegen is available for `allTests` we can get rid of the `final` and the `XCTestCaseProvider` protocol altogether.

Most changes are affected by: [SE-0005](https://github.com/apple/swift-evolution/blob/master/proposals/0005-objective-c-name-translation.md) [SE-0040](https://github.com/apple/swift-evolution/blob/master/proposals/0040-attributecolons.md) [SE-0046](https://github.com/apple/swift-evolution/blob/master/proposals/0046-first-label.md)

… exist

Most changes are affected by: - [SE-0005](https://github.com/apple/swift-evolution/blob/master/proposals/0005-objective-c-name-translation.md) - [SE-0049](https://github.com/apple/swift-evolution/blob/master/proposals/0049-noescape-autoclosure-type-attrs.md) - Update of swift-corelibs-foundation

Changes are affected by: - [SE-0059](https://github.com/apple/swift-evolution/blob/master/proposals/0059-updated-set-apis.md) - [SE-0065](https://github.com/apple/swift-evolution/blob/master/proposals/0065-collections-move-indices.md) - Update of swift-corelibs-foundation

Apply workaround for https://bugs.swift.org/browse/SR-1464 This fixes failing `BeCloseToTest` on Linux.

Changes are affected by: - [SE-0054](https://github.com/apple/swift-evolution/blob/master/proposals/0054-abolish-iuo.md) - [SE-0066](https://github.com/apple/swift-evolution/blob/master/proposals/0066-standardize-function-type-syntax.md) - [SE-0072](https://github.com/apple/swift-evolution/blob/master/proposals/0072-eliminate-implicit-bridging-conversions.md) - Update of swift-corelibs-foundation

`test podspec` passed by applying this.

…jectiveC` Avoid `error: mixedSources("<path to Nimble>/Sources/Nimble")` on building by Swift Package Manager.

Error: "Could not cast value of type '__C.CFRunLoopMode' (0x111e56c38) to 'Swift.AnyObject'"

# Conflicts: # Sources/Nimble/Matchers/Contain.swift

* cl-swift3-compatibility: Add support for the foundation Date class Fix up expected error messages

Support Xcode 8 beta 6 and Preview 6

… its own method.

CGFloat now conforms to NMBDoubleConvertible

`CGFloat` is in Foundation (swift-corelibs-foundation) on Linux.

This should be removed once we get the following: swiftlang/swift-corelibs-foundation#585

Add NMBDoubleConvertible conformance to CGFloat on Linux

# Conflicts: # .travis.yml # test

Resolve conflicts with master

[WIP] Swift 3.0 Compatibility

jeffh · 2016-09-11T07:37:28Z

@ikesyo, what's left that prevents this from merging into master?

ikesyo · 2016-09-11T08:42:38Z

@jeffh I think this should get additional reviews, for example:

API Design (Naming) Guidelines
IPHONEOS_DEPLOYMENT_TARGET is bumped to 8.0 (we can't select 7.0 on Xcode 8 GUI anymore)
BeIdenticalTo implementation which is affected by id-as-Any.

jeffh · 2016-09-13T04:10:31Z

Sources/Nimble/DSL.swift

@@ -58,11 +56,10 @@ internal func nimblePrecondition(
        return result


We should get rid of the return value because it isn't used.

jeffh · 2016-09-13T04:47:40Z

Thanks for the update @ikesyo.

API Design (Naming) Guidelines

I think that can be addressed when we attempt to switch matchers to use protocol extensions. I'll try again next week to play around and see if protocol extensions don't cause all sorts of problems.

IPHONEOS_DEPLOYMENT_TARGET is bumped to 8.0 (we can't select 7.0 on Xcode 8 GUI anymore)

👍 . This is fine. If someone still manages to get it to work on 7.0, we can accept a PR as needed.

BeIdenticalTo implementation which is affected by id-as-Any.

While not ideal, the implementation seems workable.

Other than that one change. It seems ready to merge, imo.

ikesyo · 2016-09-13T05:02:56Z

@jeffh Thanks for the review! I've addressed the return value of nimblePrecondition.

jeffh · 2016-09-13T05:29:05Z

Thanks everyone for putting in all the effort! 👏

tettoffensive · 2016-09-14T20:40:56Z

Even though I have specified in my Podfile, Xcode 8 GM still complains and wants to convert to swift 3 for both projects. am I missing something?

pod 'Quick', :git => 'https://github.com/Quick/Quick.git', :branch => 'swift-3.0'
pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git', :branch => 'master'

tettoffensive · 2016-09-22T18:32:46Z

@jeffh @ikesyo ?

ikesyo · 2016-09-22T22:45:58Z

You might currently use CocoaPods 1.0.1, but you need 1.1.0.rc.2 for Xcode 8: gem update cocoapods --pre

Swift 3.0 Support

norio-nomura and others added 30 commits May 9, 2016 23:21

Swift 2.2 and 3.0 compatibility

6a5d3ad

Update to swift-DEVELOPMENT-SNAPSHOT-2016-03-24-a

7e0014b

Update tests to work with the latest swift-corelibs-xctest

8146b55

Test cases will need to be `final` for now due to the `Self` reference on the new `allTests` type. Once codegen is available for `allTests` we can get rid of the `final` and the `XCTestCaseProvider` protocol altogether.

Work around compiler crasher

310a573

Comply to updated XCTest

4c5f081

Remove invalid file reference of Swift3to22.swift from project.pbxproj

47b2b29

swift build --clean produces error when .build directory does not…

f4c6607

… exist

Remove Swift 2.2 support

9fa10f3

Fix XCTestObservation adaption of CurrentTestCaseTracker

41a1190

Fix NSNumber.testDescription

2a8b8b8

Apply workaround for https://bugs.swift.org/browse/SR-1464 This fixes failing `BeCloseToTest` on Linux.

Silence warning

2e0dc2c

Update to cocoapods 1.0.0

15d1094

`test podspec` passed by applying this.

Update to Xcode 8 beta 1

08063f6

Move Sources/Nimble/Adapters/ObjectiveC/*.[hm] to `Sources/NimbleOb…

46c095c

…jectiveC` Avoid `error: mixedSources("<path to Nimble>/Sources/Nimble")` on building by Swift Package Manager.

Update Swift3to22.swift and rename to LinuxSupport.swift

5390907

MACOSX_DEPLOYMENT_TARGET = 10.10;

1924f70

Update test to swift-3.0-PREVIEW-1

25eb0e8

Update Travis-CI to Xcode 8

cae7cf8

Update .swift-version to swift-3.0-preview-1

ce28591

Fix DispatchTime conversion

681c71e

Let swift infer some parameters

c50f0a6

Fix Casting error on Swift Package Manager

1379f72

Error: "Could not cast value of type '__C.CFRunLoopMode' (0x111e56c38) to 'Swift.AnyObject'"

Merge branch 'master' into nn-swift-3-compatibility

770c11a

# Conflicts: # Sources/Nimble/Matchers/Contain.swift

Fix up expected error messages

32e6dec

Add support for the foundation Date class

7c39fc4

Merge branch 'cl-swift3-compatibility' into nn-swift-3-compatibility

485c666

* cl-swift3-compatibility: Add support for the foundation Date class Fix up expected error messages

norio-nomura and others added 11 commits August 23, 2016 06:04

Merge pull request #6 from ikesyo/swift3-beta-6

8ed5cb9

Support Xcode 8 beta 6 and Preview 6

CGFloat now conforms to NMBDoubleConvertible

b483a3d

Added CGFloat to the beCloseTo test

ead0e39

Using CGFloat only for the correct targets. Moved the CGFloat test to…

727b06b

… its own method.

Merge pull request #7 from raphaelcruzeiro/rc-CGFloat-Matchers

512fd29

CGFloat now conforms to NMBDoubleConvertible

Add NMBDoubleConvertible conformance to CGFloat on Linux

c07b141

`CGFloat` is in Foundation (swift-corelibs-foundation) on Linux.

Work around CGFloat(native: ...) description on Linux

595c2a8

This should be removed once we get the following: swiftlang/swift-corelibs-foundation#585

Merge pull request #8 from ikesyo/cgfloat-on-linux

3d82a18

Add NMBDoubleConvertible conformance to CGFloat on Linux

Merge branch 'master' into swift3-merge-master

e629e4e

# Conflicts: # .travis.yml # test

Merge pull request #9 from ikesyo/swift3-merge-master

7952622

Resolve conflicts with master

Merge pull request #277 from norio-nomura/nn-swift-3-compatibility

4b539a2

[WIP] Swift 3.0 Compatibility

ikesyo mentioned this pull request Sep 3, 2016

Move back to Quick/Nimble ReactiveCocoa/ReactiveCocoa#3117

Closed

Fix Xcode 8 GM compatibility

220152b

3.0-GM-CANDIDATE

5f683b2

ikesyo changed the title ~~[WIP] Swift 3.0~~ Swift 3.0 Sep 11, 2016

Fix 3.0-GM-CANDIDATE compatibility

9dc342c

jeffh reviewed Sep 13, 2016
View reviewed changes

Remove unused return value of nimblePrecondition

8dd5ba1

jeffh added this to the v5.0.0 milestone Sep 13, 2016

jeffh merged commit e7c1f4e into master Sep 13, 2016

jeffh deleted the swift-3.0 branch September 13, 2016 05:27

Megal pushed a commit to Megal/Nimble that referenced this pull request Jul 31, 2019

Merge pull request Quick#326 from Quick/swift-3.0

b70e53f

Swift 3.0 Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Swift 3.0 #326

Swift 3.0 #326

Uh oh!

ikesyo commented Sep 3, 2016

Uh oh!

jeffh commented Sep 11, 2016

Uh oh!

ikesyo commented Sep 11, 2016 •

edited

Loading

Uh oh!

jeffh Sep 13, 2016

Uh oh!

jeffh commented Sep 13, 2016

Uh oh!

ikesyo commented Sep 13, 2016

Uh oh!

jeffh commented Sep 13, 2016

Uh oh!

tettoffensive commented Sep 14, 2016

Uh oh!

tettoffensive commented Sep 22, 2016

Uh oh!

ikesyo commented Sep 22, 2016

Uh oh!

Uh oh!

		@@ -58,11 +56,10 @@ internal func nimblePrecondition(
		return result

Uh oh!

Swift 3.0 #326

Swift 3.0 #326

Uh oh!

Conversation

ikesyo commented Sep 3, 2016

Uh oh!

jeffh commented Sep 11, 2016

Uh oh!

ikesyo commented Sep 11, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jeffh Sep 13, 2016

Choose a reason for hiding this comment

Uh oh!

jeffh commented Sep 13, 2016

Uh oh!

ikesyo commented Sep 13, 2016

Uh oh!

jeffh commented Sep 13, 2016

Uh oh!

tettoffensive commented Sep 14, 2016

Uh oh!

tettoffensive commented Sep 22, 2016

Uh oh!

ikesyo commented Sep 22, 2016

Uh oh!

Uh oh!

ikesyo commented Sep 11, 2016 •

edited

Loading