Merge branch 'main' into 3.1.x

Author: Nao-ris

.github/workflows/check_pr_title.yml

@@ -0,0 +1,34 @@
+# DON'T MODIFY THIS WORKFLOW FILE DIRECTLY
+#
+# This workflow
+# - checks if the PR title is compliant
+# (cf. https://doctolib.atlassian.net/wiki/spaces/EE/pages/1793131314/How+to+have+a+good+PR+title)
+# - is force implemented in specific repositories (tier0 repository) of the organization with Terraform
+# - is mandatory to merge in main branch of your repo because of
+# https://github.com/doctolib/kube/blob/master/envs/tooling/terraform/05_github/main_rulesets.tf#L1
+#
+# For more details, read https://doctolib.atlassian.net/wiki/spaces/EE/pages/1793590015/Traceability+and+risk+assessment+for+production+changes
+
+name: '[Org workflow] Check PR title'
+run-name: '${{ github.event.pull_request.title }}'
+
+on:
+  pull_request:
+    branches: [master, main, staging]
+    types: [opened, edited, reopened, synchronize, ready_for_review]
+  merge_group:
+
+permissions:
+  pull-requests: write
+  statuses: write
+  repository-projects: read
+  actions: read
+
+jobs:
+  check_pr_title:
+    name: Check PR title
+    if: '!github.event.pull_request.draft'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR title
+        uses: doctolib/actions/check-pr-title@main

src/lib.rs

@@ -57,7 +57,6 @@ use self::c_api::{
 };
 #[cfg(target_os = "android")]
 use self::c_api::{CBLError, CBLInitContext, CBL_Init};
-#[cfg(target_os = "android")]
 use std::ffi::CStr;
 
 //////// RE-EXPORT:
@@ -124,7 +123,11 @@ impl Drop for ListenerToken {
 //////// MISC. API FUNCTIONS
 
 pub fn couchbase_lite_c_version() -> String {
-    String::from_utf8_lossy(CBLITE_VERSION).to_string()
+    CStr::from_bytes_with_nul(CBLITE_VERSION)
+        .unwrap_or_default()
+        .to_str()
+        .unwrap_or_default()
+        .to_string()
 }
 
 /** Returns the total number of Couchbase Lite objects. Useful for leak checking. */

tests/lib_test.rs

@@ -0,0 +1,10 @@
+#![cfg(test)]
+
+extern crate couchbase_lite;
+
+use couchbase_lite::*;
+
+#[test]
+fn couchbase_lite_c_version_test() {
+    assert_eq!(couchbase_lite_c_version(), "3.0.17".to_string());
+}