3.0 Release

Podfile

@@ -3,9 +3,9 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'sdk-xyobleinterface-swift' do
-    pod 'XyBleSdk', :path => '../sdk-ble-swift/'
-    pod 'sdk-objectmodel-swift', '~> 0.1.2-beta.3'
-    pod 'sdk-core-swift', '~> 0.1.4-beta.6'
+    pod 'XyBleSdk', '~> 3.0'
+    pod 'sdk-objectmodel-swift', '~> 3.0'
+    pod 'sdk-core-swift', '~> 3.0.1'
 end
 
 target 'sdk-xyobleinterface-swiftTests' do

Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
-  - PromisesObjC (1.2.6)
-  - PromisesSwift (1.2.6):
-    - PromisesObjC (= 1.2.6)
-  - sdk-core-swift (0.1.5-beta.2):
-    - sdk-objectmodel-swift (~> 0.1.2-beta.3)
+  - PromisesObjC (1.2.8)
+  - PromisesSwift (1.2.8):
+    - PromisesObjC (= 1.2.8)
+  - sdk-core-swift (3.0.1):
+    - sdk-objectmodel-swift (~> 3.0)
     - secp256k1.swift
-  - sdk-objectmodel-swift (0.1.2-beta.3)
+  - sdk-objectmodel-swift (3.0.0)
   - secp256k1.swift (0.1.4)
-  - XyBleSdk (0.0.1):
-    - PromisesSwift (~> 1.2.4)
+  - XyBleSdk (3.0.0):
+    - PromisesSwift
 
 DEPENDENCIES:
-  - sdk-core-swift (~> 0.1.4-beta.6)
-  - sdk-objectmodel-swift (~> 0.1.2-beta.3)
-  - XyBleSdk (from `../sdk-ble-swift/`)
+  - sdk-core-swift (~> 3.0.1)
+  - sdk-objectmodel-swift (~> 3.0)
+  - XyBleSdk (~> 3.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -22,19 +22,16 @@ SPEC REPOS:
     - sdk-core-swift
     - sdk-objectmodel-swift
     - secp256k1.swift
-
-EXTERNAL SOURCES:
-  XyBleSdk:
-    :path: "../sdk-ble-swift/"
+    - XyBleSdk
 
 SPEC CHECKSUMS:
-  PromisesObjC: 60326422b6d692b9718a80666e67a9433862aa88
-  PromisesSwift: b3219d5e6545d5d7e8ad8038b4ad139f7ee0b3f0
-  sdk-core-swift: 8d254021959a3edaff4441ff389c05dfee55c7b8
-  sdk-objectmodel-swift: 93b02d39d406c39e45ad15a2d5b488c9f8e16b58
+  PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
+  PromisesSwift: 37bad6f4daddb02f7c9c531efe91e8b21c13ee2f
+  sdk-core-swift: 6b089045fe8483388bd3c82d2d1375d796c29745
+  sdk-objectmodel-swift: 4f80ae7001734127c850d47ec453727a6c26867a
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
-  XyBleSdk: 412c59d8b05e92a4c2341bcf11909861a12ddbba
+  XyBleSdk: a9c26c8474ea4118cd111158af570ccafa546713
 
-PODFILE CHECKSUM: e6fd2fb75d0edfb5aacdae3cfea75d03f46324ee
+PODFILE CHECKSUM: 41004df8e053491fa8e18cb0511877a30fa8f318
 
-COCOAPODS: 1.7.0.beta.2
+COCOAPODS: 1.7.5

scripts/deploy.sh

@@ -0,0 +1,3 @@
+pod trunk register arie.trouw@xyo.network 'Deploy' --description='Deploy Script'
+pod lib lint
+pod --allow-warnings trunk push sdk-xyobleinterface-swift.podspec

sdk-xyobleinterface-swift.podspec

@@ -8,9 +8,9 @@
 
 Pod::Spec.new do |s|
   s.name             = 'sdk-xyobleinterface-swift'
-  s.version          = '0.1.4-beta.1'
+  s.version          = '3.0.0'
   s.summary          = 'A short description of sdk-xyobleinterface-swift'
-
+  s.swift_version    = 5.0
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
 #   * Try to keep it short, snappy and to the point.
@@ -23,7 +23,7 @@ TODO: Add long description of the pod here.
 
   s.homepage         = 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swift'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
-  s.license          = { :type => 'MIT', :file => 'LICENSE.txt' }
+  s.license          = { :type => 'LGPL3', :file => 'LICENSE' }
   s.author           = { 'Carter Harrison' => 'carterjharrison@gmail.com' }
   s.source           = { :git => 'https://github.com/XYOracleNetwork/sdk-xyobleinterface-swiftt', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
@@ -40,12 +40,12 @@ TODO: Add long description of the pod here.
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'PromisesSwift', '~> 1.2.4'
 
-  s.dependency 'sdk-objectmodel-swift',  '~> 0.1.2-beta.3'
-  s.dependency 'sdk-core-swift', '~> 0.1.5-beta.2'
-  s.dependency 'XyBleSdk'
+  s.dependency 'sdk-objectmodel-swift',  '~> 3.0'
+  s.dependency 'sdk-core-swift', '~> 3.0.1'
+  s.dependency 'XyBleSdk', '~> 3.0'
 
   s.subspec 'XyBleSdk' do |ss|
-      ss.source_files         = '../../sdk-ble-swift/Source/**/*.{swift}'
+      ss.source_files         = '../sdk-ble-swift/Source/**/*.{swift}'
   end
 
 

sdk-xyobleinterface-swift.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -25,7 +25,6 @@
 		8C924DCC2210CA1A007FF765 /* XyoOutputStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C924DCB2210CA1A007FF765 /* XyoOutputStream.swift */; };
 		8C924DCF2210CA66007FF765 /* XyoInputStreamTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C924DCE2210CA66007FF765 /* XyoInputStreamTest.swift */; };
 		8CF668932254795500BB1D41 /* XyoAdvertisementEncoderTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF668922254795500BB1D41 /* XyoAdvertisementEncoderTest.swift */; };
-		8CF6689422547D0700BB1D41 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8C924DB82210C956007FF765 /* Info.plist */; };
 		C50D8CE602246146FD8DF672 /* Pods_sdk_xyobleinterface_swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 377E99944DA253870605DEAB /* Pods_sdk_xyobleinterface_swift.framework */; };
 /* End PBXBuildFile section */
 
@@ -251,16 +250,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1030;
 				ORGANIZATIONNAME = "XYO Network";
 				TargetAttributes = {
 					8C924DA72210C956007FF765 = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1030;
 					};
 					8C924DB02210C956007FF765 = {
 						CreatedOnToolsVersion = 10.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1030;
 					};
 				};
 			};
@@ -294,7 +293,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8CF6689422547D0700BB1D41 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -550,7 +548,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -577,7 +575,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "network.xyo.mod-ble-swift";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -601,7 +599,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -624,7 +622,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "network.xyo.mod-ble-swiftTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

sdk-xyobleinterface-swift.xcodeproj/xcshareddata/xcschemes/sdk-xyobleinterface-swift.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1030"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

sdk-xyobleinterface-swift/XyoBluetoothDevice.swift

@@ -18,6 +18,10 @@ import sdk_objectmodel_swift
 /// one chould not use an instance of this class as a pipe, but tryCreatePipe() to get an instance of
 /// a pipe.
 open class XyoBluetoothDevice: XYBluetoothDeviceBase, XYBluetoothDeviceNotifyDelegate, XyoNetworkPipe {
+  public func getNetworkHeuristics() -> [XyoObjectStructure] {
+    return []
+  }
+
     /// The defining family for a XyoBluetoothDevice, this helps the process of creatig a device, and making
     /// sure that it complies to the XYO pipe spec.
     public static let family = XYDeviceFamily.init(uuid: UUID(uuidString: XyoBluetoothDevice.uuid)!,

sdk-xyobleinterface-swift/XyoGattServerNetworkPipe.swift

@@ -13,6 +13,10 @@ import Promises
 
 /// A class to conform to the XyoNetworkPipe protocal, acting as a gatt server.
 class XyoGattServerNetworkPipe : XyoNetworkPipe {
+  func getNetworkHeuristics() -> [XyoObjectStructure] {
+    return []
+  }
+
     private var readPromise = Promise<[UInt8]?>.pending()
     private let inputStream = XyoInputStream()
 

sdk-xyobleinterface-swift/devices/XyoSentinelXDevice.swift

@@ -59,8 +59,6 @@ public class XyoSentinelXDevice : XyoBluetoothDevice {
     }
 
     override public func attachPeripheral(_ peripheral: XYPeripheral) -> Bool {
-        let name = peripheral.advertisementData?[CBAdvertisementDataLocalNameKey] as? String
-
         guard let major = self.iBeacon?.major else {
             return false
         }