Merge release/4.1 into master (#126)

* CBL-8389 : Add kotlinx-serialization to android-ktx builds (#120)

* Add kotlinx-serialization-core dependency to android-ktx lib.
* Apply kotlin-serialization plugin and add kotlinx-serialization-core to the android-ktx test app.

* Export NativeC4Replicator_getCorrelationId JNI symbol (#118)

Exported the missing NativeC4Replicator_getCorrelationId JNI symbol for android, linux and windows CE.

* Add in targets to preserve unstripped libLiteCoreJNI.so (#124)

This will allow after the fact symbolification

* Warn release only on opened

---------

Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com>

Author: borrrden

.github/workflows/warn_release.yml

@@ -1,6 +1,7 @@
 on:
   pull_request:
-    branches: ['**/release/**']
+    types: [opened]
+    branches: ["**/release/**"]
 
 jobs:
   warn-release:

android-ktx/lib/build.gradle.kts

@@ -182,6 +182,7 @@ dependencies {
     compileOnly(libs.androidx.annotation)
 
     implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.serialization.core)
     implementation(libs.androidx.work.runtime.ktx)
     implementation("com.couchbase.lite:${cblAndroidLib}:${buildVersion}")
 

android-ktx/test/build.gradle.kts

@@ -24,6 +24,7 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 
@@ -160,6 +161,7 @@ dependencies {
     compileOnly(libs.androidx.annotation)
 
     implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.serialization.core)
 
     // Work Manager support
     implementation(libs.androidx.work.runtime.ktx)

android/etc/jenkins/publish.sh

@@ -41,5 +41,11 @@ curl --remote-name "${MAVEN_URL}/${LIB_NAME}/${BUILD}/${LIB_NAME}-${BUILD}-javad
 curl --remote-name "${MAVEN_URL}/${LIB_NAME}/${BUILD}/${LIB_NAME}-${BUILD}-sources.jar"
 popd
 
+# Unstripped native libs (full symbols, same BuildID as the stripped libs in the
+# AAR).  Not published to Maven; staged here for the Jenkins archive step.
+# Feed to addr2line / etc/ensym_linux.pl to symbolicate field crashes.
+echo "======== Copy native symbols to staging directory"
+cp lib/build/outputs/native-symbols/*.zip "${ARTIFACTS}/" || echo "WARNING: no native symbols to archive"
+
 echo "======== PUBLICATION COMPLETE Couchbase Lite Android, Community Edition"
 

android/lib/build.gradle.kts

@@ -103,6 +103,12 @@ android {
             cmake { targets("LiteCoreJNI") }
         }
 
+        // Restrict the native build to specific ABIs, e.g. -PnativeAbis=arm64-v8a
+        // Defaults to all ABIs (no filter) so CI builds are unchanged.
+        (project.findProperty("nativeAbis") as String?)
+            ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            ?.let { ndk { abiFilters.addAll(it) } }
+
         buildConfigField("String", "VERSION_NAME", "\"${buildVersion}\"")
         buildConfigField("String", "BUILD_TIME", "\"${buildTime}\"")
         buildConfigField("String", "BUILD_COMMIT", "\"${buildCommit}\"")
@@ -513,7 +519,19 @@ tasks.register("ciCheck") {
     dependsOn("checkstyle", "lint", "pmd", "spotbugsXml", "test")
 }
 tasks.register("ciBuild") {
-    dependsOn("assembleRelease")
+    dependsOn("assembleRelease", "packageNativeSymbols")
+}
+
+// Archive the unstripped release .so (full symbols, same BuildID as the stripped
+// lib in the AAR) so crashes from shipped builds can be symbolicated.  Kept out
+// of the published AAR on purpose; archive this zip from CI alongside the AAR.
+tasks.register<Zip>("packageNativeSymbols") {
+    dependsOn("mergeReleaseNativeLibs")
+    archiveFileName.set("$cblArtifactId-$buildVersion-native-symbols.zip")
+    destinationDirectory.set(layout.buildDirectory.dir("outputs/native-symbols"))
+    from(layout.buildDirectory.dir("intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib")) {
+        include("**/*.so")
+    }
 }
 tasks.register("ciPublish") {
     dependsOn("javadocJar", "generatePomFileForLibReleasePublication", "publishLibReleasePublicationToMavenRepository")