Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Couchbase Lite 3.0.15 #4

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#define COUCHBASE_ENTERPRISE
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "3becb76+fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:43:17Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "3becb76+8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T02:00:42Z"
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "cblite" for configuration "MinSizeRel"
set_property(TARGET cblite APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
set_target_properties(cblite PROPERTIES
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.12"
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.15"
IMPORTED_SONAME_MINSIZEREL "libcblite.so.3"
)

list(APPEND _IMPORT_CHECK_TARGETS cblite )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.12" )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.15" )

# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#define COUCHBASE_ENTERPRISE
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "3becb76+fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:40:16Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "3becb76+8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T01:57:20Z"
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "cblite" for configuration "MinSizeRel"
set_property(TARGET cblite APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
set_target_properties(cblite PROPERTIES
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.12"
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.15"
IMPORTED_SONAME_MINSIZEREL "libcblite.so.3"
)

list(APPEND _IMPORT_CHECK_TARGETS cblite )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.12" )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.15" )

# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#define COUCHBASE_ENTERPRISE
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "3becb76+fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:27:29Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "3becb76+8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T01:53:48Z"
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif()
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/* #undef COUCHBASE_ENTERPRISE */
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:30:49Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T02:07:22Z"
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "cblite" for configuration "MinSizeRel"
set_property(TARGET cblite APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
set_target_properties(cblite PROPERTIES
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.12"
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.15"
IMPORTED_SONAME_MINSIZEREL "libcblite.so.3"
)

list(APPEND _IMPORT_CHECK_TARGETS cblite )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.12" )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/aarch64-linux-gnu/libcblite.so.3.0.15" )

# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/* #undef COUCHBASE_ENTERPRISE */
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:33:55Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T02:06:57Z"
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "cblite" for configuration "MinSizeRel"
set_property(TARGET cblite APPEND PROPERTY IMPORTED_CONFIGURATIONS MINSIZEREL)
set_target_properties(cblite PROPERTIES
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.12"
IMPORTED_LOCATION_MINSIZEREL "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.15"
IMPORTED_SONAME_MINSIZEREL "libcblite.so.3"
)

list(APPEND _IMPORT_CHECK_TARGETS cblite )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.12" )
list(APPEND _IMPORT_CHECK_FILES_FOR_cblite "${_IMPORT_PREFIX}/lib/x86_64-linux-gnu/libcblite.so.3.0.15" )

# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/* #undef COUCHBASE_ENTERPRISE */
#endif

#define CBLITE_VERSION "3.0.12"
#define CBLITE_VERSION_NUMBER 3000012
#define CBLITE_BUILD_NUMBER 6
#define CBLITE_SOURCE_ID "fa52deb"
#define CBLITE_BUILD_TIMESTAMP "2023-06-02T04:27:30Z"
#define CBLITE_VERSION "3.0.15"
#define CBLITE_VERSION_NUMBER 3000015
#define CBLITE_BUILD_NUMBER 7
#define CBLITE_SOURCE_ID "8f7b90b"
#define CBLITE_BUILD_TIMESTAMP "2023-10-24T01:53:47Z"
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "3.0.12")
set(PACKAGE_VERSION "3.0.15")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("3.0.12" MATCHES "^([0-9]+)\\.")
if("3.0.15" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif()
else()
set(CVF_VERSION_MAJOR "3.0.12")
set(CVF_VERSION_MAJOR "3.0.15")
endif()

if(PACKAGE_FIND_VERSION_RANGE)
Expand Down
4 changes: 2 additions & 2 deletions examples/getting-started-compose/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
activity-compose = "1.8.0"
android-gradle-plugin = "8.1.2"
activity-compose = "1.8.1"
android-gradle-plugin = "8.1.3"
androidx-appcompat = "1.6.1"
androidx-core-ktx = "1.12.0"
compose = "1.5.10"
Expand Down
6 changes: 3 additions & 3 deletions examples/getting-started/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
android-gradle-plugin = "8.1.2"
android-gradle-plugin = "8.1.3"
androidx-appcompat = "1.6.1"
androidx-constraintlayout = "2.1.4"
androidx-core-ktx = "1.12.0"
androidx-lifecycle-ktx = "2.6.2"
androidx-material = "1.10.0"
compose = "1.5.10"
couchbase-lite-c = "3.0.12"
kmp-native-coroutines = "1.0.0-ALPHA-19"
kmp-native-coroutines = "1.0.0-ALPHA-20"
kotbase = "3.0.12-1.0.0"
kotlin = "1.9.20"
ksp = "1.9.20-1.0.13"
ksp = "1.9.20-1.0.14"

[plugins]
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
Expand Down
11 changes: 6 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
couchbase-lite-java = "3.0.12"
couchbase-lite-objc = "3.0.12"
couchbase-lite-c = "3.0.12"
kotlinx-serialization = "1.6.0"
couchbase-lite-java = "3.0.15"
couchbase-lite-objc = "3.0.15"
couchbase-lite-c = "3.0.15"
kotlinx-serialization = "1.6.1"
# 1.13.4 breaks QueryExtensionKtTest on Android https://github.com/mockk/mockk/issues/1035
# fixed in 1.13.8, but JVM source compatibility needs to be reverted to 1.8 https://github.com/mockk/mockk/pull/1161
mockk = "1.13.3"

[plugins]
android-library = { id = "com.android.library", version = "8.1.2" }
android-library = { id = "com.android.library", version = "8.1.3" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.20" }
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
Expand All @@ -28,6 +28,7 @@ kermit = { module = "co.touchlab:kermit", version = "2.0.2" }
korlibs-korio = { module = "com.soywiz.korlibs.korio:korio", version = "4.0.10" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
# 0.23.0 fails to build with kotlinx-coroutines 1.7.3 https://github.com/Kotlin/kotlinx-atomicfu/issues/365
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.22.0" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.1" }
Expand Down