Merge pull request #32 from Couchbase-Ecosystem/cbl-321

feat: updated to RN 0.76.3/cbl 3.2.1

Author: biozal

.eslintignore

@@ -0,0 +1,9 @@
+android/
+build/
+expo-example/
+node_modules/
+dist/
+lib/
+src/cblite-js
+ios/
+bable.config.js

.eslintrc

@@ -0,0 +1,12 @@
+{
+	"extends": [
+	  "eslint:recommended",
+	  "plugin:@typescript-eslint/recommended",
+	  "plugin:react/recommended",
+	  "prettier"
+	],
+	"plugins": ["@typescript-eslint", "react", "prettier"],
+	"rules": {
+	  "prettier/prettier": "error"
+	}
+  }

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "android/src/main/java/com/cblreactnative/cbl-js-kotlin"]
 	path = android/src/main/java/com/cblreactnative/cbl-js-kotlin
 	url = [email protected]:Couchbase-Ecosystem/cbl-js-kotlin.git
+[submodule "expo-example/cblite-js-tests"]
+	path = expo-example/cblite-js-tests
+	url = [email protected]:Couchbase-Ecosystem/cblite-js-tests.git

.prettierignore

@@ -0,0 +1,9 @@
+android/
+build/
+expo-example/
+node_modules/
+dist/
+lib/
+src/cblite-js
+ios/
+bable.config.js

.prettierrc

@@ -0,0 +1,7 @@
+{
+	"singleQuote": true,
+	"trailingComma": "es5",
+	"tabWidth": 2,
+	"semi": true,
+	"printWidth": 80
+  }

android/build.gradle

@@ -3,8 +3,8 @@ buildscript {
   def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["CblReactnative_kotlinVersion"]
 
   repositories {
-    maven {url 'https://mobile.maven.couchbase.com/maven2/dev/'}
     google()
+    maven {url 'https://mobile.maven.couchbase.com/maven2/dev/'}
     mavenCentral()
   }
 
@@ -50,7 +50,7 @@ def supportsNamespace() {
 
 android {
   if (supportsNamespace()) {
-    namespace "com.cbl.reactnative"
+    namespace "com.cblreactnative"
     sourceSets {
       main {
         manifest.srcFile "src/main/AndroidManifestNew.xml"
@@ -90,8 +90,8 @@ repositories {
 
 allprojects {
   repositories {
-    maven { url 'https://mobile.maven.couchbase.com/maven2/dev/' }
     google()
+    maven { url 'https://mobile.maven.couchbase.com/maven2/dev/' }
     mavenCentral()
   }
 }
@@ -107,6 +107,6 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.json:json:20240303"
-  implementation "com.couchbase.lite:couchbase-lite-android-ee-ktx:3.1.9"
+  implementation "com.couchbase.lite:couchbase-lite-android-ee-ktx:3.2.1"
 }
 

android/gradle.properties

@@ -1,5 +1,5 @@
-CblReactnative_kotlinVersion=1.7.0
-CblReactnative_minSdkVersion=25
-CblReactnative_targetSdkVersion=31
-CblReactnative_compileSdkVersion=31
+CblReactnative_kotlinVersion=1.9.25
+CblReactnative_minSdkVersion=24
+CblReactnative_targetSdkVersion=34
+CblReactnative_compileSdkVersion=34
 CblReactnative_ndkversion=21.4.7075529

android/src/main/java/com/cblreactnative/CblReactnativeModule.kt

@@ -52,7 +52,6 @@ class CblReactnativeModule(reactContext: ReactApplicationContext) :
 
   // Collection Functions
   @ReactMethod
-
   fun collection_CreateCollection(
     collectionName: String,
     name: String,
@@ -484,7 +483,8 @@ class CblReactnativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun collection_Save(
-    document: ReadableMap,
+    document: String,
+    blobs: String,
     docId: String,
     name: String,
     scopeName: String,
@@ -505,21 +505,23 @@ class CblReactnativeModule(reactContext: ReactApplicationContext) :
           concurrencyControl =
             DataAdapter.intToConcurrencyControl(concurrencyControlValue.toInt())
         }
-        val doc = DataAdapter.toMap(document).toMap()
         val result = CollectionManager.saveDocument(
           docId,
-          doc,
+          document,
+          blobs,
           concurrencyControl,
           collectionName,
           scopeName,
           name
         )
-        writableMap.putString("_id", result.first)
-        if (result.second != null) {
-          writableMap.putBoolean("concurrencyControlResult", result.second!!)
+        writableMap.putString("_id", result._id)
+        if (result._concurrencyControl != null) {
+          writableMap.putBoolean("concurrencyControlResult", result._concurrencyControl)
         } else {
           writableMap.putNull("concurrencyControlResult")
         }
+        writableMap.putString("_revId", result._revId)
+        writableMap.putInt("_sequence", result._sequence.toInt())
         context.runOnUiQueueThread {
           promise.resolve(writableMap)
         }

android/src/main/java/com/cblreactnative/DataAdapter.kt

@@ -77,7 +77,9 @@ object DataAdapter {
       val itemValue = map[key]
       if (itemValue is Blob) {
         document.getBlob(key)?.let { blob ->
-          val properties = blob.properties.toMap()
+          val properties = blob.properties.toMutableMap()
+          val raw = blob.content?.toTypedArray()
+          properties["raw"] = raw
           map[key] = properties
         }
       }