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
         }
       }

android/src/main/java/com/cblreactnative/cbl-js-kotlin

@@ -1,3 +1,4 @@
+/* eslint-env node */
 module.exports = {
   presets: ['module:@react-native/babel-preset'],
 };

babel.config.js

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Couchbase-Ecosystem/cbl-reactnative", :tag => "#{s.version}" }
 
   s.swift_version = '5.5'
-  s.dependency 'CouchbaseLite-Swift-Enterprise', '~> 3.1'
+  s.dependency 'CouchbaseLite-Swift-Enterprise', '3.2.1'
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.

cbl-reactnative.podspec

@@ -4,27 +4,6 @@ apply plugin: "com.facebook.react"
 
 def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
 
-static def versionToNumber(major, minor, patch) {
-  return patch * 100 + minor * 10000 + major * 1000000
-}
-
-def getRNVersion() {
-  def version = providers.exec {
-    workingDir(projectDir)
-    commandLine("node", "-e", "console.log(require('react-native/package.json').version);")
-  }.standardOutput.asText.get().trim()
-
-  def coreVersion = version.split("-")[0]
-  def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
-
-  return versionToNumber(
-      major,
-      minor,
-      patch
-  )
-}
-def rnVersion = getRNVersion()
-
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
@@ -41,12 +20,12 @@ react {
     bundleCommand = "export:embed"
 
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
+     //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -79,10 +58,8 @@ react {
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
 
-    if (rnVersion >= versionToNumber(0, 75, 0)) {
-        /* Autolinking */
-        autolinkLibrariesWithApp()
-    }
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -144,6 +121,9 @@ android {
             useLegacyPackaging (findProperty('expo.useLegacyPackaging')?.toBoolean() ?: false)
         }
     }
+    androidResources {
+        ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
+    }
 }
 
 // Apply static values from `gradle.properties` to the `android.packagingOptions`
@@ -194,8 +174,3 @@ dependencies {
         implementation jscFlavor
     }
 }
-
-if (rnVersion < versionToNumber(0, 75, 0)) {
-    apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
-    applyNativeModulesAppBuildGradle(project)
-}

expo-example/ReactotronConfig.js

@@ -11,7 +11,7 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
@@ -29,6 +29,5 @@
         <data android:scheme="exp+expo-example"/>
       </intent-filter>
     </activity>
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
   </application>
 </manifest>

expo-example/android/app/build.gradle

@@ -1,4 +1,5 @@
 package com.couchbase.expo.example
+import expo.modules.splashscreen.SplashScreenManager
 
 import android.os.Build
 import android.os.Bundle
@@ -15,7 +16,10 @@ class MainActivity : ReactActivity() {
     // Set the theme to AppTheme BEFORE onCreate to support
     // coloring the background, status bar, and navigation bar.
     // This is required for expo-splash-screen.
-    setTheme(R.style.AppTheme);
+    // setTheme(R.style.AppTheme);
+    // @generated begin expo-splashscreen - expo prebuild (DO NOT MODIFY) sync-f3ff59a738c56c9a6119210cb55f0b613eb8b6af
+    SplashScreenManager.registerOnActivity(this)
+    // @generated end expo-splashscreen
     super.onCreate(null)
   }
 

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

@@ -10,6 +10,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.ReactHost
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 
 import expo.modules.ApplicationLifecycleDispatcher
@@ -21,9 +22,10 @@ class MainApplication : Application(), ReactApplication {
         this,
         object : DefaultReactNativeHost(this) {
           override fun getPackages(): List<ReactPackage> {
+            val packages = PackageList(this).packages
             // Packages that cannot be autolinked yet can be added manually here, for example:
             // packages.add(new MyReactNativePackage());
-            return PackageList(this).packages
+            return packages
           }
 
           override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
@@ -40,7 +42,7 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, false)
+    SoLoader.init(this, OpenSourceMergedSoMapping)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

expo-example/android/app/src/main/java/com/couchbase/expo/example/MainActivity.kt

@@ -1,3 +1,6 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:drawable="@color/splashscreen_background"/>
+  <item>
+    <bitmap android:gravity="center" android:src="@drawable/splashscreen_logo"/>
+  </item>
 </layer-list>

expo-example/android/app/src/main/java/com/couchbase/expo/example/MainApplication.kt

@@ -11,7 +11,9 @@
     <item name="android:textColorHint">#c8c8c8</item>
     <item name="android:textColor">@android:color/black</item>
   </style>
-  <style name="Theme.App.SplashScreen" parent="AppTheme">
-    <item name="android:windowBackground">@drawable/splashscreen</item>
+  <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
+    <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
+    <item name="windowSplashScreenAnimatedIcon">@drawable/splashscreen_logo</item>
+    <item name="postSplashScreenTheme">@style/AppTheme</item>
   </style>
 </resources>

expo-example/android/app/src/main/res/drawable-hdpi/splashscreen_image.png

@@ -2,11 +2,11 @@
 
 buildscript {
     ext {
-        buildToolsVersion = findProperty('android.buildToolsVersion') ?: '34.0.0'
-        minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '23')
-        compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '34')
+        buildToolsVersion = findProperty('android.buildToolsVersion') ?: '35.0.0'
+        minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '24')
+        compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '35')
         targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
-        kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.23'
+        kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.24'
 
         ndkVersion = "26.1.10909125"
     }

expo-example/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png

@@ -22,9 +22,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
 # Enable AAPT2 PNG crunching
 android.enablePngCrunchInReleaseBuilds=true
 

expo-example/android/app/src/main/res/drawable-mdpi/splashscreen_image.png

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME