feat!: BREAKING update for Capacitor 7 (#60)

Co-authored-by: Carl Poole <[email protected]>

Author: trevor-lambert

.github/workflows/ci.yml

@@ -139,10 +139,9 @@ jobs:
             **/ios/Pods
           key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
           restore-keys: |
-            ${{ runner.os }}-cocoapods-
+            ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
 
       - name: Install cocoapods
-        if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
         run: |
           cd example/ios
           pod install

README.md

@@ -30,13 +30,13 @@ See our docs to [get started with Portals](https://ionic.io/docs/portals/getting
 
 ## Registration
 
-The Ionic Portals library for React Native requires a **free** license 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 [React Native](https://ionic.io/docs/portals/getting-started/react-native) getting started guides to see where to add your key.
+The Ionic Portals library for React Native requires a license 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 [React Native](https://ionic.io/docs/portals/getting-started/react-native) getting started guides to see where to add your key.
 
 ## FAQ
 
 ### What is the pricing for Portals use?
 
-Portals is free to use in non-production environments. Businesses with more than USD $1 million in annual revenue are required to purchase a license from Ionic before using Portals in production.
+[Contact our sales team](https://ionic.io/portals#sales) for more information about pricing.
 
 ### Is Portals Open Source?
 

ReactNativePortals.podspec

@@ -11,22 +11,22 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  s.platforms    = { :ios => '14.0' }
   s.source       = { :git => "https://github.com/ionic-team/ionic-portals-react-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
   if respond_to?(:install_modules_dependencies, true)
-    s.dependency 'IonicPortals', '~> 0.11.0'
-    s.dependency 'IonicLiveUpdates', '~> 0.5.2'
+    s.dependency 'IonicPortals', '~> 0.12.0'
+    s.dependency 'IonicLiveUpdates', '~> 0.5.6'
     install_modules_dependencies(s)
 
   else
     s.dependency "React-Core"
-    s.dependency 'IonicPortals', '~> 0.11.0'
-    s.dependency 'IonicLiveUpdates', '~> 0.5.2'
+    s.dependency 'IonicPortals', '~> 0.12.0'
+    s.dependency 'IonicLiveUpdates', '~> 0.5.6'
 
     # Don't install the dependencies when we run `pod install` in the old architecture.
     if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -95,7 +95,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "io.ionic:portals:0.10.+"
+  implementation "io.ionic:portals:0.12.+"
   implementation "io.ionic:liveupdates:0.5.+"
 }
 

android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsPubSub.kt

@@ -1,5 +1,6 @@
 package io.ionic.portals.reactnative
 
+import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.getcapacitor.JSObject
@@ -35,4 +36,12 @@ internal class PortalsPubSubModule(reactContext: ReactApplicationContext) :
     }
 }
 
-private fun ReadableMap.toJSObject(): JSObject = JSObject.fromJSONObject(JSONObject(toHashMap()))
+private fun ReadableMap.toJSObject(): JSObject {
+    val map = toHashMap() as? Map<*, *> ?: return JSObject()
+    return try {
+        JSObject.fromJSONObject(JSONObject(map))
+    } catch (e: Exception) {
+        Log.e("PortalsPubSubModule", "Error converting ReadableMap to JSObject", e)
+        JSObject()
+    }
+}

example/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

example/android/app/build.gradle

@@ -25,6 +25,9 @@ react {
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
     // debuggableVariants = ["liteDebug", "prodDebug"]
 
+    /* Autolinking */
+    autolinkLibrariesWithApp()
+
     /* Bundling */
     //   A list containing the node command and its flags. Default is just 'node'.
     // nodeExecutableAndArgs = ["node"]
@@ -117,8 +120,6 @@ dependencies {
     }
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
 task PortalsSync(type: Exec) {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         commandLine 'cmd', '/c', 'PowerShell -Command portals.exe sync --config ../../.portals.yaml --destination ' + layout.projectDirectory.dir("src/main/assets").toString()

example/android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,8 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

example/android/build.gradle

@@ -2,10 +2,10 @@ buildscript {
     ext {
         buildToolsVersion = "34.0.0"
         minSdkVersion = 23
-        compileSdkVersion = 34
-        targetSdkVersion = 34
+        compileSdkVersion = 35
+        targetSdkVersion = 35
         ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.22"
+        kotlinVersion = "1.9.24"
     }
     repositories {
         google()

example/android/gradle.properties

@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx12800m -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using