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

Merge branch 'release/3.2' #3308

Merged
merged 34 commits into from
Jul 23, 2024
Merged

Merge branch 'release/3.2' #3308

merged 34 commits into from
Jul 23, 2024

Conversation

pasin
Copy link
Contributor

@pasin pasin commented Jul 22, 2024

The followings are conflicts that have been resolved:

  • CouchbaseLite-Swift.podspec
  • CouchbaseLite.podspec
  • CouchbaseLite.xcodeproj/project.pbxproj
  • Objective-C/Exports/CBL.txt
  • Objective-C/Exports/CBL_EE.txt
  • Objective-C/Exports/Generated/CBL.exp
  • Objective-C/Exports/Generated/CBL_EE.exp
  • Objective-C/Tests/VectorSearchTest.m
  • README.md
  • Scripts/generate_objc_release_zip.sh
  • Swift/Tests/VectorSearchTest.swift

Companion PR : https://github.com/couchbaselabs/couchbase-lite-ios-ee/pull/243

pasin and others added 30 commits March 15, 2024 14:59
NSPrivacyAccessedAPITypes and NSPrivacyCollectedDataTypes are required for generating the App’s privacy report even though in the Apple doc, the only required key for 3rd party SDK is NSPrivacyAccessedAPITypes. This commit adds all keys in case the other keys are required in the future by Apple.
* Test 5, 6, 10, 11, 12, 13, 14, 16, 17, 18, 20, 22, 23, 24, 25 : Use centroids = 8.
* Test 5, 6, 7, 8, 9, 10, 11, 12, 14, 17, 18, 20, 22, 24, 25 : Verify that the index is trained.
* Test16 : Verify that the index is untrained.
* Test 20 : Add the step to create the query after the index was deleted.
* Without explicitly set the version, the tool intelligently picks the version number from the podspec file. This may be OK unless we forgot to update the version in the podspec or we cannot update the version until the release time.

* Explicitly set the version number when generating the doc. If the version is not specified, there will be no version shown in the doc.
* update VS version

* update LiteCore to 3.2.0-159

* disable check for trained index to pass test
* import private module defined in modulemap

* check for errors using swift definitions instead of obj-c
* set project to macos 12 and fix issues

* remove MYAnonymousIdentity from project - not used

* update LiteCore

* change from long to double to handle floating comparison testExpiryNoGreaterThanDate
* Ported the fix from release/3.1 branch.

* Used the same approach as CBL-C to generate CE and EE exported symbole file. The workflow will be updating CBL.txt or CBL_EE.txt (Contains EE only symbols) at Objective-C/Exports folder and run generate_exports.sh script. The final export symbol files will be in the Objective-C/Exports/Generated folder.

* Ensured to include all symbols by cross checking with the symbols extracted from the header files.

* Removed obsoleted predefined classes which don’t exist anymore.
… instance (#3278)

* init logging for MutableDocument

* fix typo
* fix obj-c ref in swift api

* fix some other mistakes or spacing within Swift API Docs
…cument is saved (#3287)

* change Document.collection API

* add tests

* remove TODO
* Update LiteCore to 3.2.9-189
* Updated LiteCore to 3.2.9-189.
* Updated VS extension to 1.0.0-42.
* I have noticed that recently the macOS agent on Github Action is much slower than before. I have added `expTimeout` variable for the default expectation timeout and increased a timeout to 20 seconds.
…ack (#3285)

* Directly ported the fix from release/3.1 branch.

* Implemented CBLContextManager class for retaining and mapping the object with its pointer value which can be used as  the context for LiteCore's callbacks (e.g. use when creating c4queryobserver objects). The implementation simply stores the object in a map by using its memory address as the key and returns the memory address as the pointer value.

* Updated CBLQueryObserver to use CBLContextManager to make sure that the released query context can be detected and not be used. When using the query context, the query context is retained.

* Added a test for CBSE-16662 which is related to this issue and two tests to check that there are no notification received without crash (CBL-5660) after removing the token.

* Added an internal debug build only C4QueryObserverCallbackDelayInterval config for testing the fix.
- Update to LiteCore 3.2.0-195 and VS-43
* build for test only in Actions

* build and test for both macOS and iOS in Jenkins
…ng (#3294)

* Updated test 3 and added test 27.
* The implementation update is in the EE repo.
* Implemented Lazy Vector Index and Test for Swift
* Refactored VectorSearchTest in both Swift and Objective-C to reduce duplicate codes.
* Updated some API docs.
* The companion change commit is in the EE repo.
* Implemented Replicator log heiroglyphics by using symbols to describe replicator.

* Removed ":" that separates log meesage and the replicator heiroglyphics as it seems to be redundant.
* Implemented Extension.enableVectorSearch in both Objective-C and Swift.

* Moved the logic from CBLDatabase.mm to CBLExtension in ee repo.

* Used LiteCore 61cfa302d61b8baef2c2cfeeb79c24653e1603a0 temporarily to allow the function to be implemented.
…lt value (#3298)

* add numProbes property and fix tests

* all VS tests enabled now

* LiteCore 3.2.0-210

* update VS to 1.0.0-52

* rename test class names
* update Defaults and exported symbols

* fix isLazy
Made the CBLErrors.h a private header for CBL_Swift and CBL_EE_Swift target.
* Fixed the circular reference b/w CBLCollection and CBLQueryIndex.
* Fixed warning in tests.
… called beforehand (#3302)

* Update test 26/27 per new behaviour

* LiteCore 3.2.0-211
* update defaults for euclideanSquare

* fix tests
* Used new Vector Search SQL in Tests
* Separated the base xctest class to have no tests, otherwise the tests in the base class will be included in the sub classes as well.
* Used forward declaration where possibles in CBLQueryIndex / CBLIndexUpdater implementation.
* Fixed warning in URLEndpointListenerTests and Replicator Tests.
* Used LiteCore 3.2.0-215 and VS 1.0.0-56
pasin added 4 commits July 11, 2024 14:41
* Fixed _kCBLDefaultLogFileUsePlaintext symbol.
* Added missing deprecated kCBLDefaultLogFileUsePlainText.
* Used LiteCore RC v3.2.0-219 (554bf8f7)
* Used VS 1.0.0-57
* Fixed objective-c API doc generating script.
* Fixed VectorSearchTest 17 and 26.
* Removed non-existing file from xcode project.
* Updated LiteCore to 3.2.0-220.
* Used VS 1.0.0-58.
* Fixed an incorrect test name.
The followings are conflicts that have been resolved:
#	CouchbaseLite-Swift.podspec
#	CouchbaseLite.podspec
#	CouchbaseLite.xcodeproj/project.pbxproj
#	Objective-C/Exports/CBL.txt
#	Objective-C/Exports/CBL_EE.txt
#	Objective-C/Exports/Generated/CBL.exp
#	Objective-C/Exports/Generated/CBL_EE.exp
#	Objective-C/Tests/VectorSearchTest.m
#	README.md
#	Scripts/generate_objc_release_zip.sh
#	Swift/Tests/VectorSearchTest.swift
@pasin
Copy link
Contributor Author

pasin commented Jul 22, 2024

The submodule check failed because it's still using LiteCore 3.2. I will update to use the latest LiteCore when LiteCore 3.2 is merged into master branch.

@pasin pasin requested review from bmeike, velicuvlad and borrrden and removed request for bmeike, borrrden and velicuvlad July 22, 2024 22:02
@pasin pasin merged commit 00e5433 into master Jul 23, 2024
8 of 9 checks passed
@pasin pasin deleted the merge-3.2 branch July 23, 2024 00:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants