Swift3 #502

jberkel · 2016-09-17T17:14:09Z

Supersedes #501, #475

jberkel · 2016-09-17T17:32:28Z

@stephencelis it might make sense to skip #475, unless you want to keep a separate branch for 2.3 compatibility?

Alternatively we could merge #475 first and then have a swift3 branch in parallel, but given the amount of changes this will become a maintenance nightmare.

ghost · 2016-09-17T20:43:59Z

It's look great.

How can I integrate it on a Pod file ?

jberkel · 2016-09-17T20:55:01Z

@iLandes

try

pod 'SQLite.swift', :git => 'https://github.com/stephencelis/SQLite.swift.git',
       :branch => 'swift3-mariotaku'

cmvolare · 2016-09-18T17:09:13Z

can I get a carthage line to integrate this branch into my project? thanks in advance.

stephencelis · 2016-09-19T16:33:02Z

Many thanks to @mariotaku for picking up my branch and getting it across the finish line! And many more thanks to @jberkel for doing an incredible job coordinating this migration. It's a big one!

stephencelis · 2016-09-19T16:34:44Z

it might make sense to skip #475, unless you want to keep a separate branch for 2.3 compatibility?

Alternatively we could merge #475 first and then have a swift3 branch in parallel, but given the amount of changes this will become a maintenance nightmare.

It'd be nice to tag 2.3 compatibility, though I don't think maintaining both at once is feasible.

jberkel · 2016-09-20T10:26:53Z

SQLite/Core/Blob.swift

-            start: UnsafePointer(bytes), count: length
-        )))
+    public init(bytes: UnsafeRawPointer, length: Int) {
+        // TODO correct count


@mariotaku what is needed here?

It works in tests and actual app, though I'm not sure whether my changes correct, maybe we could take a look at swift 2.3 branch.

looks good to me, I added a bunch of tests to verify the behaviour

sam-w · 2016-09-28T06:04:03Z

CocoaPods/iphoneos-10.0/module.modulemap

@@ -0,0 +1,4 @@
+module CSQLite [system] {
+    header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/usr/include/sqlite3.h"


This hard-coding of the Xcode path causes build errors (Carthage, CocoaPods or just building in Xcode) for all users who don't have their copy of Xcode 8.x at that path.

What do you suggest to do instead?

This hard-coding is required for CocoaPods. If you include SQLite.swift as a sub-project or via Carthage it uses an SDK-relative path instead.

I've raised this issue with CocoaPods in the past: CocoaPods/CocoaPods#3942

We're always open to alternative solutions for CocoaPods users, though, and would happily take contributions that solve the problem more elegantly for them!

@stephencelis this also affects Carthage builds – without the modulemap, the CSQLite imports cannot be resolved. Even worse, they're still required after the framework has been built (see #492).

think this is solved now with db8f39b

sam-w · 2016-09-28T06:04:31Z

CocoaPods/iphonesimulator-10.0/module.modulemap

@@ -0,0 +1,4 @@
+module CSQLite [system] {
+    header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator10.0.sdk/usr/include/sqlite3.h"


As above, this causes build errors for all users who don't have their copy of Xcode 8.x at that path.

sam-w · 2016-09-28T06:04:37Z

CocoaPods/macosx-10.11/module.modulemap

@@ -0,0 +1,4 @@
+module CSQLite [system] {
+    header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"


As above, this causes build errors for all users who don't have their copy of Xcode 8.x at that path.

sam-w · 2016-09-28T06:04:44Z

CocoaPods/macosx-10.12/module.modulemap

@@ -0,0 +1,4 @@
+module CSQLite [system] {
+    header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/sqlite3.h"


As above, this causes build errors for all users who don't have their copy of Xcode 8.x at that path.

sam-w · 2016-09-28T06:04:52Z

CocoaPods/macosx/module.modulemap

@@ -1,4 +1,4 @@
 module CSQLite [system] {
-    header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"
+    header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"


As above, this causes build errors for all users who don't have their copy of Xcode 8.x at that path.

* Add modulemap for MacOSX 10.11 * Update modulemap * Use iPhone SE simulator to fix test failures (travis-ci/travis-ci#6422)

jberkel · 2016-10-09T15:30:51Z

PR is ready for another round of review. To use in your application:

CocoaPods:

pod 'SQLite.swift', :git => 'https://github.com/stephencelis/SQLite.swift.git', :branch => 'swift3-mariotaku'

Carthage:

github "stephencelis/SQLite.swift" "swift3-mariotaku"

acrookston · 2016-10-10T02:15:06Z

I was just upgrading my app and something isn't working for watchOS. Wanted to leave a note about it. Will be digging in deeper to understand why.

EDIT: Resolved. Sorry my fault. I have Xcode installed at /Applications/Xcode 8.app/ so the modulemap wasn't working for me.

jberkel · 2016-10-11T14:44:11Z

Since I did not hear any more bug reports/complaints I just went ahead and merged the PR. The modulemap problems for non-CocoaPods users should hopefully be gone now.

jberkel mentioned this pull request Sep 17, 2016

Fully Migrated to Swift 3 #501

Closed

jberkel mentioned this pull request Sep 17, 2016

Swift 3 Migration #500

Closed

jberkel changed the title ~~Swift3~~ [WIP] Swift3 Sep 20, 2016

jberkel commented Sep 20, 2016

View reviewed changes

sam-w suggested changes Sep 28, 2016

View reviewed changes

This was referenced Oct 3, 2016

Error convert to swift 3 in Xcode 8 #512

Closed

How to use on Xcode 8 with Swift 3? #515

Closed

jberkel and others added 17 commits October 7, 2016 10:49

Run tests on Xcode8-beta

4ff05c6

Validate pod on xcode8

4cdfd69

Run tests on iPhone 6

ed8980c

Don’t hardcode simulator version

775a26c

Bump cocoapods

1cc0a53

Set Swift version to 2.3

0aaf650

Xcode8 compat changes

2588c44

* Add modulemap for MacOSX 10.11 * Update modulemap * Use iPhone SE simulator to fix test failures (travis-ci/travis-ci#6422)

Update CocoaPods, update repo

b62880e

Use recommended Xcode8 project settings

9fa5b90

travis: use xcode8 as default image

3df6b05

Add Swift version to xcconfig

90e662e

use Pod::Validator#add_swift_version

494f3c4

migrating to swift 3

8f9b8a8

all tests passed

78c7f6a

added .swift-version for pods

aaa07c7

Remove Xcode 7.3 tests

e9abf03

Set swift version in podspec

f8209be

jberkel added 4 commits October 7, 2016 10:50

Set iOS simulator

33f712d

Swift3 enum casing

1837266

Nest Operation inside Connection

4ed14ad

Flag methods executed for side-effects to silence warnings

2c9fd0c

jberkel force-pushed the swift3-mariotaku branch from df86417 to 2c9fd0c Compare October 7, 2016 08:51

jberkel added 11 commits October 7, 2016 12:48

Add tests for Blob initializer

8f8eec7

Add more tests for blob handling

b6941cd

use @discardableResult

f7d017d

Fix warnings

6bf844a

Accidental commit

1549062

Only available on OS X 10.10 or newer

5bc521e

cleanup

f11f6b8

Documentation updates

6152ee3

Remove FIXME

bbab401

sqlite3_trace

96238f5

Remove unneeded typealias

b392eaf

jberkel changed the title ~~[WIP] Swift3~~ Swift3 Oct 9, 2016

jberkel mentioned this pull request Oct 9, 2016

Xcode8 #475

Closed

jberkel mentioned this pull request Oct 10, 2016

we need swift 3.0 #519

Closed

jberkel added 4 commits October 10, 2016 15:13

Remove outdated sample code (#516)

8ba973e

Update bundler

681e219

Only import module when building with CocoaPods

db8f39b

Mention swift-2.3 branch in documentation

6b4cb81

jberkel merged commit 38d9b85 into master Oct 11, 2016

jberkel deleted the swift3-mariotaku branch October 11, 2016 14:49

jberkel mentioned this pull request Oct 11, 2016

Plans for Swift 3? #455

Closed

ceyhun mentioned this pull request Feb 6, 2017

Only import CSQLite module when building with CocoaPods #597

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swift3 #502

Swift3 #502

jberkel commented Sep 17, 2016 •

edited

Loading

jberkel commented Sep 17, 2016 •

edited

Loading

ghost commented Sep 17, 2016

jberkel commented Sep 17, 2016

cmvolare commented Sep 18, 2016 •

edited

Loading

stephencelis commented Sep 19, 2016

stephencelis commented Sep 19, 2016

jberkel Sep 20, 2016

mariotaku Sep 20, 2016

jberkel Oct 7, 2016 •

edited

Loading

sam-w Sep 28, 2016

jberkel Sep 28, 2016

stephencelis Sep 28, 2016

jberkel Oct 10, 2016

jberkel Oct 11, 2016

sam-w Sep 28, 2016

sam-w Sep 28, 2016

sam-w Sep 28, 2016

sam-w Sep 28, 2016

jberkel commented Oct 9, 2016 •

edited

Loading

acrookston commented Oct 10, 2016 •

edited

Loading

jberkel commented Oct 11, 2016

		@@ -0,0 +1,4 @@
		module CSQLite [system] {
		header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/usr/include/sqlite3.h"

Swift3 #502

Swift3 #502

Conversation

jberkel commented Sep 17, 2016 • edited Loading

jberkel commented Sep 17, 2016 • edited Loading

ghost commented Sep 17, 2016

jberkel commented Sep 17, 2016

cmvolare commented Sep 18, 2016 • edited Loading

stephencelis commented Sep 19, 2016

stephencelis commented Sep 19, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jberkel Oct 7, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jberkel commented Oct 9, 2016 • edited Loading

acrookston commented Oct 10, 2016 • edited Loading

jberkel commented Oct 11, 2016

jberkel commented Sep 17, 2016 •

edited

Loading

jberkel commented Sep 17, 2016 •

edited

Loading

cmvolare commented Sep 18, 2016 •

edited

Loading

jberkel Oct 7, 2016 •

edited

Loading

jberkel commented Oct 9, 2016 •

edited

Loading

acrookston commented Oct 10, 2016 •

edited

Loading