Merge branch 'BluetoothMigration'

PureSwift · Apr 2, 2016 · b0af67e · b0af67e
2 parents d7c31b5 + 2df89d5
commit b0af67e
Show file tree

Hide file tree

Showing 38 changed files with 90 additions and 3,483 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "PureSwift/SwiftFoundation" "develop"
+github "PureSwift/Bluetooth" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,3 @@
 github "PureSwift/JSON-C" "e8e38025563d43e425536200002ad13c3f35a98b"
-github "PureSwift/SwiftFoundation" "3d91b1d934779145fb72483d7f2530d9a7232d84"
+github "PureSwift/SwiftFoundation" "5d636525d44dc06a906fe103ecbb7a5145a4c420"
+github "PureSwift/Bluetooth" "23c9bc540cad1f336330d44f962ad552b7e67aa4"
diff --git a/Package.swift b/Package.swift
@@ -3,8 +3,8 @@ import PackageDescription
 let package = Package(
     name: "BluetoothLinux",
     dependencies: [
-        .Package(url: "https://github.com/PureSwift/CSwiftBluetoothLinux", majorVersion: 1),
-        .Package(url: "https://github.com/PureSwift/SwiftFoundation.git", majorVersion: 1),
+        .Package(url: "https://github.com/PureSwift/Bluetooth.git", majorVersion: 1),
+        .Package(url: "https://github.com/PureSwift/CSwiftBluetoothLinux", majorVersion: 1)
     ],
     targets: [
         Target(

diff --git a/Sources/BluetoothLinux/ATT.swift b/Sources/BluetoothLinux/ATT.swift
diff --git a/Sources/BluetoothLinux/ATTConnection.swift b/Sources/BluetoothLinux/ATTConnection.swift
@@ -12,7 +12,8 @@
     import Darwin.C
 #endif
 
-import SwiftFoundation
+import struct SwiftFoundation.Data
+import Bluetooth
 
 /// Manages a Bluetooth connection using the ATT protocol.
 public final class ATTConnection {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "PureSwift/SwiftFoundation" "develop"
		github "PureSwift/Bluetooth" "master"