Fix Jenkins PR Validation

* iOS :
- Fixed and simplify script to download the right CBL and VS binary.

* C :
- Applied the same method as iOS get the lastest CBL version.
- Removed obsolete logging code snippet as the API has been changed in 4.0

*  Android:
- Updated AGP from 8.0.2 to 8.13.2 to fix JDK 21 incompatibility issue.
- Update Android script to get CBL and VS version based on isReleased flag.

Author: pasin

jenkins/android_build.sh

@@ -70,8 +70,35 @@ fi
 CBL_URL="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-android&version=${CBL_VERSION}"
 VS_URL="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-android-vector-search&version=${VS_VERSION}"
 
-CBL_BUILD=$(curl -s $CBL_URL | $JQ -r '.BuildNumber')
-VS_BUILD=$(curl -s $VS_URL | $JQ -r '.BuildNumber')
+CBL_RESPONSE=$(curl -s $CBL_URL)
+CBL_IS_RELEASE=$(echo -n "$CBL_RESPONSE" | $JQ -r '.IsRelease')
+CBL_BUILD=$(echo -n "$CBL_RESPONSE" | $JQ -r '.BuildNumber')
+
+if [ "${CBL_BUILD}" == "" ] || [ "${CBL_BUILD}" == "null" ]; then
+    echo "No latest successful build found for CBL v${CBL_VERSION}"
+    exit 3
+fi
+
+VS_RESPONSE=$(curl -s $VS_URL)
+VS_IS_RELEASE=$(echo -n "$VS_RESPONSE" | $JQ -r '.IsRelease')
+VS_BUILD=$(echo -n "$VS_RESPONSE" | $JQ -r '.BuildNumber')
+
+if [ "${VS_BUILD}" == "" ] || [ "${VS_BUILD}" == "null" ]; then
+    echo "No latest successful build found for VS v${VS_VERSION}"
+    exit 3
+fi
+
+if [ "${CBL_IS_RELEASE}" == "true" ]; then
+    CBL_VERSION_ARG="${CBL_VERSION}"
+else
+    CBL_VERSION_ARG="${CBL_VERSION}-${CBL_BUILD}"
+fi
+
+if [ "${VS_IS_RELEASE}" == "true" ]; then
+    VS_VERSION_ARG="${VS_VERSION}"
+else
+    VS_VERSION_ARG="${VS_VERSION}-${VS_BUILD}"
+fi
 
 pushd $ANDROID_DIR/examples/
-./gradlew assembleDebug -PcblVersion=$CBL_VERSION-$CBL_BUILD -PextVersion=$VS_VERSION-$VS_BUILD
+./gradlew assembleDebug -PcblVersion=${CBL_VERSION_ARG} -PextVersion=${VS_VERSION_ARG}

jenkins/c_build.sh

@@ -2,23 +2,41 @@
 
 if [[ "$#" -ne 1 ]]; then
     echo "This script requires a version argument"
+    exit 1
 fi
 
-THIS_DIR=$( dirname -- $(realpath "$0"); )
-version="$1"
+THIS_DIR=$( dirname -- $(realpath "$0") )
+CBL_VERSION="$1"
 pushd "$THIS_DIR/../modules/c/examples/code_snippets"
 
-build_num=$(curl -s http://dbapi.build.couchbase.com:8000/v1/products/couchbase-lite-c/releases/$version/versions/$version/builds?filter=last_complete | jq .build_num | bc)
+RESPONSE=$(curl -s "http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-c&version=${CBL_VERSION}")
+CBL_IS_RELEASE=$(echo -n "$RESPONSE" | jq .IsRelease)
+CBL_BUILD_NO=$(echo -n "$RESPONSE" | jq .BuildNumber)
+
+if [ "${CBL_BUILD_NO}" == "" ] || [ "${CBL_BUILD_NO}" == "null" ]; then
+    echo "No latest successful build found for CBL v${CBL_VERSION}"
+    exit 3
+fi
+
+if [ "${CBL_IS_RELEASE}" == "true" ]; then
+    PACKAGE_NAME="couchbase-lite-c-enterprise-${CBL_VERSION}-linux-x86_64.tar.gz"
+    DOWNLOAD_URL="https://latestbuilds.service.couchbase.com/builds/releases/mobile/couchbase-lite-c/${CBL_VERSION}/${PACKAGE_NAME}"
+else
+    PACKAGE_NAME="couchbase-lite-c-enterprise-${CBL_VERSION}-${CBL_BUILD_NO}-linux-x86_64.tar.gz"
+    DOWNLOAD_URL="https://latestbuilds.service.couchbase.com/builds/latestbuilds/couchbase-lite-c/${CBL_VERSION}/${CBL_BUILD_NO}/${PACKAGE_NAME}"
+fi
+
+rm -rf downloaded
 mkdir -p downloaded
 
 pushd downloaded
 DOWNLOAD_DIR=$(pwd)
-wget http://latestbuilds.service.couchbase.com/builds/latestbuilds/couchbase-lite-c/$version/$build_num/couchbase-lite-c-enterprise-$version-$build_num-linux-x86_64.tar.gz
-tar xf couchbase-lite-c-enterprise-$version-$build_num-linux-x86_64.tar.gz
-rm couchbase-lite-c-enterprise-$version-$build_num-linux-x86_64.tar.gz
+wget "${DOWNLOAD_URL}"
+tar xf "${PACKAGE_NAME}"
+rm "${PACKAGE_NAME}"
 popd
 
 mkdir -p build
 pushd build
-cmake -DCMAKE_PREFIX_PATH="$DOWNLOAD_DIR/libcblite-$version" ..
+cmake -DCMAKE_PREFIX_PATH="$DOWNLOAD_DIR/libcblite-${CBL_VERSION}" ..
 make -j12

jenkins/ios.sh

@@ -3,72 +3,74 @@
 CBL_VERSION=$1
 VS_VERSION=$2
 
-dir=$( dirname -- $(realpath "$0"); )
-
-# Get latest good CBL iOS EE build for given version
-CBL_URL="http://proget.build.couchbase.com:8080/api/open_latestbuilds?product=couchbase-lite-ios&version=${cbl_version}"
+if [ -z "${CBL_VERSION}" ] || [ -z "${VS_VERSION}" ]; then
+    echo "Usage: $0 <CBL_VERSION> <VS_VERSION>"
+    exit 1
+fi
 
-# Grab the redirect url
-CBL_SOURCE_URL=$(curl -s -L -o /dev/null -w '%{url_effective}' "${CBL_URL}")
+dir=$( dirname -- $(realpath "$0") )
 
 CBL="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-ios&version=${CBL_VERSION}"
 RESPONSE=$(curl -s $CBL)
-CBL_IS_RELEASE=$(echo -n $RESPONSE | jq .IsRelease)
-CBL_BUILD_NO=$(echo -n $RESPONSE | jq .BuildNumber)
+CBL_IS_RELEASE=$(echo -n "$RESPONSE" | jq .IsRelease)
+CBL_BUILD_NO=$(echo -n "$RESPONSE" | jq .BuildNumber)
 
-if [ "${CBL_BUILD_NO}" == "" ]
+if [ "${CBL_BUILD_NO}" == "" ] || [ "${CBL_BUILD_NO}" == "null" ]
 then
     echo "No latest successful build found for CBL v${CBL_VERSION}"
     exit 3
 fi
 
 VS="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-ios-vector-search&version=${VS_VERSION}&ee=true"
 RESPONSE=$(curl -s $VS)
-VS_BUILD_NO=$(echo -n $RESPONSE | jq .BuildNumber)
+VS_IS_RELEASE=$(echo -n "$RESPONSE" | jq .IsRelease)
+VS_BUILD_NO=$(echo -n "$RESPONSE" | jq .BuildNumber)
 
-if [ "${VS_BUILD_NO}" == "" ]
+if [ "${VS_BUILD_NO}" == "" ] || [ "${VS_BUILD_NO}" == "null" ]
 then
     echo "No latest successful build found for VS v${VS_VERSION}"
     exit 3
 fi
 
+# Download VS extension once (platform-independent)
+if [ "${VS_IS_RELEASE}" == "true" ]; then
+    VS_PACKAGE_NAME="couchbase-lite-vector-search-${VS_VERSION}-apple.zip"
+    VS_URL="https://latestbuilds.service.couchbase.com/builds/releases/mobile/couchbase-lite-vector-search/${VS_VERSION}/${VS_PACKAGE_NAME}"
+else
+    VS_PACKAGE_NAME="couchbase-lite-vector-search-${VS_VERSION}-${VS_BUILD_NO}-apple.zip"
+    VS_URL="https://latestbuilds.service.couchbase.com/builds/latestbuilds/couchbase-lite-vector-search/${VS_VERSION}/${VS_BUILD_NO}/${VS_PACKAGE_NAME}"
+fi
+
+VS_DOWNLOAD_DIR="${dir}/../vs_downloaded"
+rm -rf "${VS_DOWNLOAD_DIR}"
+mkdir -p "${VS_DOWNLOAD_DIR}"
+wget -P "${VS_DOWNLOAD_DIR}" "${VS_URL}"
+
 for PLATFORM in "objc" "swift"
 do
     echo $PLATFORM
     pushd "${dir}/../modules/${PLATFORM}/examples"
 
     # In case script fails mid-way, cleanup on start
-    if [ -d "downloaded" ]; then
-        rm -rf "downloaded"
-    fi
+    rm -rf "downloaded"
     mkdir -p downloaded
 
     pushd downloaded
-    # Get CBL
-    CBL_SOURCE_URL=$(curl -s -L -o /dev/null -w '%{url_effective}' "http://proget.build.couchbase.com:8080/api/open_latestbuilds?product=couchbase-lite-ios&version=${CBL_VERSION}")
 
-    if [ $CBL_IS_RELEASE == true ]; then
+    # Get CBL
+    if [ "${CBL_IS_RELEASE}" == "true" ]; then
         CBL_PACKAGE_NAME="couchbase-lite-${PLATFORM}_xc_enterprise_${CBL_VERSION}.zip"
+        CBL_URL="https://latestbuilds.service.couchbase.com/builds/releases/mobile/couchbase-lite-ios/${CBL_VERSION}/${CBL_PACKAGE_NAME}"
     else
         CBL_PACKAGE_NAME="couchbase-lite-${PLATFORM}_xc_enterprise_${CBL_VERSION}-${CBL_BUILD_NO}.zip"
+        CBL_URL="https://latestbuilds.service.couchbase.com/builds/latestbuilds/couchbase-lite-ios/${CBL_VERSION}/${CBL_BUILD_NO}/${CBL_PACKAGE_NAME}"
     fi
 
-    wget "$CBL_SOURCE_URL$CBL_PACKAGE_NAME"
-    unzip -o $CBL_PACKAGE_NAME -d "../Frameworks/"
+    wget "${CBL_URL}"
+    unzip -o "${CBL_PACKAGE_NAME}" -d "../Frameworks/"
 
     # Get VS extension
-    VS_SOURCE_URL=$(curl -s -L -o /dev/null -w '%{url_effective}' "http://proget.build.couchbase.com:8080/api/open_latestbuilds?product=couchbase-lite-ios-vector-search&version=${VS_VERSION}")
-    echo $VS_SOURCE_URL
-    VS_PACKAGE_NAME="couchbase-lite-vector-search-${VS_VERSION}-${VS_BUILD_NO}-apple.zip"
-    wget "$VS_SOURCE_URL$VS_PACKAGE_NAME"
-    unzip -o $VS_PACKAGE_NAME -d "../Frameworks/"
-
-    # Check if download was successful
-    if [ $? -eq 0 ]; then
-        echo "Package downloaded successfully."
-    else
-        echo "Failed to download the package."
-    fi
+    unzip -o "${VS_DOWNLOAD_DIR}/${VS_PACKAGE_NAME}" -d "../Frameworks/"
 
     popd
 
@@ -79,3 +81,5 @@ do
     popd
 
 done
+
+rm -rf "${VS_DOWNLOAD_DIR}"

modules/android/examples/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
     }
 }
 

modules/android/examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/android/examples/java_snippets/app/build.gradle

@@ -33,10 +33,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        disable 'UseSparseArrays'
-        abortOnError false
-    }
 
     sourceSets {
         main {
@@ -46,6 +42,10 @@ android {
             ]
         }
     }
+    lint {
+        abortOnError false
+        disable 'UseSparseArrays'
+    }
 }
 
 repositories {

modules/c/examples/code_snippets/main.cpp

@@ -1688,10 +1688,6 @@ static void start_replication() {
 }
 
 static void console_log_sink() {
-    // tag::console-logging[]
-    CBLLog_SetConsoleLevel(kCBLLogVerbose);
-    // end::console-logging[]
-
     // tag::new-console-logging[]
     CBLConsoleLogSink logSink {};
     logSink.level = kCBLLogVerbose;
@@ -1701,23 +1697,6 @@ static void console_log_sink() {
 }
 
 static void file_log_sink() {
-    // tag::file-logging[]
-    // NOTE: No error handling, for brevity (see getting started)
-
-    // NOTE: You will need to use a platform appropriate method for finding
-    // a temporary directory
-
-    CBLLogFileConfiguration config {}; // Don't bother zeroing, since we set all properties
-    config.level = kCBLLogInfo;
-    config.directory = FLSTR("/tmp/logs");;
-    config.maxRotateCount = 12;
-    config.maxSize = 1048576;
-    config.usePlaintext = false;
-
-    CBLError err{};
-    CBLLog_SetFileConfig(config, &err);
-    // end::file-logging[]
-
     // tag::new-file-logging[]
     CBLFileLogSink logSink {};
     logSink.level = kCBLLogVerbose;
@@ -1742,10 +1721,6 @@ static void custom_log_sink_callback(CBLLogDomain domain, CBLLogLevel level, FLS
 // end::new-custom-logging[]
 
 static void enable_custom_log_sink() {
-    // tag::set-custom-logging[]
-    CBLLog_SetCallback(custom_log_callback);
-    // end::set-custom-logging[]
-
     // tag::set-new-custom-logging[]
     CBLCustomLogSink logSink {};
     logSink.level = kCBLLogVerbose;

modules/objc/examples/code_snippets/SampleCodeTest.m

@@ -683,11 +683,12 @@ - (void) dontTestCollectionOperatorIn {
         [CBLQueryExpression property:@"last"],
         [CBLQueryExpression property:@"username"]];
 
-    [CBLQueryBuilder select:@[[CBLQuerySelectResult all]]
+    CBLQuery *query = [CBLQueryBuilder select:@[[CBLQuerySelectResult all]]
         from:[CBLQueryDataSource collection:self.collection]
         where:[[CBLQueryExpression string:@"Armani"] in:values]];
-    NSLog(@"%@", query);
     // end::query-collection-operator-in[]
+    
+    NSLog(@"%@", query);
 }
 
 - (void) dontTestLikeOperator {