omikit-plugin 3.3.29 → 4.0.2

package/android/build.gradle

@@ -1,45 +1,3 @@
-// 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["OmikitPlugin_kotlinVersion"]
-
-//   repositories {
-//     google()
-//     mavenCentral()
-//     // maven {
-//     //   url("https://vihatgroup.jfrog.io/artifactory/omi-voice/")
-//     //   credentials {
-//     //     username = "downloader"
-//     //     password = "Omi@2022"
-//     //   }
-//     // }
-//   }
-
-//   dependencies {
-//     classpath 'com.android.tools.build:gradle-api:7.1.2'
-//     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-//     classpath 'com.google.dagger:hilt-android-gradle-plugin:2.39.1'
-//     classpath 'com.github.kezong:fat-aar:1.3.8'
-//     classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.3"
-//     classpath 'com.android.tools.build:gradle:4.0.0'
-//   }
-// }
-
-buildscript {
-    ext {
-        kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["OmikitPlugin_kotlinVersion"]
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:8.1.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.39.1'
-        classpath 'com.github.kezong:fat-aar:1.3.8'
-    }
-}
-
 def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
@@ -48,7 +6,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
-
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
@@ -70,10 +27,11 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
-   buildFeatures {
-        buildConfig = true
-    }
 
+  buildFeatures {
+    buildConfig = true
+    dataBinding = true
+  }
 
   buildTypes {
     release {
@@ -81,7 +39,7 @@ android {
     }
   }
 
-  lintOptions {
+  lint {
     disable "GradleCompatible"
   }
 
@@ -90,47 +48,39 @@ android {
     targetCompatibility JavaVersion.VERSION_17
   }
 
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-
-  dataBinding {
-    enabled = true
+  kotlinOptions {
+    jvmTarget = "17"
   }
 }
 
-
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
+  kotlinOptions {
+    jvmTarget = "17"
+  }
 }
 
-
-
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-
-  // use for OMISDK
+  // OMISDK
   implementation("androidx.work:work-runtime:2.8.1")
   implementation "androidx.security:security-crypto:1.1.0-alpha06"
-  // api 'vn.vihat.omicall:omi-sdk:2.3.23'
-  api "io.omicrm.vihat:omi-sdk:2.5.17"
+  api "io.omicrm.vihat:omi-sdk:2.6.4"
+
+  // React Native — resolved from consumer's node_modules
+  implementation "com.facebook.react:react-native:+"
 
-  implementation "com.facebook.react:react-native:+" // From node_modules
+  // Kotlin
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+  // UI & Android
   implementation "com.google.android.flexbox:flexbox:3.0.0"
   implementation "androidx.appcompat:appcompat:1.6.1"
   implementation "androidx.lifecycle:lifecycle-process:2.6.1"
   implementation "com.google.android.material:material:1.9.0"
   implementation "com.google.firebase:firebase-messaging-ktx:23.1.2"
+
+  // Network
   implementation("com.squareup.retrofit2:retrofit:2.9.0") {
     exclude module: 'okhttp'
   }
@@ -140,13 +90,13 @@ dependencies {
   implementation "com.squareup.okhttp3:logging-interceptor:4.9.1"
   implementation "com.google.code.gson:gson:2.8.9"
 
-  implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+  // Image
   implementation "com.squareup.picasso:picasso:2.8"
 
+  // Coroutines
   def coroutines_version = '1.7.2'
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-
 }
 
 if (isNewArchitectureEnabled()) {

package/android/gradle.properties

@@ -1,5 +1,5 @@
-OmikitPlugin_kotlinVersion=1.8.20
+OmikitPlugin_kotlinVersion=2.0.21
 OmikitPlugin_minSdkVersion=24
-OmikitPlugin_targetSdkVersion=33
-OmikitPlugin_compileSdkVersion=33
-OmikitPlugin_ndkversion=21.4.7075529
+OmikitPlugin_targetSdkVersion=35
+OmikitPlugin_compileSdkVersion=35
+OmikitPlugin_ndkversion=27.1.12297006

package/android/src/main/java/com/omikitplugin/FLLocalCameraModule.kt

@@ -18,7 +18,7 @@ class FLLocalCameraModule(reactContext: ReactApplicationContext, localViewManage
   lateinit var localViewManager : FLLocalCameraView
 
   override fun getName(): String {
-    return "FLLocalCameraView"
+    return "FLLocalCameraModule"
   }
 
   init {

package/android/src/main/java/com/omikitplugin/FLRemoteCameraModule.kt

@@ -16,7 +16,7 @@ class FLRemoteCameraModule(reactContext: ReactApplicationContext, remoteViewMana
   var cameraView: TextureView
 
   override fun getName(): String {
-    return "FLRemoteCameraView"
+    return "FLRemoteCameraModule"
   }
 
   init {