leeo-react-native-sdk 0.1.0 → 0.1.1

package/{LeeoSdk.podspec → LeeoSdkBridge.podspec}

@@ -2,23 +2,21 @@ require 'json'
 pkg = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name         = "LeeoSdk"
+  s.name         = "LeeoSdkBridge"
   s.version      = pkg["version"]
   s.summary      = pkg["description"]
-  s.homepage     = pkg["repository"]["url"] rescue ""
+  s.homepage     = "https://github.com/leeoinsurance/leeo-react-native-sdk"
   s.license      = pkg["license"] rescue "UNLICENSED"
   s.author       = pkg["author"] rescue ""
   s.source       = { :git => "", :tag => "#{s.version}" }
   s.platforms    = { :ios => "13.0" }
   s.source_files = "ios/*.{m,mm,swift,h}"
   s.pod_target_xcconfig = {
-    "DEFINES_MODULE" => "YES",
-    "SWIFT_OBJC_BRIDGING_HEADER" => "$(PODS_TARGET_SRCROOT)/ios/LeeoSdk-Bridging-Header.h"
+    "DEFINES_MODULE" => "YES"
   }
   s.requires_arc = true
   s.dependency "React-Core"
-  # Leeo iOS SDK (same code as SPM). Install with: npm install leeo-ios-sdk (or add to your app).
-  leeo_ios_path = File.directory?(File.join(__dir__, "node_modules/leeo-ios-sdk")) ? "node_modules/leeo-ios-sdk" : "../leeo-ios-sdk"
-  s.dependency "LeeoSDK", :path => leeo_ios_path
+  # Leeo iOS SDK. App must add in Podfile: pod 'LeeoSDK', :path => '../node_modules/leeo-ios-sdk'
+  s.dependency "LeeoSDK"
   s.swift_version = "5.0"
 end

package/ios/LeeoSdk-Bridging-Header.h

@@ -1 +1 @@
-#import <React/RCTBridgeModule.h>
+#import "LeeoSdkTypes.h"

package/ios/LeeoSdk.swift

@@ -63,8 +63,8 @@ class LeeoSdk: NSObject {
   @objc func setup(
     _ config: NSDictionary,
     tripNotification: NSDictionary,
-    resolver resolve: @escaping RCTPromiseResolveBlock,
-    rejecter _: RCTPromiseRejectBlock
+    resolver resolve: @escaping (Any?) -> Void,
+    rejecter _: @escaping (String, String, NSError?) -> Void
   ) {
     guard let (configuration, notification) = Self.config(from: config, tripNotificationDict: tripNotification) else {
       resolve(Self.error("INVALID_DRIVER_ID", "baseUrl, driverAttributes (firstName, lastName) required"))
@@ -81,11 +81,11 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func teardown(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func teardown(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.teardown { DispatchQueue.main.async { resolve(Self.success()) } }
   }
 
-  @objc func startTrip(_ trackingId: String?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func startTrip(_ trackingId: String?, resolver resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.startTrip(trackingId: trackingId ?? "") { success, error in
       DispatchQueue.main.async {
         if success { resolve(Self.success()) }
@@ -97,7 +97,7 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func stopTrip(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func stopTrip(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.stopTrip { success, error in
       DispatchQueue.main.async {
         if success { resolve(Self.success()) }
@@ -109,7 +109,7 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func startShift(_ shiftId: String?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func startShift(_ shiftId: String?, resolver resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.startShift(shiftId: shiftId) { success, error in
       DispatchQueue.main.async {
         if success { resolve(Self.success()) }
@@ -121,7 +121,7 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func stopShift(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func stopShift(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.stopShift { success, error in
       DispatchQueue.main.async {
         if success { resolve(Self.success()) }
@@ -133,15 +133,15 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func wipeOut(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func wipeOut(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.wipeOut { _ in DispatchQueue.main.async { resolve(Self.success()) } }
   }
 
-  @objc func getBuildVersion(_ resolve: RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func getBuildVersion(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     resolve(Leeo.buildVersion)
   }
 
-  @objc func openIncidentReportingWebPage(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func openIncidentReportingWebPage(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.openIncidentReportingWebPage { error in
       DispatchQueue.main.async {
         if error == nil { resolve(Self.success()) }
@@ -153,7 +153,7 @@ class LeeoSdk: NSObject {
     }
   }
 
-  @objc func getIncidentReportingURL(_ resolve: @escaping RCTPromiseResolveBlock, rejecter _: RCTPromiseRejectBlock) {
+  @objc func getIncidentReportingURL(_ resolve: @escaping (Any?) -> Void, rejecter _: @escaping (String, String, NSError?) -> Void) {
     Leeo.getIncidentReportingURL { url, error in
       DispatchQueue.main.async {
         if let url = url { resolve(url) }

package/ios/LeeoSdkTypes.h

@@ -0,0 +1,5 @@
+// Compatible with RCTPromiseResolveBlock/RCTPromiseRejectBlock so we avoid
+// importing React in the bridging header (fixes "bridging headers with framework targets").
+#import <Foundation/Foundation.h>
+typedef void (^LeeoResolveBlock)(id _Nullable result);
+typedef void (^LeeoRejectBlock)(NSString * _Nonnull code, NSString * _Nonnull message, NSError * _Nullable error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leeo-react-native-sdk",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Leeo SDK for React Native – trip tracking and incident reporting",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -29,7 +29,7 @@
     "src",
     "ios",
     "android",
-    "LeeoSdk.podspec",
+    "LeeoSdkBridge.podspec",
     "lib"
   ]
 }