Skip to content

Commit 16d9e10

Browse files
Merge pull request #89 from Couchbase-Ecosystem/merge-v1-to-main
This is the merge for RN 1.0 Features
2 parents 0ab1b59 + 9aad3af commit 16d9e10

63 files changed

Lines changed: 17921 additions & 8316 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,9 @@ android/keystores/debug.keystore
7676

7777
# generated by bob
7878
lib/
79+
80+
# Documentation and iOS source
81+
cbl-reactnative-docs/
82+
couchbase-lite-ios/
83+
couchbase-lite-java-common-android-release-*/
84+
ios-swift-quickstart/

.gitmodules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
[submodule "src/cblite-js"]
22
path = src/cblite-js
33
url = git@github.com:Couchbase-Ecosystem/cblite-js.git
4+
branch = RN-v1
5+
46
[submodule "ios/cbl-js-swift"]
57
path = ios/cbl-js-swift
68
url = git@github.com:Couchbase-Ecosystem/cbl-js-swift.git
9+
branch = RN-v1
10+
711
[submodule "android/src/main/java/com/cblreactnative/cbl-js-kotlin"]
812
path = android/src/main/java/com/cblreactnative/cbl-js-kotlin
913
url = git@github.com:Couchbase-Ecosystem/cbl-js-kotlin.git
14+
branch = RN-v1
15+
1016
[submodule "expo-example/cblite-js-tests"]
1117
path = expo-example/cblite-js-tests
1218
url = git@github.com:Couchbase-Ecosystem/cblite-js-tests.git
19+
branch = RN-v1

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
src/cblite-js/cblite-tests
2+
expo-example
3+
couchbase-lite-ios
4+
ios-swift-quickstart
5+
cbl-reactnative-docs

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ dependencies {
107107
implementation "com.facebook.react:react-native:+"
108108
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
109109
implementation "org.json:json:20240303"
110-
implementation "com.couchbase.lite:couchbase-lite-android-ee-ktx:3.2.1"
110+
implementation "com.couchbase.lite:couchbase-lite-android-ee-ktx:3.3.0"
111111
implementation 'com.eclipsesource.j2v8:j2v8:6.2.1@aar'
112112
}
113113

0 commit comments

Comments
 (0)