Skip to content

Commit 8f9b8a8

Browse files
mariotakujberkel
authored andcommitted
migrating to swift 3
1 parent 494f3c4 commit 8f9b8a8

27 files changed

+811
-803
lines changed

SQLite.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@
971971
SKIP_INSTALL = YES;
972972
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
973973
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
974-
SWIFT_VERSION = 2.3;
974+
SWIFT_VERSION = 3.0;
975975
TVOS_DEPLOYMENT_TARGET = 9.1;
976976
};
977977
name = Debug;
@@ -994,7 +994,7 @@
994994
SKIP_INSTALL = YES;
995995
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
996996
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
997-
SWIFT_VERSION = 2.3;
997+
SWIFT_VERSION = 3.0;
998998
TVOS_DEPLOYMENT_TARGET = 9.1;
999999
};
10001000
name = Release;
@@ -1187,7 +1187,7 @@
11871187
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
11881188
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
11891189
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1190-
SWIFT_VERSION = 2.3;
1190+
SWIFT_VERSION = 3.0;
11911191
};
11921192
name = Debug;
11931193
};
@@ -1212,7 +1212,7 @@
12121212
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
12131213
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
12141214
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
1215-
SWIFT_VERSION = 2.3;
1215+
SWIFT_VERSION = 3.0;
12161216
};
12171217
name = Release;
12181218
};
@@ -1223,7 +1223,7 @@
12231223
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12241224
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12251225
PRODUCT_NAME = "$(TARGET_NAME)";
1226-
SWIFT_VERSION = 2.3;
1226+
SWIFT_VERSION = 3.0;
12271227
};
12281228
name = Debug;
12291229
};
@@ -1234,7 +1234,7 @@
12341234
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12351235
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12361236
PRODUCT_NAME = "$(TARGET_NAME)";
1237-
SWIFT_VERSION = 2.3;
1237+
SWIFT_VERSION = 3.0;
12381238
};
12391239
name = Release;
12401240
};
@@ -1261,7 +1261,7 @@
12611261
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
12621262
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
12631263
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1264-
SWIFT_VERSION = 2.3;
1264+
SWIFT_VERSION = 3.0;
12651265
};
12661266
name = Debug;
12671267
};
@@ -1288,7 +1288,7 @@
12881288
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
12891289
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
12901290
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1291-
SWIFT_VERSION = 2.3;
1291+
SWIFT_VERSION = 3.0;
12921292
};
12931293
name = Release;
12941294
};
@@ -1303,7 +1303,7 @@
13031303
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13041304
PRODUCT_NAME = "$(TARGET_NAME)";
13051305
SDKROOT = macosx;
1306-
SWIFT_VERSION = 2.3;
1306+
SWIFT_VERSION = 3.0;
13071307
};
13081308
name = Debug;
13091309
};
@@ -1318,7 +1318,7 @@
13181318
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13191319
PRODUCT_NAME = "$(TARGET_NAME)";
13201320
SDKROOT = macosx;
1321-
SWIFT_VERSION = 2.3;
1321+
SWIFT_VERSION = 3.0;
13221322
};
13231323
name = Release;
13241324
};

SQLite/Core/Blob.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ public struct Blob {
3030
self.bytes = bytes
3131
}
3232

33-
public init(bytes: UnsafePointer<Void>, length: Int) {
34-
self.init(bytes: [UInt8](UnsafeBufferPointer(
35-
start: UnsafePointer(bytes), count: length
36-
)))
33+
public init(bytes: UnsafeRawPointer, length: Int) {
34+
// TODO correct count
35+
let i8bufptr = UnsafeBufferPointer(start: bytes.assumingMemoryBound(to: UInt8.self), count: length)
36+
self.init(bytes: [UInt8](i8bufptr))
3737
}
3838

3939
public func toHex() -> String {
4040
return bytes.map {
4141
($0 < 16 ? "0" : "") + String($0, radix: 16, uppercase: false)
42-
}.joinWithSeparator("")
42+
}.joined(separator: "")
4343
}
4444

4545
}

0 commit comments

Comments
 (0)