@iotize/device-com-nfc.cordova 3.10.0 → 4.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iotize/device-com-nfc.cordova",
   "main": "bundles/iotize-device-com-nfc.cordova.umd.js",
-  "version": "3.10.0",
+  "version": "4.0.0",
   "description": "Near Field Communication (NFC) Plugin. Read and write NDEF messages to NFC tags and share NDEF messages with peers.",
   "cordova": {
     "id": "@iotize/device-com-nfc.cordova",

package/plugin.xml

@@ -12,6 +12,8 @@
     <issue>https://github.com/iotize-sas/device-com-nfc.cordova/issues</issue>
 
     <platform name="android">
+        <dependency id="@iotize/device-com-android-shared.cordova" version="0.0.3"/>
+
         <js-module src="www/phonegap-nfc.js" name="NFC">
             <runs />
         </js-module>
@@ -39,6 +41,8 @@
         <source-file src="src/android/src/com/chariotsolutions/nfc/plugin/NFC4Protocol.java" target-dir="src/com/chariotsolutions/nfc/plugin"/>
         <source-file src="src/android/src/com/chariotsolutions/nfc/plugin/NFC5Protocol.java" target-dir="src/com/chariotsolutions/nfc/plugin"/>
 
+        <source-file src="src/android/libs/iotize-device-com-nfc-1.0.0-alpha.9.aar" target-dir="libs"/>
+
         <config-file target="AndroidManifest.xml" parent="/manifest">
             <uses-permission android:name="android.permission.NFC"/>
             <uses-feature android:name="android.hardware.nfc" android:required="false"/>

package/src/android/build.gradle

@@ -3,14 +3,6 @@ repositories{
     flatDir {
         dirs 'libs'
     }
-    maven {
-        // Add iotize repository url
-        url "http://repo.iotize.com/artifactory/gradle-release"
-        allowInsecureProtocol = true
-        content {
-            includeGroupByRegex "com\\.iotize\\.android"
-        }
-    }
 }
 
 dependencies {
@@ -18,20 +10,11 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.61"
     implementation 'org.apache.commons:commons-collections4:4.4'
 
-    // Add core library
-    implementation 'com.iotize.android:iotize-core:1.0.0-alpha.9'
-
-    // api
-    implementation 'com.iotize.android:iotize-device-api:1.0.0-alpha.9'
-    implementation 'com.iotize.android:iotize-client:1.0.0-alpha.9'
-    implementation 'com.iotize.android:iotize-device:1.0.0-alpha.9'
-
-    // NFC
-    implementation 'com.iotize.android:iotize-device-com-nfc:1.0.0-alpha.9'
-
     // RX
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
+    implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
+
 }
 
 android {

package/src/ios/NFCHelpers.swift

@@ -1,18 +1,21 @@
 import CoreNFC
 
 public extension String {
-    
-     func dataFromHexString() -> Data {
+    func dataFromHexString() -> Data {
         var bytes = [UInt8]()
-        for i in 0..<(count/2) {
-            let range = index(self.startIndex, offsetBy: 2*i)..<index(self.startIndex, offsetBy: 2*i+2)
-            let stringBytes = self[range]
-            let byte = strtol((stringBytes as NSString).utf8String, nil, 16)
-            bytes.append(UInt8(byte))
+        bytes.reserveCapacity(count / 2)
+        
+        var index = startIndex
+        while index < endIndex {
+            let next = self.index(index, offsetBy: 2)
+            let byteString = String(self[index..<next])
+            let byte = UInt8(byteString, radix: 16)!
+            bytes.append(byte)
+            index = next
         }
-        return Data(bytes: UnsafePointer<UInt8>(bytes), count:bytes.count)
+
+        return Data(bytes)
     }
-    
 }
 
 public extension Data {

package/src/ios/NFCPlugin-Bridging-Header.h

@@ -4,4 +4,4 @@
 //
 //  (c) 2018 IoTize Solutions
 
-#import "../../../AppDelegate.h"
+#import "../../../Classes/AppDelegate.h"