Skip to content

Commit 95b0721

Browse files
RichardSmedleypasiniamfortuneborrrden
authored and
osfameron
committed
some initial framework for comments/improvements (#981)
* some initial framework for comments/improvements * Update gs-prereqs.adoc * recommended version? * interim comment incorporation * Advantages * initial uml diagram * interim halt - moving work to Swift pages * from Androided doc, added mesh note * Configuration * Filling out example text * Active-passive * Tidy-up * Android --> Swift * mermaid --> graphviz * diagram is fixed * no patches yet * compat updates 3.3 * comment out (fix) * comment out (fix) * column fix * 3.3 release * dot O * 3.3 updates * Java 3.3 * ObjC 3.3 * 3.3 Android * comment out and point to iOS * --> Swift * --> 3.3 * table fix * Deprecation * table fix * table fix * Add swift and objective-c code snippets for MultipeerReplicator (#988) * The code snippet file names are MultipeerReplicator.swift (Swift) and MultipeerReplicator.m (Objective-C) * Update iOS code snippet (#991) * Updated peerIdentity codesnippet to delete the expired identity before creating a new one. * Added multipeer-logdomain snippet. * Fixed Jenkinsfile * Update page structure (#989) * restructured page structure and headers * remove duplicate * remove duplicate * restructured headers * updated restructure headers * update jenkensfile * multipeer sync for kotlin android (#994) * multipeer sync for kotlin android * update formatting * add content for config * update the example code path * update include code samples tag * updated to reflect swift code * Update iOS's authenticatorWithRootCerts() and peerIdentity() code snippet (#998) * Update authenticatorWithRootCerts and peerIdentity code snippet Updated authenticatorWithRootCerts and peerIdentity code snippet according to the API changes. * Fix iOS version in Jenkinsfile * Multipeer sync p2p docs update (#997) * updated transport modes * added what's new and updated android sync * fix style guide * remove older versions * updated texts to reflect new changes * Release notes 3.3 (#999) * release notes for android cbl 3.3 * release notes ios cbl-3.3 * updated timeline to august from july * Add code snippet for creating a self-signed identity (#1001) * Fix bug not deleting the expired identity in objective-c code snippet (#1002) * updated the docs, including tips (#1000) * updated the docs, including tips * added Bonjour config requirement * ventilated prose * multipeer supprt * fix xml formatting * move signed into peer identity * self signed identity tag * Add multipeer examples for Android (#1003) * Add multipeer examples for Android As part of this also add in PR validation to make sure that Android snippets remain buildable, and cleanup some warnings in existing snippets (nothing that shows in the docs will be affected, it's just to make real warnings when building more noticeable) * Use correct shebang * Download jq if not present * connect code examples, fix tag errors * update release notes * updated swift release note * update release months for whats new + release note * update month to september --------- Co-authored-by: Pasin Suriyentrakorn <[email protected]> Co-authored-by: Fortune Ikechi <[email protected]> Co-authored-by: Fortune Ikechi <[email protected]> Co-authored-by: Jim Borden <[email protected]>
1 parent c0d1bb3 commit 95b0721

File tree

119 files changed

+4139
-4629
lines changed

Some content is hidden

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

119 files changed

+4139
-4629
lines changed

‎Jenkinsfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
pipeline {
22
agent none
33
options {
4-
timeout(time: 10, unit: 'MINUTES')
4+
timeout(time: 10, unit: 'MINUTES')
55
}
66
stages {
77
stage("Validate Build") {
88
parallel {
99
stage("Validate C#") {
1010
agent { label 's61113u16 (litecore)' }
1111
steps {
12-
sh 'jenkins/dotnet_build.sh 3.3.0 1.0.0'
12+
sh 'jenkins/dotnet_build.sh 3.2.4 1.0.0'
1313
}
1414
}
1515
stage("Validate C") {
1616
agent { label 's61113u16 (litecore)' }
1717
steps {
18-
sh 'jenkins/c_build.sh 3.3.0'
18+
sh 'jenkins/c_build.sh 3.2.4'
1919
}
2020
}
2121
stage("Validate iOS") {
@@ -24,6 +24,12 @@ pipeline {
2424
sh 'jenkins/ios.sh 3.3.0 1.0.0'
2525
}
2626
}
27+
stage("Validate Android") {
28+
agent { label 'cbl-android' }
29+
steps {
30+
sh 'jenkins/android_build.sh 3.3.0 1.0.0'
31+
}
32+
}
2733
}
2834
}
2935
}

‎antora.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ asciidoc:
1717
prerelease:
1818
previous-release:
1919
release: '3.3'
20+
2021
# releasetag:
2122
major: 3
2223
minor: 3
23-
maintenance-ios: 3
24-
maintenance-swift: 3
25-
maintenance-c: 3
26-
maintenance-android: 3
27-
maintenance-java: 3
28-
maintenance-net: 3
29-
base: 3
24+
maintenance-ios: 0
25+
maintenance-swift: 0
26+
maintenance-c: 0
27+
maintenance-android: 0
28+
maintenance-java: 0
29+
maintenance-net: 0
30+
base: 0
3031

3132
# Used for Vector Search Extension.
3233
vs-major: 1
@@ -37,5 +38,6 @@ asciidoc:
3738
vs-maintenance-android: 0
3839
vs-maintenance-java: 0
3940
vs-maintenance-net: 0
41+
4042
page-toclevels: 2@
4143
# NB: `preview` config now in preview/HEAD.yml, please update

‎jenkins/android_build.sh‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#!/bin/bash -e
2+
3+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
4+
5+
CBL_VERSION="$1"
6+
VS_VERSION="$2"
7+
8+
ANDROID_DIR=$SCRIPT_DIR/../modules/android
9+
10+
if ! hash curl >/dev/null 2>&1; then
11+
echo "curl not found, aborting..."
12+
exit 1
13+
fi
14+
15+
if hash jq 2>/dev/null; then
16+
JQ=jq
17+
else
18+
echo "jq is not installed, downloading a local copy..."
19+
20+
# Detect OS and architecture
21+
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
22+
ARCH=$(uname -m)
23+
24+
case "$OS" in
25+
linux)
26+
case "$ARCH" in
27+
x86_64|amd64)
28+
JQ_BINARY="jq-linux-amd64"
29+
;;
30+
aarch64|arm64)
31+
JQ_BINARY="jq-linux-arm64"
32+
;;
33+
*)
34+
echo "Unsupported Linux architecture: $ARCH"
35+
exit 1
36+
;;
37+
esac
38+
;;
39+
darwin)
40+
case "$ARCH" in
41+
x86_64|amd64)
42+
JQ_BINARY="jq-macos-amd64"
43+
;;
44+
arm64)
45+
JQ_BINARY="jq-macos-arm64"
46+
;;
47+
*)
48+
echo "Unsupported macOS architecture: $ARCH"
49+
exit 1
50+
;;
51+
esac
52+
;;
53+
*)
54+
echo "Unsupported operating system: $OS"
55+
exit 1
56+
;;
57+
esac
58+
59+
JQ_URL="https://github.com/jqlang/jq/releases/download/jq-1.8.1/${JQ_BINARY}"
60+
echo "Downloading jq for $OS/$ARCH: $JQ_URL"
61+
62+
# Download jq using curl
63+
curl -L "$JQ_URL" -o /tmp/jq-local
64+
65+
chmod +x /tmp/jq-local
66+
JQ=/tmp/jq-local
67+
fi
68+
69+
70+
CBL_URL="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-android&version=${CBL_VERSION}"
71+
VS_URL="http://proget.build.couchbase.com:8080/api/get_version?product=couchbase-lite-android-vector-search&version=${VS_VERSION}"
72+
73+
CBL_BUILD=$(curl -s $CBL_URL | $JQ -r '.BuildNumber')
74+
VS_BUILD=$(curl -s $VS_URL | $JQ -r '.BuildNumber')
75+
76+
pushd $ANDROID_DIR/examples/
77+
./gradlew assembleDebug -PcblVersion=$CBL_VERSION-$CBL_BUILD -PextVersion=$VS_VERSION-$VS_BUILD

0 commit comments

Comments
 (0)