Merge branch 'develop'

XYOracleNetwork · Jan 25, 2020 · 94aa521 · 94aa521
2 parents 02d9dd8 + 170738b
commit 94aa521
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 35 deletions.
diff --git a/SampleiOS/Podfile.lock b/SampleiOS/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
     - PromisesObjC (= 1.2.8)
   - XyBaseSdk (1.0.1):
     - PromisesSwift
-  - XyBleSdk (3.0.8):
+  - XyBleSdk (3.1.0):
     - XyBaseSdk
 
 DEPENDENCIES:
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
   PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
   PromisesSwift: 37bad6f4daddb02f7c9c531efe91e8b21c13ee2f
   XyBaseSdk: 679d4f8ddbfc70ec1ff8a4cbdccf5bf81a1894f2
-  XyBleSdk: 21b21d7b4751fa68c279404df2a643381a5ded4b
+  XyBleSdk: 191f0480bcf1ad290cb795397d2d135c6777577a
 
 PODFILE CHECKSUM: 104c0252a97e5cf91ea89ad2a040c51d3d8e8ef6
 

diff --git a/SampleiOS/SampleiOS.xcworkspace/contents.xcworkspacedata b/SampleiOS/SampleiOS.xcworkspace/contents.xcworkspacedata
diff --git a/Source/Extensions/Dispatch+extensions.swift b/Source/Extensions/Dispatch+extensions.swift
diff --git a/Source/Gatt/GattInquisitor.swift b/Source/Gatt/GattInquisitor.swift
@@ -7,6 +7,7 @@
 
 import CoreBluetooth
 import Promises
+import XyBaseSdk
 
 // Used to inquire for all the characteristics of all the services the device has
 final class GattInquisitor: NSObject {

diff --git a/XyBleSdk.podspec b/XyBleSdk.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name = 'XyBleSdk'
-  s.version = '3.1.0'
+  s.version = '3.1.2'
   s.license = { :type => 'LGPL3', :file => 'LICENSE' }
   s.summary = 'Swift BLE SDK for app developers who want better bluetooth performance'
   s.homepage = 'https://github.com/XYOracleNetwork/sdk-ble-swift'

diff --git a/XyBleSdk.xcodeproj/project.pbxproj b/XyBleSdk.xcodeproj/project.pbxproj
@@ -25,8 +25,6 @@
 		314B3F8721CDB176006E2EC3 /* XYGeocode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4821CDB176006E2EC3 /* XYGeocode.swift */; };
 		314B3F8821CDB176006E2EC3 /* Array+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4A21CDB176006E2EC3 /* Array+extensions.swift */; };
 		314B3F8921CDB176006E2EC3 /* Array+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4A21CDB176006E2EC3 /* Array+extensions.swift */; };
-		314B3F8A21CDB176006E2EC3 /* Dispatch+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4B21CDB176006E2EC3 /* Dispatch+extensions.swift */; };
-		314B3F8B21CDB176006E2EC3 /* Dispatch+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4B21CDB176006E2EC3 /* Dispatch+extensions.swift */; };
 		314B3F8C21CDB176006E2EC3 /* XY4BluetoothDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4D21CDB176006E2EC3 /* XY4BluetoothDevice.swift */; };
 		314B3F8D21CDB176006E2EC3 /* XY4BluetoothDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4D21CDB176006E2EC3 /* XY4BluetoothDevice.swift */; };
 		314B3F8E21CDB176006E2EC3 /* XYConnectionAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B3F4F21CDB176006E2EC3 /* XYConnectionAgent.swift */; };
@@ -147,7 +145,6 @@
 		314B3F4721CDB176006E2EC3 /* XYConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYConstants.swift; sourceTree = "<group>"; };
 		314B3F4821CDB176006E2EC3 /* XYGeocode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYGeocode.swift; sourceTree = "<group>"; };
 		314B3F4A21CDB176006E2EC3 /* Array+extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+extensions.swift"; sourceTree = "<group>"; };
-		314B3F4B21CDB176006E2EC3 /* Dispatch+extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dispatch+extensions.swift"; sourceTree = "<group>"; };
 		314B3F4D21CDB176006E2EC3 /* XY4BluetoothDevice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XY4BluetoothDevice.swift; sourceTree = "<group>"; };
 		314B3F4F21CDB176006E2EC3 /* XYConnectionAgent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYConnectionAgent.swift; sourceTree = "<group>"; };
 		314B3F5021CDB176006E2EC3 /* XYCentralAgent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYCentralAgent.swift; sourceTree = "<group>"; };
@@ -306,7 +303,6 @@
 			isa = PBXGroup;
 			children = (
 				314B3F4A21CDB176006E2EC3 /* Array+extensions.swift */,
-				314B3F4B21CDB176006E2EC3 /* Dispatch+extensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -639,7 +635,6 @@
 				314B3F9C21CDB176006E2EC3 /* XYBluetoothBase.swift in Sources */,
 				31BCE84B2254203B004799D7 /* XY4BluetoothDeviceCreator.swift in Sources */,
 				314B3F8021CDB176006E2EC3 /* XYFirmwareLoader.swift in Sources */,
-				314B3F8A21CDB176006E2EC3 /* Dispatch+extensions.swift in Sources */,
 				31BCE8392254203B004799D7 /* XYMobileBluetoothDeviceCreator.swift in Sources */,
 				31BCE8452254203B004799D7 /* XY2BluetoothDeviceCreator.swift in Sources */,
 				0ABBECC4236761F90054BCEE /* XYCBPeripheralManager .swift in Sources */,
@@ -704,7 +699,6 @@
 				314B3F9D21CDB176006E2EC3 /* XYBluetoothBase.swift in Sources */,
 				31BCE84C2254203B004799D7 /* XY4BluetoothDeviceCreator.swift in Sources */,
 				314B3F8121CDB176006E2EC3 /* XYFirmwareLoader.swift in Sources */,
-				314B3F8B21CDB176006E2EC3 /* Dispatch+extensions.swift in Sources */,
 				31BCE83A2254203B004799D7 /* XYMobileBluetoothDeviceCreator.swift in Sources */,
 				31BCE8462254203B004799D7 /* XY2BluetoothDeviceCreator.swift in Sources */,
 				0ABBECC5236761F90054BCEE /* XYCBPeripheralManager .swift in Sources */,