refactor: fix all deprecations and warnings, build with latest SDK

hansemannn · Jun 2, 2020 · 81bf17d · 81bf17d
1 parent b0e1954
commit 81bf17d
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 56 deletions.
diff --git a/ios/Classes/TiBluetoothCentralManagerProxy.m b/ios/Classes/TiBluetoothCentralManagerProxy.m
@@ -9,6 +9,7 @@
 #import "TiBluetoothPeripheralProvider.h"
 #import "TiBluetoothUtils.h"
 #import "TiUtils.h"
+#import "TiBlob.h"
 
 #import "TiBluetoothCharacteristicProxy.h"
 #import "TiBluetoothPeripheralProxy.h"
@@ -181,7 +182,7 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
            @"advertisementData" : [self dictionaryFromAdvertisementData:advertisementData],
-           @"rssi" : NUMINT(RSSI)
+           @"rssi" : RSSI
          }];
   }
 }
@@ -191,7 +192,7 @@ - (void)centralManager:(CBCentralManager *)central willRestoreState:(NSDictionar
   if ([self _hasListeners:@"willRestoreState"]) {
     [self fireEvent:@"willRestoreState"
          withObject:@{
-           @"state" : NUMINT(central.state)
+           @"state" : @(central.state)
          }];
   }
 }
@@ -212,7 +213,7 @@ - (void)centralManagerDidUpdateState:(CBCentralManager *)central
   if ([self _hasListeners:@"didUpdateState"]) {
     [self fireEvent:@"didUpdateState"
          withObject:@{
-           @"state" : NUMINT(central.state)
+           @"state" : @(central.state)
          }];
   }
 }
@@ -255,7 +256,7 @@ - (NSDictionary *)dictionaryFromAdvertisementData:(NSDictionary *)advertisementD
   // Write own handler
   for (id key in advertisementData) {
     if ([[advertisementData objectForKey:key] isKindOfClass:[NSData class]]) {
-      [dict setObject:[[TiBlob alloc] _initWithPageContext:[self pageContext] andData:[advertisementData objectForKey:key] mimetype:@"text/plain"] forKey:key];
+      [dict setObject:[[TiBlob alloc] initWithData:[advertisementData objectForKey:key] mimetype:@"text/plain"] forKey:key];
     } else if ([[advertisementData objectForKey:key] isKindOfClass:[NSNumber class]]) {
       [dict setObject:NUMBOOL([advertisementData objectForKey:key]) forKey:key];
     } else if ([[advertisementData objectForKey:key] isKindOfClass:[NSString class]]) {

diff --git a/ios/Classes/TiBluetoothCharacteristicProxy.m b/ios/Classes/TiBluetoothCharacteristicProxy.m
@@ -68,7 +68,7 @@ - (NSArray *)descriptors
 
 - (TiBlob *)value
 {
-  return [[TiBlob alloc] _initWithPageContext:[self pageContext] andData:characteristic.value mimetype:@"text/plain"];
+  return [[TiBlob alloc] initWithData:characteristic.value mimetype:@"text/plain"];
 }
 
 - (NSString *)uuid

diff --git a/ios/Classes/TiBluetoothL2CAPChannelProxy.h b/ios/Classes/TiBluetoothL2CAPChannelProxy.h
@@ -5,8 +5,6 @@
  * Please see the LICENSE included with this distribution for details.
  */
 
-#if IS_XCODE_9
-
 #import "TiProxy.h"
 #import <CoreBluetooth/CoreBluetooth.h>
 
@@ -21,5 +19,3 @@
 - (NSNumber *)PSM;
 
 @end
-
-#endif
diff --git a/ios/Classes/TiBluetoothL2CAPChannelProxy.m b/ios/Classes/TiBluetoothL2CAPChannelProxy.m
@@ -5,8 +5,6 @@
  * Please see the LICENSE included with this distribution for details.
  */
 
-#if IS_XCODE_9
-
 #import "TiBluetoothL2CAPChannelProxy.h"
 
 @implementation TiBluetoothL2CAPChannelProxy
@@ -36,5 +34,3 @@ - (NSNumber *)PSM
 // and then process the data-stream to be wrapped into a Ti.Blob
 
 @end
-
-#endif
diff --git a/ios/Classes/TiBluetoothPeripheralManagerProxy.m b/ios/Classes/TiBluetoothPeripheralManagerProxy.m
@@ -15,9 +15,8 @@
 #import "TiBluetoothServiceProxy.h"
 #import "TiBluetoothUtils.h"
 #import "TiUtils.h"
-#if IS_XCODE_9
+#import "TiBlob.h"
 #import "TiBluetoothL2CAPChannelProxy.h"
-#endif
 
 @implementation TiBluetoothPeripheralManagerProxy
 
@@ -169,7 +168,6 @@ - (NSNumber *)updateValueForCharacteristicOnSubscribedCentrals:(id)args
 
 #pragma mark Delegates
 
-#if IS_XCODE_9
 - (void)peripheralManager:(CBPeripheralManager *)peripheral didPublishL2CAPChannel:(CBL2CAPPSM)PSM error:(NSError *)error
 {
   if ([self _hasListeners:@"didPublishL2CAPChannel"]) {
@@ -199,14 +197,13 @@ - (void)peripheralManager:(CBPeripheralManager *)peripheral didOpenL2CAPChannel:
          }];
   }
 }
-#endif
 
 - (void)peripheralManagerDidUpdateState:(CBPeripheralManager *)peripheral
 {
   if ([self _hasListeners:@"didUpdateState"]) {
     [self fireEvent:@"didUpdateState"
          withObject:@{
-           @"state" : NUMINT(peripheral.state)
+           @"state" : @(peripheral.state)
          }];
   }
 }
@@ -216,7 +213,7 @@ - (void)peripheralManager:(CBPeripheralManager *)peripheral willRestoreState:(NS
   if ([self _hasListeners:@"willRestoreState"]) {
     [self fireEvent:@"willRestoreState"
          withObject:@{
-           @"state" : NUMINT(peripheral.state)
+           @"state" : @(peripheral.state)
          }];
   }
 }

diff --git a/ios/Classes/TiBluetoothPeripheralProxy.m b/ios/Classes/TiBluetoothPeripheralProxy.m
@@ -13,9 +13,8 @@
 #import "TiBluetoothServiceProxy.h"
 #import "TiBluetoothUtils.h"
 #import "TiUtils.h"
-#if IS_XCODE_9
+#import "TiBlob.h"
 #import "TiBluetoothL2CAPChannelProxy.h"
-#endif
 
 @implementation TiBluetoothPeripheralProxy
 
@@ -43,12 +42,13 @@ - (NSString *)name
 
 - (NSNumber *)rssi
 {
-  return NUMINT(_peripheral.RSSI);
+  DEPRECATED_REMOVED(@"Bluetooth.Peripheral.rssi (use \"didReadRSSI\" event instead)", @"2.0.0", @"2.0.0");
+  return @(-1);
 }
 
 - (NSNumber *)state
 {
-  return NUMINT(_peripheral.state);
+  return @(_peripheral.state);
 }
 
 - (NSArray *)services
@@ -144,7 +144,6 @@ - (void)writeValueForCharacteristicWithType:(id)args
                      type:[TiUtils intValue:type]];
 }
 
-#if IS_XCODE_9
 - (NSNumber *)canSendWriteWithoutResponse
 {
   return NUMBOOL([_peripheral canSendWriteWithoutResponse]);
@@ -153,9 +152,8 @@ - (NSNumber *)canSendWriteWithoutResponse
 - (void)openL2CAPChannel:(id)args
 {
   ENSURE_SINGLE_ARG(args, NSDictionary);
-  [_peripheral openL2CAPChannel:nil];
+  [_peripheral openL2CAPChannel:0];
 }
-#endif
 
 - (void)setNotifyValueForCharacteristic:(id)args
 {
@@ -201,7 +199,6 @@ - (void)writeValueForDescriptor:(id)args
 
 #pragma mark Peripheral Delegates
 
-#if IS_XCODE_9
 - (void)peripheralIsReadyToSendWriteWithoutResponse:(CBPeripheral *)peripheral
 {
   if ([self _hasListeners:@"isReadyToSendWriteWithoutResponse"]) {
@@ -222,7 +219,6 @@ - (void)peripheral:(CBPeripheral *)peripheral didOpenL2CAPChannel:(CBL2CAPChanne
          }];
   }
 }
-#endif
 
 - (void)peripheral:(CBPeripheral *)peripheral didDiscoverServices:(NSError *)error
 {
@@ -235,6 +231,17 @@ - (void)peripheral:(CBPeripheral *)peripheral didDiscoverServices:(NSError *)err
   }
 }
 
+- (void)peripheral:(CBPeripheral *)peripheral didReadRSSI:(NSNumber *)RSSI error:(NSError *)error
+{
+  if ([self _hasListeners:@"didReadRSSI"]) {
+    [self fireEvent:@"didReadRSSI"
+         withObject:@{
+           @"rssi" : RSSI,
+           @"error" : NULL_IF_NIL([error localizedDescription])
+         }];
+  }
+}
+
 - (void)peripheral:(CBPeripheral *)peripheral didUpdateNotificationStateForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error
 {
   if ([self _hasListeners:@"didUpdateNotificationStateForCharacteristic"]) {

diff --git a/ios/Classes/TiBluetoothRequestProxy.m b/ios/Classes/TiBluetoothRequestProxy.m
@@ -46,7 +46,7 @@ - (NSNumber *)offset
 
 - (TiBlob *)value
 {
-  return [[TiBlob alloc] _initWithPageContext:[self pageContext] andData:request.value mimetype:@"text/plain"];
+  return [[TiBlob alloc] initWithData:request.value mimetype:@"text/plain"];
 }
 
 - (TiBluetoothCharacteristicProxy *)characteristicProxyFromCharacteristic:(CBCharacteristic *)characteristic

diff --git a/ios/TiBluetooth_Prefix.pch b/ios/TiBluetooth_Prefix.pch
@@ -3,9 +3,3 @@
     #import <Foundation/Foundation.h>
     #import <UIKit/UIKit.h>
 #endif
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
-#define IS_XCODE_9 true
-#else
-#define IS_XCODE_9 false
-#endif
diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.3.0
+version: 2.0.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: ti.bluetooth
@@ -15,4 +15,4 @@ name: ti.bluetooth
 moduleid: ti.bluetooth
 guid: 3c1bc730-d661-401e-8184-84695ad92360
 platform: iphone
-minsdk: 6.0.0
+minsdk: 8.0.0