@ionic/portals-react-native 0.0.1 → 0.0.4

package/README.md

@@ -8,8 +8,8 @@
 <br />
 <p align="center">
   <a href="https://github.com/ionic-team/react-native-ionic-portals/actions?query=workflow%3ACI"><img src="https://img.shields.io/github/workflow/status/ionic-team/ionic-portals/CI?style=flat-square" /></a>
-  <a href="https://www.npmjs.com/package/@ionic/react-native-portals"><img src="https://img.shields.io/npm/l/@ionic/react-native-portals?style=flat-square" /></a>
-  <a href="https://www.npmjs.com/package/@ionic/react-native-portals"><img src="https://img.shields.io/npm/v/@ionic/react-native-portals?style=flat-square" /></a>
+  <a href="https://www.npmjs.com/package/@ionic/portals-react-native"><img src="https://img.shields.io/npm/l/@ionic/portals-react-native?style=flat-square" /></a>
+  <a href="https://www.npmjs.com/package/@ionic/portals-react-native"><img src="https://img.shields.io/npm/v/@ionic/portals-react-native?style=flat-square" /></a>
 </p>
 <p align="center">
   <a href="https://ionic.io/docs/portals"><img src="https://img.shields.io/static/v1?label=docs&message=ionic.io/portals&color=blue&style=flat-square" /></a>
@@ -18,7 +18,7 @@
 
 ---
 
-Ionic Portals is a supercharged native Web View component for iOS and Android that lets you add web-based experiences to native mobile apps. It enables native and web teams to better collaborate and bring new and existing web experiences to mobile in a safe, controlled way.
+Ionic Portals is a supercharged native Web View component for iOS and Android that lets you add web-based experiences to React Native mobile apps. It enables React Native and web teams to better collaborate and bring new and existing web experiences to mobile in a safe, controlled way.
 
 ## Getting Started
 
@@ -132,44 +132,24 @@ unsubscribe('channel:topic', subscriptionReference)
 To see an example of Portals Pub/Sub in action that manages the lifecycle of a subscription with the lifecycle of a React Native component, refer to the [`PubSubLabel`](https://github.com/ionic-team/react-native-ionic-portals/blob/af19df0d66059d85ab8dde493504368c3bf39127/example/App.tsx#L53) implementation in the example project.
 
 ### Using Capacitor Plugins
-If you need to use any Capacitor plugins, you will have to register them in your Android project. This will also require creating and registering your Portals in native code as well:
-
-**Android**
-```java
-public class MainApplication extends Application implements ReactApplication {
-  @Override    
-  public void onCreate() {
-    super.onCreate();
-
-    PortalManager.register("YOUR_PORTAL_KEY_HERE");
-    PortalManager.newPortal("hello")
-      .addPlugin(MyCapacitorPlugin.class) // Plugin registration
-      .setInitialContext(Map.of("greeting", "Hello, world!"))
-      .setStartDir("portals/hello")
-      .create();
+If you need to use any Capacitor plugins, the classpath of the Android plugins will have to be provided to the `Portal` `androidPlugins` property. 
+
+```javascript
+const helloPortal = {
+  name: 'hello',
+  startDir: 'portals/hello', 
+  androidPlugins: ['com.capacitorjs.plugins.camera.CameraPlugin'],
+  initialContext: {
+    greeting: 'Hello, world!'
   }
-}
+};
 ```
 
-**iOS**
-```objective-c
-@implementation RNAppDelegate
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDicationary *)launchOptions {
-    // React Native boilerplate
-    [PortalManager register:@"YOUR_PORTAL_KEY_HERE"];
-    PortalBuilder *builder = [[PortalBuilder alloc] init:@"hello"];
-    [builder setStartDir:@"portals/hello"];
-    [builder setInitialContext: @{ @"greeting": @"Hello, world!" }] 
-    Portal *portal = [builder create];
-    [PortalManager addPortal:portal];
-}
-@end
-```
+No configuration for iOS is needed since plugins are automatically registered when the Capacitor bridge initializes on iOS.
 
 ### Bundling Your Web Apps
 Currently there is no tooling for bundling your web apps directly as part of @ionic/portals-react-native. Please follow the [native guides](https://ionic.io/docs/portals/how-to/pull-in-web-bundle#setup-the-web-asset-directory) to manage this as part of the native build process.
 
-
 ## Registration
 
 Ionic Portals for React Native requires a key to use. Once you have integrated Portals into your project, login to your ionic account to get a key. See our doc on [how to register for free and get your Portals license key](https://ionic.io/docs/portals/how-to/get-a-product-key) and refer to the [usage](#Usage) section on how to add your key to your React Native application.

package/ReactNativePortals.podspec

@@ -10,11 +10,11 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "14.0" }
+  s.platforms    = { :ios => "13.0" }
   s.source       = { :git => "https://github.com/ionic-team/react-native-ionic-portals.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "IonicPortals", "~> 0.5.1"
+  s.dependency "IonicPortals", "~> 0.6.1"
 end

package/android/build.gradle

@@ -38,9 +38,14 @@ android {
     lintOptions {
         disable 'GradleCompatible'
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    kotlinOptions {
+        freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
     }
 }
 
@@ -116,7 +121,12 @@ repositories {
 }
 
 dependencies {
-    // noinspection GradleDynamicVersion
+    //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation "io.ionic:portals:0.5.0"
+    //noinspection GradleDynamicVersion
+    api "io.ionic:portals:0.6.+"
+    //noinspection GradleDynamicVersion
+    api "io.ionic:liveupdates:0.0.+"
+
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0"
 }

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativeLiveUpdatesModule.kt

@@ -0,0 +1,187 @@
+package io.ionic.portals.reactnative
+
+import com.facebook.react.bridge.*
+import io.ionic.liveupdates.LiveUpdate
+import io.ionic.liveupdates.LiveUpdateManager
+import io.ionic.liveupdates.network.FailStep
+import io.ionic.liveupdates.network.SyncCallback
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.fold
+import java.util.concurrent.Executors
+
+internal class LiveUpdatesModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    override fun getName() = "IONLiveUpdatesManager"
+
+    private val liveUpdateScope = CoroutineScope(
+        Executors.newFixedThreadPool(4)
+            .asCoroutineDispatcher()
+    )
+
+    private fun callbackToMap(
+        liveUpdate: LiveUpdate,
+        failStep: FailStep?,
+        failMsg: String?
+    ): ReadableMap =
+        if (failStep != null) {
+            val map = WritableNativeMap()
+            map.putString("appId", liveUpdate.appId)
+            map.putString("failStep", failStep.name)
+            map.putString("message", failMsg ?: "Sync failed for unknown reason")
+            map
+        } else {
+            liveUpdate.toReadableMap()
+        }
+
+    private fun callbackToResult(
+        liveUpdate: LiveUpdate,
+        failStep: FailStep?,
+        failMsg: String?
+    ): LiveUpdateResult =
+        if (failStep != null) {
+            LiveUpdateError(
+                appId = liveUpdate.appId,
+                failStep = failStep.name,
+                failMsg = failMsg ?: "Sync failed for unknown reason"
+            )
+        } else {
+            LiveUpdateSuccess(liveUpdate)
+        }
+
+
+    @ReactMethod
+    fun addLiveUpdate(map: ReadableMap) {
+        val appId = map.getString("appId") ?: return
+        val channel = map.getString("channel") ?: return
+
+        LiveUpdateManager.addLiveUpdateInstance(
+            context = reactApplicationContext,
+            liveUpdate = LiveUpdate(appId, channel)
+        )
+    }
+
+    @ReactMethod
+    fun syncOne(appId: String, promise: Promise) {
+        LiveUpdateManager.sync(
+            context = reactApplicationContext,
+            appId = appId,
+            callback = object : SyncCallback {
+                override fun onAppComplete(
+                    liveUpdate: LiveUpdate,
+                    failStep: FailStep?,
+                    failMsg: String?
+                ) {
+                    val map = callbackToMap(liveUpdate, failStep, failMsg)
+                    promise.resolve(map)
+                }
+
+                override fun onSyncComplete() {
+                    // do nothing
+                }
+            }
+        )
+    }
+
+    @ReactMethod
+    fun syncSome(appIds: ReadableArray, promise: Promise) {
+        @Suppress("NAME_SHADOWING")
+        val appIds = (0 until appIds.size())
+            .mapNotNull(appIds::getString)
+            .toTypedArray()
+
+        sync(appIds, promise)
+    }
+
+    @ReactMethod
+    fun syncAll(promise: Promise) {
+        sync(emptyArray(), promise)
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun sync(appIds: Array<String>, promise: Promise) {
+        liveUpdateScope.launch {
+            val results = callbackFlow {
+                LiveUpdateManager.sync(
+                    context = reactApplicationContext,
+                    appIds = appIds,
+                    callback = object : SyncCallback {
+                        override fun onAppComplete(
+                            liveUpdate: LiveUpdate,
+                            failStep: FailStep?,
+                            failMsg: String?
+                        ) {
+                            trySend(callbackToResult(liveUpdate, failStep, failMsg))
+                        }
+
+                        override fun onSyncComplete() {
+                            close()
+                        }
+                    }
+                )
+
+                awaitClose { cancel() }
+            }
+
+            val syncResults = results.fold(SyncResults.empty()) { syncResults, result ->
+                when (result) {
+                    is LiveUpdateSuccess -> syncResults.liveUpdates.add(result.liveUpdate)
+                    is LiveUpdateError -> syncResults.errors.add(result)
+                }
+
+                return@fold syncResults
+            }
+
+            promise.resolve(syncResults.asReadableMap)
+        }
+    }
+}
+
+fun LiveUpdate.toReadableMap(): ReadableMap {
+    val map = WritableNativeMap()
+    map.putString("appId", appId)
+    map.putString("channel", channelName)
+    return map
+}
+
+private sealed class LiveUpdateResult
+
+private data class LiveUpdateError(val appId: String, val failStep: String, val failMsg: String) :
+    LiveUpdateResult() {
+    val asReadableMap: ReadableMap
+        get() {
+            val map = WritableNativeMap()
+            map.putString("appId", appId)
+            map.putString("failStep", failStep)
+            map.putString("message", failMsg)
+            return map
+        }
+}
+
+private data class LiveUpdateSuccess(val liveUpdate: LiveUpdate) : LiveUpdateResult()
+
+private data class SyncResults(
+    val liveUpdates: MutableList<LiveUpdate>,
+    val errors: MutableList<LiveUpdateError>
+) {
+    val asReadableMap: ReadableMap
+        get() {
+            val map = WritableNativeMap()
+
+            val liveUpdatesArray = WritableNativeArray()
+            liveUpdates.forEach { liveUpdatesArray.pushMap(it.toReadableMap()) }
+            map.putArray("liveUpdates", liveUpdatesArray)
+
+            val errorsArray = WritableNativeArray()
+            errors.forEach { errorsArray.pushMap(it.asReadableMap) }
+            map.putArray("errors", errorsArray)
+
+            return map
+        }
+
+    companion object {
+        fun empty() = SyncResults(mutableListOf(), mutableListOf())
+    }
+}

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsModule.kt

@@ -1,5 +1,6 @@
 package io.ionic.portals.reactnative
 
+import android.util.Log
 import android.view.Choreographer
 import android.view.View
 import android.view.ViewGroup
@@ -11,16 +12,16 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.getcapacitor.JSObject
+import com.getcapacitor.Plugin
+import io.ionic.liveupdates.LiveUpdate
 import io.ionic.portals.*
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-class PortalManagerModule(reactContext: ReactApplicationContext) :
+internal class PortalManagerModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
-    override fun getName(): String {
-        return "IONPortalManager"
-    }
+    override fun getName() = "IONPortalManager"
 
     @ReactMethod
     fun register(key: String) {
@@ -29,35 +30,51 @@ class PortalManagerModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun addPortal(map: ReadableMap) {
-        map.getString("name")?.let { name ->
-            val startDir = map.getString("startDir")
-            val initialContext = map.getMap("initialContext")?.toHashMap()
-
-            val portalBuilder = PortalBuilder(name)
-
-            if (startDir != null) {
-                portalBuilder.setStartDir(startDir)
+        val name = map.getString("name") ?: return
+        val portalBuilder = PortalBuilder(name)
+
+        map.getString("startDir")
+            ?.let(portalBuilder::setStartDir)
+
+        map.getMap("initialContext")
+            ?.toHashMap()
+            ?.let(portalBuilder::setInitialContext)
+
+        map.getArray("androidPlugins")
+            ?.toArrayList()
+            ?.mapNotNull { it as? String }
+            ?.map {
+                Class.forName(it)
+                    .asSubclass(Plugin::class.java)
             }
-
-            if (initialContext != null) {
-                portalBuilder.setInitialContext(initialContext)
+            ?.forEach(portalBuilder::addPlugin)
+
+        map.getMap("liveUpdate")
+            ?.let { readableMap ->
+                val appId = readableMap.getString("appId") ?: return@let null
+                val channel = readableMap.getString("channel") ?: return@let null
+                val syncOnAdd = readableMap.getBoolean("syncOnAdd")
+                Pair(LiveUpdate(appId, channel), syncOnAdd)
+            }
+            ?.let { pair ->
+                portalBuilder.setLiveUpdateConfig(
+                    context = reactApplicationContext,
+                    liveUpdateConfig = pair.first,
+                    updateOnAppLoad = pair.second
+                )
             }
 
-            // TODO: We need to figure out if we can register plugins from javascript
-            val portal = portalBuilder
-                .addPlugin(PortalsPlugin::class.java)
-                .create()
+        val portal = portalBuilder
+            .addPlugin(PortalsPlugin::class.java)
+            .create()
 
-            PortalManager.addPortal(portal)
-        }
+        PortalManager.addPortal(portal)
     }
 }
 
-class PortalsPubSubModule(reactContext: ReactApplicationContext) :
+internal class PortalsPubSubModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
-    override fun getName(): String {
-        return "IONPortalsPubSub"
-    }
+    override fun getName() = "IONPortalPubSub"
 
     @ReactMethod
     fun subscribe(topic: String, promise: Promise) {
@@ -91,7 +108,7 @@ class PortalsPubSubModule(reactContext: ReactApplicationContext) :
     }
 }
 
-fun JSONObject.toReactMap(): ReadableMap =
+private fun JSONObject.toReactMap(): ReadableMap =
     keys().asSequence().fold(WritableNativeMap()) { map, key ->
         try {
             when (val value = get(key)) {
@@ -110,7 +127,7 @@ fun JSONObject.toReactMap(): ReadableMap =
         return@fold map
     }
 
-fun JSONArray.toReactArray(): ReadableArray =
+private fun JSONArray.toReactArray(): ReadableArray =
     (0 until length()).fold(WritableNativeArray()) { array, index ->
         try {
             when (val value = get(index)) {
@@ -129,26 +146,44 @@ fun JSONArray.toReactArray(): ReadableArray =
         return@fold array
     }
 
-fun ReadableMap.toJSObject(): JSObject = JSObject.fromJSONObject(JSONObject(toHashMap()))
+private fun ReadableMap.toJSObject(): JSObject = JSObject.fromJSONObject(JSONObject(toHashMap()))
+
+private data class PortalViewState(
+    var fragment: PortalFragment?,
+    var portal: Portal?,
+    var initialContext: HashMap<String, Any>?
+)
 
-class PortalViewManager(private val context: ReactApplicationContext) :
+internal class PortalViewManager(private val context: ReactApplicationContext) :
     ViewGroupManager<FrameLayout>() {
     private val createId = 1
-    private var portal: Portal? = null
+    private val fragmentMap = mutableMapOf<Int, PortalViewState>()
 
     @ReactProp(name = "name")
     fun setPortal(viewGroup: ViewGroup, portalName: String) {
-        portal = PortalManager.getPortal(portalName)
+        when (val viewState = fragmentMap[viewGroup.id]) {
+            null -> fragmentMap[viewGroup.id] = PortalViewState(
+                fragment = null,
+                portal = PortalManager.getPortal(portalName),
+                initialContext = null
+            )
+            else -> viewState.portal = PortalManager.getPortal(portalName)
+        }
     }
 
     @ReactProp(name = "initialContext")
     fun setInitialContext(viewGroup: ViewGroup, initialContext: ReadableMap) {
-        portal?.setInitialContext(initialContext.toHashMap())
+        when (val viewState = fragmentMap[viewGroup.id]) {
+            null -> fragmentMap[viewGroup.id] = PortalViewState(
+                fragment = null,
+                portal = null,
+                initialContext = initialContext.toHashMap()
+            )
+            else -> viewState.initialContext = initialContext.toHashMap()
+        }
     }
 
-    override fun getName(): String {
-        return "AndroidPortalView"
-    }
+    override fun getName() = "AndroidPortalView"
 
     override fun createViewInstance(reactContext: ThemedReactContext): FrameLayout {
         return FrameLayout(reactContext)
@@ -161,6 +196,8 @@ class PortalViewManager(private val context: ReactApplicationContext) :
     override fun receiveCommand(root: FrameLayout, commandId: String?, args: ReadableArray?) {
         super.receiveCommand(root, commandId, args)
         val viewId = args?.getInt(0) ?: return
+
+        @Suppress("NAME_SHADOWING")
         val commandId = commandId?.toIntOrNull() ?: return
 
         when (commandId) {
@@ -169,11 +206,17 @@ class PortalViewManager(private val context: ReactApplicationContext) :
     }
 
     private fun createFragment(root: FrameLayout, viewId: Int) {
-        val portal = portal ?: return
+        val viewState = fragmentMap[viewId] ?: return
+        val portal = viewState.portal ?: return
+
         val parentView = root.findViewById<ViewGroup>(viewId)
         setupLayout(parentView)
 
         val portalFragment = PortalFragment(portal)
+        viewState.initialContext?.let(portalFragment::setInitialContext)
+
+        viewState.fragment = portalFragment
+
         val fragmentActivity = context.currentActivity as? FragmentActivity ?: return
         fragmentActivity.supportFragmentManager
             .beginTransaction()
@@ -181,6 +224,23 @@ class PortalViewManager(private val context: ReactApplicationContext) :
             .commit()
     }
 
+    override fun onDropViewInstance(view: FrameLayout) {
+        super.onDropViewInstance(view)
+        val viewState = fragmentMap[view.id] ?: return
+
+        try {
+            viewState.fragment
+                ?.parentFragmentManager
+                ?.beginTransaction()
+                ?.remove(viewState.fragment!!)
+                ?.commit()
+        } catch (e: IllegalStateException) {
+            Log.i("io.ionic.portals.rn", "Parent fragment manager not available")
+        }
+
+        fragmentMap.remove(view.id)
+    }
+
     private fun setupLayout(view: ViewGroup) {
         Choreographer.getInstance().postFrameCallback {
             layoutChildren(view)

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsPackage.kt

@@ -10,7 +10,8 @@ class ReactNativePortalsPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
         return listOf(
             PortalManagerModule(reactContext),
-            PortalsPubSubModule(reactContext)
+            PortalsPubSubModule(reactContext),
+            LiveUpdatesModule(reactContext)
         )
     }
 

package/ios/LiveUpdatesManager.m

@@ -0,0 +1,16 @@
+//
+//  LiveUpdatesManager.m
+//  ReactNativePortals
+//
+//  Created by Steven Sherry on 6/21/22.
+//  Copyright © 2022 Facebook. All rights reserved.
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(IONLiveUpdatesManager, NSObject)
+RCT_EXTERN_METHOD(addLiveUpdate: (NSDictionary) liveUpdate)
+RCT_EXTERN_METHOD(syncOne: (NSString *) appId resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
+RCT_EXTERN_METHOD(syncSome: (NSArray) appIds resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
+RCT_EXTERN_METHOD(syncAll: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
+@end

package/ios/Podfile

@@ -9,6 +9,6 @@ target 'ReactNativePortals' do
   use_frameworks!
   use_react_native!(:path => config["reactNativePath"])
   # Pods for ReactNativePortals
-  pod 'IonicPortals', '~> 0.5.1'
+  pod 'IonicPortals', '~> 0.6.1'
 end
 

package/ios/Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
   - boost-for-react-native (1.63.0)
-  - Capacitor (3.4.3):
+  - Capacitor (3.6.0):
     - CapacitorCordova
-  - CapacitorCordova (3.4.3)
+  - CapacitorCordova (3.6.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
   - FBReactNativeSpec (0.63.4):
@@ -22,11 +22,10 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - IonicLiveUpdates (0.0.5):
-    - ZIPFoundation
-  - IonicPortals (0.5.1):
-    - Capacitor
-    - IonicLiveUpdates
+  - IonicLiveUpdates (0.1.1)
+  - IonicPortals (0.6.1):
+    - Capacitor (~> 3.5)
+    - IonicLiveUpdates (~> 0.1.0)
   - RCTRequired (0.63.4)
   - RCTTypeSafety (0.63.4):
     - FBLazyVector (= 0.63.4)
@@ -254,7 +253,6 @@ PODS:
     - React-cxxreact (= 0.63.4)
     - React-jsi (= 0.63.4)
   - Yoga (1.14.0)
-  - ZIPFoundation (0.9.13)
 
 DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -262,7 +260,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - IonicPortals (~> 0.5.1)
+  - IonicPortals (~> 0.6.1)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -294,7 +292,6 @@ SPEC REPOS:
     - CapacitorCordova
     - IonicLiveUpdates
     - IonicPortals
-    - ZIPFoundation
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -352,15 +349,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  Capacitor: df9b3339e2ccf9fcfa19f90073a83454b3113691
-  CapacitorCordova: 7a09a302f17e14a308291bb3fa2b01ad2e4dfcaf
+  Capacitor: 28d6f7c3b02858b0696c98d27527ffb1ac8aba8f
+  CapacitorCordova: 23b4def1cd6a8c463074916376f511d7446d683e
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  IonicLiveUpdates: f3e54dbb5a330eb820a823477c5a75cd4470b65d
-  IonicPortals: 4f1621c0fc949119ef78d1f5c39c8de9ba3e12c7
+  IonicLiveUpdates: 5fb89c6faed266d083691e64f33710211edb3839
+  IonicPortals: 17b9ee9ae513fc3906b062bdd0b7492db94e38ce
   RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
   RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
   React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
@@ -382,8 +379,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
-  ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 3d4e1ae438899ba8709c2e19e767a9a9cced011b
+PODFILE CHECKSUM: 67d6b2cc79c25d2c4dcf32d6e3c6d6e6defffdb1
 
 COCOAPODS: 1.11.2

package/ios/PortalsPubSub.m

@@ -9,8 +9,8 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(IONPortalsPubSub, RCTEventEmitter)
+@interface RCT_EXTERN_MODULE(IONPortalPubSub, RCTEventEmitter)
 RCT_EXTERN_METHOD(subscribe: (NSString *) topic resolver: (RCTPromiseResolveBlock) resolver rejector: (RCTPromiseRejectBlock) rejector)
-RCT_EXTERN_METHOD(unsubscribe: (NSString *) topic subscriptionRef: (NSNumber) subscriptionRef)
+RCT_EXTERN_METHOD(unsubscribe: (NSString *) topic subscriptionRef: (NSNumber _Nonnull) subscriptionRef)
 RCT_EXTERN_METHOD(publish: (NSString *) topic data: (id) data)
 @end