diff --git a/Jenkinsfile b/Jenkinsfile index 160f79190..f750fb6f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,22 +9,22 @@ pipeline { stage("Validate C#") { agent { label 's61113u16 (litecore)' } steps { - sh 'jenkins/dotnet_build.sh 3.2.3 1.0.0' + sh 'jenkins/dotnet_build.sh 3.3.0 1.0.0' } } stage("Validate C") { agent { label 's61113u16 (litecore)' } steps { - sh 'jenkins/c_build.sh 3.2.3' + sh 'jenkins/c_build.sh 3.3.0' } } stage("Validate iOS") { agent { label 'mobile-builder-ios-pull-request' } steps { - sh 'jenkins/ios.sh 3.2.3 1.0.0' + sh 'jenkins/ios.sh 3.3.0 1.0.0' } } } } } -} \ No newline at end of file +} diff --git a/LICENSE b/LICENSE index 13f71af02..e3522d991 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Couchbase Lite Documentation © 2024 by Couchbase Inc. is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0). +Couchbase Lite Documentation © 2025 by Couchbase Inc. is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0). See https://creativecommons.org/licenses/by-nc-sa/4.0/ for details. diff --git a/README.adoc b/README.adoc index 2efbcfd6f..773f55b62 100644 --- a/README.adoc +++ b/README.adoc @@ -144,6 +144,6 @@ This common header file, then invokes: == License -Couchbase Lite Documentation © 2024 by Couchbase Inc. is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International. +Couchbase Lite Documentation © 2025 by Couchbase Inc. is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International. See the LICENSE file or the {url-license}[Creative Commons CC BY-NC-SA 4.0 license page] for details. diff --git a/antora.yml b/antora.yml index ac607ab52..5588676e2 100644 --- a/antora.yml +++ b/antora.yml @@ -1,5 +1,5 @@ name: couchbase-lite -version: '3.2' +version: '3.3' prerelease: title: Couchbase Lite start_page: ROOT:index.adoc @@ -16,10 +16,10 @@ asciidoc: attributes: prerelease: previous-release: - release: '3.2' + release: '3.3' # releasetag: major: 3 - minor: 2 + minor: 3 maintenance-ios: 3 maintenance-swift: 3 maintenance-c: 3 diff --git a/modules/android/nav-android.adoc b/modules/android/nav-android.adoc index 7b913500f..e398f9563 100644 --- a/modules/android/nav-android.adoc +++ b/modules/android/nav-android.adoc @@ -38,7 +38,8 @@ include::partial$_set_page_context_for_android.adoc[] * Data Sync ** xref:android:dbreplica.adoc[Intra-device Sync] ** xref:android:replication.adoc[Remote Sync Gateway] - ** xref:android:p2psync-websocket.adoc[Peer-to-Peer] + ** xref:android:p2psync-multipeer.adoc[Multipeer Replicator] + ** xref:android:p2psync-websocket.adoc[Active-Passive Peer-to-Peer] *** xref:android:p2psync-websocket-using-passive.adoc[Passive Peer] *** xref:android:p2psync-websocket-using-active.adoc[Active Peer] *** xref:android:p2psync-custom.adoc[Integrate Custom Listener] diff --git a/modules/android/pages/gs-prereqs.adoc b/modules/android/pages/gs-prereqs.adoc index a2f107494..f28d4debc 100644 --- a/modules/android/pages/gs-prereqs.adoc +++ b/modules/android/pages/gs-prereqs.adoc @@ -1,14 +1,11 @@ - = Preparing for Couchbase Lite on Android :page-aliases: start/java-android-gs-prereqs.adoc :page-role: :description: Prerequisites for the installation of Couchbase Lite :keywords: edge nosql api android java - :source-language: Java - :source-language: Kotlin @@ -48,8 +45,8 @@ We do not test against, nor guarantee support for, uncertified Android versions |22 |=== -[#supported-versions-for-vector-search-3-2-0] -== Supported Versions for Vector Search 3.2.0 +[#supported-versions-for-vector-search-3-3-0] +== Supported Versions for Vector Search 3.3.0 [IMPORTANT] -- @@ -72,6 +69,24 @@ To verify whether your device supports the AVX2 instructions set, https://www.in |23 |=== +// more applicable for bluetooth implementations - commenting out for now +//// +== Supported Versions for Multipeer Replicator + + +[%autowidth.stretch] +|=== +|Platform |Runtime architectures |Minimum API Level + +|Android +|arm64-v8a +|35 + +|Android +|x86_64 +|35 +|=== +//// [#related-content] == Related Content diff --git a/modules/android/pages/p2psync-multipeer.adoc b/modules/android/pages/p2psync-multipeer.adoc new file mode 100644 index 000000000..3df31e1c1 --- /dev/null +++ b/modules/android/pages/p2psync-multipeer.adoc @@ -0,0 +1,10 @@ += Multipeer Replicator +ifdef::show_edition[:page-edition: Enterprise Edition] +:description: MultipeerReplicator is a peer-to-peer replicator that can advertise its presence, discover other peers, establish connections, and replicate data with those peers. + +:source-language: Java + +:source-language: Kotlin + +[abstract] +{description} diff --git a/modules/android/pages/p2psync-websocket.adoc b/modules/android/pages/p2psync-websocket.adoc index 134df7a3f..9bad07950 100644 --- a/modules/android/pages/p2psync-websocket.adoc +++ b/modules/android/pages/p2psync-websocket.adoc @@ -1,9 +1,8 @@ - -= Data Sync Peer-to-Peer += Active-Passive Peer-to-Peer Sync :page-aliases: learn/java-android-p2psync-websocket.adoc ifdef::show_edition[:page-edition: Enterprise Edition] :page-role: -:description: Couchbase Lite's Peer-to-Peer Synchronization enables edge devices to synchronize securely without consuming centralized cloud-server resources +:description: Where MultiPeer Sync is not available, Couchbase Lite's Active-Passive Peer-to-Peer Synchronization enables edge devices to synchronize securely without consuming centralized cloud-server resources :source-language: Java diff --git a/modules/android/pages/prebuilt-database.adoc b/modules/android/pages/prebuilt-database.adoc index 8e13efba2..2623a5469 100644 --- a/modules/android/pages/prebuilt-database.adoc +++ b/modules/android/pages/prebuilt-database.adoc @@ -22,7 +22,7 @@ _Abstract -- This content explains how to include a snapshot of a pre-built data == Overview -_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from pass:q,a[_pass:q,a[Sync{nbsp}Gateway]_] during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. +_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from _Sync{nbsp}Gateway_ during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. Avoiding an initial bulk sync reduces startup time and network transfer costs. diff --git a/modules/c/pages/gs-install.adoc b/modules/c/pages/gs-install.adoc index 21633fe4e..5bce95564 100644 --- a/modules/c/pages/gs-install.adoc +++ b/modules/c/pages/gs-install.adoc @@ -101,7 +101,7 @@ xref:c:gs-install.adoc#lbl-android[Install for Android] [#lbl-apt] === Using APT -:url-apt-pkg-file: couchbase-1.0-noarch.deb +:url-apt-pkg-file: couchbase-release-1.0-noarch.deb :url-apt-pkg: pass:q,a[https://packages.couchbase.com/releases/couchbase-release/{url-apt-pkg-file}] Using the Advanced Package Tool (apt) is the easiest way to install pass:q,a[Couchbase{nbsp}Lite] on Ubuntu and Debian platforms. diff --git a/modules/csharp/pages/prebuilt-database.adoc b/modules/csharp/pages/prebuilt-database.adoc index 8b069fa93..04547628f 100644 --- a/modules/csharp/pages/prebuilt-database.adoc +++ b/modules/csharp/pages/prebuilt-database.adoc @@ -19,7 +19,7 @@ _Abstract -- This content explains how to include a snapshot of a pre-built data == Overview -_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from pass:q,a[_pass:q,a[Sync{nbsp}Gateway]_] during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. +_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from _Sync{nbsp}Gateway_ during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. Avoiding an initial bulk sync reduces startup time and network transfer costs. diff --git a/modules/java/pages/prebuilt-database.adoc b/modules/java/pages/prebuilt-database.adoc index 492c8fc53..041c7a898 100644 --- a/modules/java/pages/prebuilt-database.adoc +++ b/modules/java/pages/prebuilt-database.adoc @@ -19,7 +19,7 @@ _Abstract -- This content explains how to include a snapshot of a pre-built data == Overview -_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from pass:q,a[_pass:q,a[Sync{nbsp}Gateway]_] during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. +_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from _Sync{nbsp}Gateway_ during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. Avoiding an initial bulk sync reduces startup time and network transfer costs. diff --git a/modules/objc/pages/prebuilt-database.adoc b/modules/objc/pages/prebuilt-database.adoc index 6396531d5..7bc1f330e 100644 --- a/modules/objc/pages/prebuilt-database.adoc +++ b/modules/objc/pages/prebuilt-database.adoc @@ -21,7 +21,7 @@ _Abstract -- This content explains how to include a snapshot of a pre-built data == Overview -_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from pass:q,a[_pass:q,a[Sync{nbsp}Gateway]_] during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. +_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from _Sync{nbsp}Gateway_ during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. Avoiding an initial bulk sync reduces startup time and network transfer costs. diff --git a/modules/swift/pages/prebuilt-database.adoc b/modules/swift/pages/prebuilt-database.adoc index 49e1c9598..16727f96e 100644 --- a/modules/swift/pages/prebuilt-database.adoc +++ b/modules/swift/pages/prebuilt-database.adoc @@ -21,7 +21,7 @@ _Abstract -- This content explains how to include a snapshot of a pre-built data == Overview -_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from pass:q,a[_pass:q,a[Sync{nbsp}Gateway]_] during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. +_Couchbase{nbsp}Lite_ supports pre-built databases. You can pre-load your app with data instead of syncing it from _Sync{nbsp}Gateway_ during startup to minimize consumer wait time (arising from data setup) on initial install and launch of the application. Avoiding an initial bulk sync reduces startup time and network transfer costs. diff --git a/preview/HEAD.yml b/preview/HEAD.yml index ce1d950ac..0b1366df6 100644 --- a/preview/HEAD.yml +++ b/preview/HEAD.yml @@ -1,3 +1,3 @@ sources: docs-sync-gateway: - branches: release/3.2 + branches: release/3.3