@moxtradeveloper/react-native-moxo-module 10.11.2 → 10.13.1

package/README.md

@@ -10,8 +10,9 @@ Moxo is an AI workflow automation platform for business operations.
 
 ### Supported Platforms
 
-* iOS 15.0+
+* iOS 15.6+
 * Android 7+
+* React Native 0.80+ with the New Architecture
 
 ## Preparation
 
@@ -24,11 +25,33 @@ Below sdk or tools are required before start to use react-native-moxo-module.
 
 * Android Studio
 * Android SDK API 24+ (Android 7.0)
+* compileSdk 37+
+* Android Gradle Plugin 9.1+
+* Kotlin 2.3+. The React Native template defaults to Kotlin 2.2, so pin the Kotlin Gradle plugin in `android/build.gradle`:
+
+```groovy
+buildscript {
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20")
+    }
+}
+```
+
+* Jetifier, because some of the SDK's dependencies still use the Android Support Library. Add this to `android/gradle.properties`:
+
+```properties
+android.enableJetifier=true
+```
 
 ### iOS
 
 * Xcode v26+
 * Cocoapod v1.16.2+
+* Deployment target 15.6+. The React Native template defaults to 15.1, so raise it in `ios/Podfile` and set the app target's iOS Deployment Target to 15.6 in Xcode:
+
+```ruby
+platform :ios, '15.6'
+```
 
 For more react-native set up details, please ref to [react native official site](https://reactnative.dev/docs/environment-setup)
 
@@ -96,6 +119,19 @@ If user is logged in, call open chat API to open existing chat. If not logged in
 moxo.openChat('CBSmiUUjyIJP7gR8YIpiagvH', '')
 ```
 
+### Events
+
+Event callbacks return a subscription. Call `remove()` on it when you no longer need the callback.
+
+```js
+const subscription = moxo.onUnreadMessageCountUpdated((count) => {
+  console.log(`Unread messages: ${count}`);
+});
+
+// Later
+subscription.remove();
+```
+
 ### Notification
 
 To enable notification feature, you'll need to integrate a notification module first, here we take [react-native-notifications](https://www.npmjs.com/package/react-native-notifications) for example, which can help to get device token and notification payload.

package/android/build.gradle

@@ -1,169 +1,63 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['MoxoModule_kotlinVersion']
-
-  repositories {
-    google()
-    mavenCentral()
-    maven() {
-      url "https://mxrepo.moxo.com/repository/customer-maven-releases/"
-    }
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['MoxoModule_' + name]
 }
 
-rootProject.allprojects {
-  repositories {
-    google()
-    mavenCentral()
-    jcenter()
-    maven() {
-      url "https://mxrepo.moxo.com/repository/customer-maven-releases/"
-    }
-  }
+def getExtOrIntegerDefault(name) {
+  return getExtOrDefault(name).toInteger()
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
+// AGP 9 compiles Kotlin itself unless the app opts out with android.builtInKotlin=false.
+def builtInKotlin = (project.findProperty('android.builtInKotlin') ?: 'true').toString().toBoolean()
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: 'com.facebook.react'
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['MoxoModule_' + name]
+if (!builtInKotlin) {
+  apply plugin: 'org.jetbrains.kotlin.android'
 }
+apply plugin: 'com.facebook.react'
 
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['MoxoModule_' + name]).toInteger()
+// The app has to resolve mep-sdk and its dependencies from the Moxo repository.
+rootProject.allprojects {
+  repositories {
+    maven {
+      url = 'https://mxrepo.moxo.com/repository/customer-maven-releases/'
+    }
+  }
 }
 
 android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-  namespace "com.moxomodule"
+  namespace = 'com.moxomodule'
+  compileSdk = getExtOrIntegerDefault('compileSdkVersion')
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    minSdk = getExtOrIntegerDefault('minSdkVersion')
+    targetSdk = getExtOrIntegerDefault('targetSdkVersion')
   }
+
   buildTypes {
     release {
-      minifyEnabled false
+      minifyEnabled = false
     }
   }
 
-  lintOptions {
+  lint {
     disable 'GradleCompatible'
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
-
-  kotlinOptions {
-        jvmTarget = "17"
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
-
-  buildFeatures {
-        buildConfig true
-    }
 }
 
-repositories {
-  mavenCentral()
-  google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-      projectDir,
-      '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
+if (!builtInKotlin) {
+  kotlin {
+    compilerOptions {
+      jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-        parentDir,
-        'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-        parentDir,
-        'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-        "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
   }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
 dependencies {
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.moxtra:mep-sdk:10.11.1"
-// From node_modules
-}
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "MoxoModule"
-    codegenJavaPackageName = "com.moxomodule"
-  }
+  implementation 'com.facebook.react:react-android'
+  implementation 'com.moxtra:mep-sdk:10.13.1'
 }

package/android/gradle.properties

@@ -1,5 +1,3 @@
-MoxoModule_kotlinVersion=1.7.0
-MoxoModule_minSdkVersion=21
-MoxoModule_targetSdkVersion=31
-MoxoModule_compileSdkVersion=31
-MoxoModule_ndkversion=21.4.7075529
+MoxoModule_minSdkVersion=24
+MoxoModule_targetSdkVersion=36
+MoxoModule_compileSdkVersion=37