Skip to content

Commit 1603aa5

Browse files
committed
Validated against 3.2 branch
Up to date with the 3.2 branch at release 3.2.4 Commit c4cc4e8
1 parent 6d059fc commit 1603aa5

3 files changed

Lines changed: 97 additions & 95 deletions

File tree

android/lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ task checkstyle(type: Checkstyle) {
326326
pmd {
327327
toolVersion PMD_VERSION
328328
ruleSets = []
329-
}
329+
}
330330
task pmd(type: Pmd) {
331331
description 'PMD'
332332
group 'verification'

common/main/kotlin/com/couchbase/lite/ConfigurationFactories.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ val DatabaseConfigurationFactory: DatabaseConfiguration? = null
3737
*/
3838
fun DatabaseConfiguration?.newConfig(
3939
databasePath: String? = null,
40-
fullSync: Boolean? = null
40+
fullSync: Boolean? = null,
41+
mMapEnabled: Boolean? = null,
4142
): DatabaseConfiguration {
4243
val config = DatabaseConfiguration()
4344

4445
(databasePath ?: this?.directory)?.let { config.directory = it }
4546
(fullSync ?: this?.isFullSync)?.let { config.setFullSync(it) }
47+
(mMapEnabled ?: this?.isMMapEnabled)?.let { config.setMMapEnabled(it) }
4648

4749
return config
4850
}

java/notices.txt

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Copyright 2022
2-
3-
[couchbase-lite-java : 3.2.0]
4-
5-
6-
Components:
7-
8-
jsonsl 20171103-snapshot-684b60f9 : MIT License
9-
Kotlin 1.8.21 : Apache License 2.0
10-
kotlin-stdlib-common 1.8.21 : Apache License 2.0
11-
leetal/ios-cmake 3.1.0 : BSD 3-clause "New" or "Revised" License
12-
libb64 1.2.1 : Creative Commons Public Domain Dedication and Certification
13-
libstemmer 0 : BSD 3-clause "New" or "Revised" License
14-
mbed TLS 2.28.1 : Apache License 2.0
15-
OkHttp 4.12.0 : Apache License 2.0
16-
OkIO 3.6.0 : Apache License 2.0
17-
org.jetbrains.kotlin:kotlin-stdlib 1.8.21 : Apache License 2.0
18-
SQLite 3.32.1 : Public Domain
19-
sqlite3-unicodesn 20160920-snapshot-af75748c : Public Domain
20-
SQLiteCpp 2.0.0 : MIT License
21-
zlib 1.2.12 : zlib License
22-
23-
Licenses:
24-
25-
Apache License 2.0
26-
(Kotlin 1.7.20, kotlin-stdlib-common 1.7.20, mbed TLS 2.28.1, OkHttp 3.14.7, OkIO 1.17.2, org.jetbrains.kotlin:kotlin-stdlib 1.7.20)
27-
1+
Copyright 2022
2+
3+
[couchbase-lite-java : 3.2.0]
4+
5+
6+
Components:
7+
8+
jsonsl 20171103-snapshot-684b60f9 : MIT License
9+
Kotlin 1.8.21 : Apache License 2.0
10+
kotlin-stdlib-common 1.8.21 : Apache License 2.0
11+
leetal/ios-cmake 3.1.0 : BSD 3-clause "New" or "Revised" License
12+
libb64 1.2.1 : Creative Commons Public Domain Dedication and Certification
13+
libstemmer 0 : BSD 3-clause "New" or "Revised" License
14+
mbed TLS 2.28.1 : Apache License 2.0
15+
OkHttp 4.12.0 : Apache License 2.0
16+
OkIO 3.6.0 : Apache License 2.0
17+
org.jetbrains.kotlin:kotlin-stdlib 1.8.21 : Apache License 2.0
18+
SQLite 3.32.1 : Public Domain
19+
sqlite3-unicodesn 20160920-snapshot-af75748c : Public Domain
20+
SQLiteCpp 2.0.0 : MIT License
21+
zlib 1.2.12 : zlib License
22+
23+
Licenses:
24+
25+
Apache License 2.0
26+
(Kotlin 1.7.20, kotlin-stdlib-common 1.7.20, mbed TLS 2.28.1, OkHttp 3.14.7, OkIO 1.17.2, org.jetbrains.kotlin:kotlin-stdlib 1.7.20)
27+
2828
Apache License
2929
Version 2.0, January 2004
3030
=========================
@@ -205,13 +205,13 @@ third-party archives.
205205
or agreed to in writing, software distributed under the License is
206206
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
207207
KIND, either express or implied. See the License for the specific language
208-
governing permissions and limitations under the License.
209-
210-
---
211-
212-
BSD 3-clause "New" or "Revised" License
213-
(leetal/ios-cmake 3.1.0)
214-
208+
governing permissions and limitations under the License.
209+
210+
---
211+
212+
BSD 3-clause "New" or "Revised" License
213+
(leetal/ios-cmake 3.1.0)
214+
215215
Copyright (c) 2011-2014, Andrew Fischer <andrew@ltengsoft.com>
216216

217217
Copyright (c) 2017, Alexander Widerberg <widerbergaren@gmail.com>
@@ -241,13 +241,13 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
241241
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
242242
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
243243
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
244-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
245-
246-
---
247-
248-
BSD 3-clause "New" or "Revised" License
249-
(libstemmer 0)
250-
244+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
245+
246+
---
247+
248+
BSD 3-clause "New" or "Revised" License
249+
(libstemmer 0)
250+
251251
Copyright (c) <YEAR>, <OWNER>
252252
All rights reserved.
253253

@@ -275,13 +275,13 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
275275
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
276276
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
277277
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
278-
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
279-
280-
---
281-
282-
Creative Commons Public Domain Dedication and Certification
283-
(libb64 1.2.1)
284-
278+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
279+
280+
---
281+
282+
Creative Commons Public Domain Dedication and Certification
283+
(libb64 1.2.1)
284+
285285
Creative Commons Public Domain Dedication
286286
=========================================
287287

@@ -316,13 +316,13 @@ copyrights in the Work.
316316
Dedicator recognizes that, once placed in the public domain, the Work may be
317317
freely reproduced, distributed, transmitted, used, modified, built upon, or
318318
otherwise exploited by anyone for any purpose, commercial or non-commercial, and
319-
in any way, including by methods that have not yet been invented or conceived.
320-
321-
---
322-
323-
MIT License
324-
(jsonsl 20171103-snapshot-684b60f9)
325-
319+
in any way, including by methods that have not yet been invented or conceived.
320+
321+
---
322+
323+
MIT License
324+
(jsonsl 20171103-snapshot-684b60f9)
325+
326326
The MIT License
327327
===============
328328

@@ -343,48 +343,48 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
343343
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
344344
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
345345
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
346-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
347-
348-
---
349-
350-
MIT License
351-
(SQLiteCpp 2.0.0)
352-
346+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
347+
348+
---
349+
350+
MIT License
351+
(SQLiteCpp 2.0.0)
352+
353353
The MIT License (MIT)
354354

355355

356356

357357
Copyright (c) 2012-2016 Sebastien Rombauts (sebastien.rombauts@gmail.com)
358358

359-
Permission is hereby granted, free of charge, to any person obtaining a copy
360-
of this software and associated documentation files (the "Software"), to deal
361-
in the Software without restriction, including without limitation the rights
362-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
363-
copies of the Software, and to permit persons to whom the Software is furnished
364-
to do so, subject to the following conditions:
365-
366-
The above copyright notice and this permission notice shall be included in all
367-
copies or substantial portions of the Software.
368-
369-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
370-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
371-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
372-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
373-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
374-
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
375-
376-
---
377-
378-
Public Domain
379-
(SQLite 3.32.1, sqlite3-unicodesn 20160920-snapshot-af75748c)
380-
381-
Public domain code is not subject to any license.
382-
383-
---
384-
385-
zlib License
386-
(zlib 1.2.12)
387-
359+
Permission is hereby granted, free of charge, to any person obtaining a copy
360+
of this software and associated documentation files (the "Software"), to deal
361+
in the Software without restriction, including without limitation the rights
362+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
363+
copies of the Software, and to permit persons to whom the Software is furnished
364+
to do so, subject to the following conditions:
365+
366+
The above copyright notice and this permission notice shall be included in all
367+
copies or substantial portions of the Software.
368+
369+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
370+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
371+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
372+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
373+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
374+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
375+
376+
---
377+
378+
Public Domain
379+
(SQLite 3.32.1, sqlite3-unicodesn 20160920-snapshot-af75748c)
380+
381+
Public domain code is not subject to any license.
382+
383+
---
384+
385+
zlib License
386+
(zlib 1.2.12)
387+
388388
The zlib/libpng License
389389
=======================
390390

@@ -406,5 +406,5 @@ the following restrictions:
406406
2. Altered source versions must be plainly marked as such, and must not be
407407
misrepresented as being the original software.
408408

409-
3. This notice may not be removed or altered from any source distribution.
410-
409+
3. This notice may not be removed or altered from any source distribution.
410+

0 commit comments

Comments
 (0)