Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swift 4 support #668

Merged
merged 19 commits into from
Jul 1, 2017
Merged

Swift 4 support #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
426e7d6
Fix usages of old Swift 2 enum case names
joshfriend May 21, 2017
89630b2
Apply Swift3 case convention to internal enum `Modifier`
joshfriend May 21, 2017
917d4d1
Update for Swift 4, removing module maps and fixing the map issue
thebluepotato Jun 15, 2017
96292f9
Remove reference to deleted files
thebluepotato Jun 15, 2017
120891d
Remove deleted paths
thebluepotato Jun 15, 2017
c3101d9
Remove dependency
thebluepotato Jun 15, 2017
9b4c257
Undo
thebluepotato Jun 15, 2017
ee7cef1
Merge pull request #656 from joshfriend/fix-enum-name-refs
jberkel Jun 15, 2017
2b067d4
Travis sneakily replaced the Xcode 8.3 image.
jberkel Jun 16, 2017
ca62772
Set iOS version
jberkel Jun 16, 2017
92db670
Merge pull request #670 from stephencelis/travis-update
jberkel Jun 16, 2017
f24bc5d
Fix demonstration of how to trace SQL statements in docs
eoinkelly Jun 15, 2017
067c639
More cleanup
thebluepotato Jun 16, 2017
e5eea6b
Merge pull request #669 from eoinkelly/fix-trace-in-docs
jberkel Jun 17, 2017
a1b6607
Update Travis CI to use Xcode 9 beta 2
thebluepotato Jun 30, 2017
36042f1
Fix for iOS version not found on Travis
thebluepotato Jun 30, 2017
4406295
Merge remote-tracking branch 'stephencelis/master'
thebluepotato Jun 30, 2017
d9672a8
Enforce iOS 11.0 after update from master
thebluepotato Jun 30, 2017
b44c9d7
Merge pull request #1 from thebluepotato/master
thebluepotato Jun 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: objective-c
rvm: 2.2
osx_image: xcode8.3
osx_image: xcode9
env:
global:
- IOS_SIMULATOR="iPhone 6s"
- IOS_VERSION="11.0"
matrix:
include:
- env: BUILD_SCHEME="SQLite iOS"
Expand Down
4 changes: 0 additions & 4 deletions CocoaPods/appletvos/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/appletvsimulator/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/iphoneos-10.0/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/iphoneos/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/iphonesimulator-10.0/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/iphonesimulator/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/macosx-10.11/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/macosx-10.12/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/macosx/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/watchos/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions CocoaPods/watchsimulator/module.modulemap
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/Index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,7 @@ We can log SQL using the database’s `trace` function.

``` swift
#if DEBUG
db.trace(print)
db.trace { print($0) }
#endif
```

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD_TOOL = xcodebuild
BUILD_SCHEME = SQLite Mac
IOS_SIMULATOR = iPhone 6s
IOS_VERSION = 10.3
IOS_VERSION = 11.0
ifeq ($(BUILD_SCHEME),SQLite iOS)
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
else
Expand Down
14 changes: 0 additions & 14 deletions SQLite.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,6 @@ Pod::Spec.new do |s|
ss.private_header_files = 'Sources/SQLiteObjc/*.h'

ss.library = 'sqlite3'
ss.preserve_paths = 'CocoaPods/**/*'
ss.pod_target_xcconfig = {
'SWIFT_INCLUDE_PATHS[sdk=macosx*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx',
'SWIFT_INCLUDE_PATHS[sdk=macosx10.11]' => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx-10.11',
'SWIFT_INCLUDE_PATHS[sdk=macosx10.12]' => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx-10.12',
'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos',
'SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos-10.0',
'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator',
'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator-10.0',
'SWIFT_INCLUDE_PATHS[sdk=appletvos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvos',
'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvsimulator',
'SWIFT_INCLUDE_PATHS[sdk=watchos*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchos',
'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]' => '$(SRCROOT)/SQLite.swift/CocoaPods/watchsimulator'
}
end

s.subspec 'standalone' do |ss|
Expand Down
Loading