Skip to content

Commit 63bce84

Browse files
author
Michael Wilkerson-Barker
committed
Merge branch 'master' of github.com:realm/realm-core into mwb/fix-migration-test
2 parents a67985a + 816920b commit 63bce84

File tree

173 files changed

+2099
-2162
lines changed

Some content is hidden

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

173 files changed

+2099
-2162
lines changed

.clang-format

Lines changed: 82 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
2-
# Don't try to format any languages not described by this file
3-
DisableFormat: true
4-
BasedOnStyle: LLVM
2+
Language: Cpp
53
AccessModifierOffset: -4
64
AlignAfterOpenBracket: Align
7-
AlignConsecutiveMacros: false
8-
AlignConsecutiveAssignments: false
9-
AlignConsecutiveDeclarations: false
5+
AlignArrayOfStructures: None
6+
AlignConsecutiveMacros: None
7+
AlignConsecutiveAssignments: None
8+
AlignConsecutiveBitFields: None
9+
AlignConsecutiveDeclarations: None
1010
AlignEscapedNewlines: Right
11-
AlignOperands: true
11+
AlignOperands: Align
1212
AlignTrailingComments: true
1313
AllowAllArgumentsOnNextLine: true
14-
AllowAllConstructorInitializersOnNextLine: true
1514
AllowAllParametersOfDeclarationOnNextLine: true
16-
AllowShortBlocksOnASingleLine: false
15+
AllowShortEnumsOnASingleLine: true
16+
AllowShortBlocksOnASingleLine: Never
1717
AllowShortCaseLabelsOnASingleLine: false
1818
AllowShortFunctionsOnASingleLine: Empty
1919
AllowShortLambdasOnASingleLine: Empty
@@ -23,12 +23,14 @@ AlwaysBreakAfterDefinitionReturnType: None
2323
AlwaysBreakAfterReturnType: None
2424
AlwaysBreakBeforeMultilineStrings: false
2525
AlwaysBreakTemplateDeclarations: Yes
26+
AttributeMacros:
27+
- __capability
2628
BinPackArguments: true
2729
BinPackParameters: true
2830
BraceWrapping:
2931
AfterCaseLabel: false
3032
AfterClass: false
31-
AfterControlStatement: false
33+
AfterControlStatement: Never
3234
AfterEnum: false
3335
AfterFunction: true
3436
AfterNamespace: false
@@ -38,27 +40,39 @@ BraceWrapping:
3840
AfterExternBlock: false
3941
BeforeCatch: true
4042
BeforeElse: true
43+
BeforeLambdaBody: false
44+
BeforeWhile: false
4145
IndentBraces: false
4246
SplitEmptyFunction: true
4347
SplitEmptyRecord: true
4448
SplitEmptyNamespace: true
4549
BreakBeforeBinaryOperators: None
50+
BreakBeforeConceptDeclarations: true
4651
BreakBeforeBraces: Custom
4752
BreakBeforeInheritanceComma: false
4853
BreakInheritanceList: BeforeColon
4954
BreakBeforeTernaryOperators: true
55+
BreakConstructorInitializersBeforeComma: false
5056
BreakConstructorInitializers: BeforeComma
5157
BreakAfterJavaFieldAnnotations: false
5258
BreakStringLiterals: true
5359
ColumnLimit: 118
5460
CommentPragmas: '^ IWYU pragma:'
61+
QualifierAlignment: Leave
5562
CompactNamespaces: false
56-
ConstructorInitializerAllOnOneLineOrOnePerLine: false
5763
ConstructorInitializerIndentWidth: 4
5864
ContinuationIndentWidth: 4
5965
Cpp11BracedListStyle: true
66+
DeriveLineEnding: true
6067
DerivePointerAlignment: false
68+
DisableFormat: false
69+
EmptyLineAfterAccessModifier: Never
70+
EmptyLineBeforeAccessModifier: LogicalBlock
6171
ExperimentalAutoDetectBinPacking: false
72+
PackConstructorInitializers: BinPack
73+
BasedOnStyle: ''
74+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
75+
AllowAllConstructorInitializersOnNextLine: true
6276
FixNamespaceComments: true
6377
ForEachMacros:
6478
- foreach
@@ -68,68 +82,114 @@ ForEachMacros:
6882
- TEST_CASE
6983
- DYNAMIC_SECTION
7084
- BENCHMARK
85+
IfMacros:
86+
- KJ_IF_MAYBE
7187
IncludeBlocks: Preserve
7288
IncludeCategories:
7389
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
7490
Priority: 2
91+
SortPriority: 0
92+
CaseSensitive: false
7593
- Regex: '^(<|"(gtest|isl|json)/)'
7694
Priority: 3
95+
SortPriority: 0
96+
CaseSensitive: false
7797
- Regex: '.*'
7898
Priority: 1
99+
SortPriority: 0
100+
CaseSensitive: false
79101
IncludeIsMainRegex: '(Test)?$'
102+
IncludeIsMainSourceRegex: ''
103+
IndentAccessModifiers: false
80104
IndentCaseLabels: true
105+
IndentCaseBlocks: false
106+
IndentGotoLabels: true
81107
IndentPPDirectives: None
108+
IndentExternBlock: AfterExternBlock
109+
IndentRequires: false
82110
IndentWidth: 4
83111
IndentWrappedFunctionNames: false
112+
InsertTrailingCommas: None
84113
JavaScriptQuotes: Leave
85114
JavaScriptWrapImports: true
86115
KeepEmptyLinesAtTheStartOfBlocks: true
116+
LambdaBodyIndentation: Signature
87117
MacroBlockBegin: ''
88118
MacroBlockEnd: ''
89119
MaxEmptyLinesToKeep: 2
90120
NamespaceIndentation: None
91121
ObjCBinPackProtocolList: Auto
92122
ObjCBlockIndentWidth: 4
123+
ObjCBreakBeforeNestedBlockParam: true
93124
ObjCSpaceAfterProperty: false
94125
ObjCSpaceBeforeProtocolList: true
95126
PenaltyBreakAssignment: 2
96127
PenaltyBreakBeforeFirstCallParameter: 19
97128
PenaltyBreakComment: 300
98129
PenaltyBreakFirstLessLess: 120
130+
PenaltyBreakOpenParenthesis: 0
99131
PenaltyBreakString: 1000
100132
PenaltyBreakTemplateDeclaration: 10
101133
PenaltyExcessCharacter: 1000000
102134
PenaltyReturnTypeOnItsOwnLine: 60
135+
PenaltyIndentedWhitespace: 0
103136
PointerAlignment: Left
137+
PPIndentWidth: -1
138+
ReferenceAlignment: Left
104139
ReflowComments: true
105-
SortIncludes: false
106-
SortUsingDeclarations: true
140+
RemoveBracesLLVM: false
141+
SeparateDefinitionBlocks: Leave
142+
ShortNamespaceLines: 1
143+
SortIncludes: Never
144+
SortJavaStaticImport: Before
145+
SortUsingDeclarations: false
107146
SpaceAfterCStyleCast: false
108147
SpaceAfterLogicalNot: false
109148
SpaceAfterTemplateKeyword: true
110149
SpaceBeforeAssignmentOperators: true
150+
SpaceBeforeCaseColon: false
111151
SpaceBeforeCpp11BracedList: false
112152
SpaceBeforeCtorInitializerColon: true
113153
SpaceBeforeInheritanceColon: true
114-
SpaceBeforeParens: ControlStatementsExceptForEachMacros
154+
SpaceBeforeParens: ControlStatementsExceptControlMacros
155+
SpaceBeforeParensOptions:
156+
AfterControlStatements: true
157+
AfterForeachMacros: false
158+
AfterFunctionDefinitionName: false
159+
AfterFunctionDeclarationName: false
160+
AfterIfMacros: false
161+
AfterOverloadedOperator: false
162+
BeforeNonEmptyParentheses: false
163+
SpaceAroundPointerQualifiers: Default
115164
SpaceBeforeRangeBasedForLoopColon: true
165+
SpaceInEmptyBlock: false
116166
SpaceInEmptyParentheses: false
117167
SpacesBeforeTrailingComments: 1
118-
SpacesInAngles: false
168+
SpacesInAngles: Never
169+
SpacesInConditionalStatement: false
119170
SpacesInContainerLiterals: true
120171
SpacesInCStyleCastParentheses: false
172+
SpacesInLineCommentPrefix:
173+
Minimum: 1
174+
Maximum: -1
121175
SpacesInParentheses: false
122176
SpacesInSquareBrackets: false
123-
Standard: Cpp11
177+
SpaceBeforeSquareBrackets: false
178+
BitFieldColonSpacing: Both
179+
Standard: Latest
180+
StatementAttributeLikeMacros:
181+
- Q_EMIT
124182
StatementMacros:
125183
- Q_UNUSED
126184
- QT_REQUIRE_VERSION
127185
TabWidth: 4
186+
UseCRLF: false
128187
UseTab: Never
129-
---
130-
Language: Cpp
131-
DisableFormat: false
132-
---
133-
Language: ObjC
134-
DisableFormat: false
188+
WhitespaceSensitiveMacros:
189+
- STRINGIZE
190+
- PP_STRINGIZE
191+
- BOOST_PP_STRINGIZE
192+
- NS_SWIFT_NAME
193+
- CF_SWIFT_NAME
135194
...
195+

.project

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@
2525
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
2626
</natures>
2727
<filteredResources>
28-
<filter>
29-
<id>1684928805201</id>
30-
<name>external</name>
31-
<type>30</type>
32-
<matcher>
33-
<id>org.eclipse.ui.ide.multiFilter</id>
34-
<arguments>1.0-name-matches-false-false-catch</arguments>
35-
</matcher>
36-
</filter>
3728
<filter>
3829
<id>1684928848403</id>
3930
<name>src/external</name>

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* Fixed an issue during a subsequent open of an encrypted Realm for some rare allocation patterns when the top ref was within ~50 bytes of the end of a page. This could manifest as a DecryptionFailed exception or as an assertion: `encrypted_file_mapping.hpp:183: Assertion failed: local_ndx < m_page_state.size()`. ([#7319](https://github.com/realm/realm-core/issues/7319))
2121
* Non-streaming download sync progress notification is fixed for flexible sync Realms where before it was sometimes stopping to emit values right after the registration of the callback (PR [#7561](https://github.com/realm/realm-core/issues/7561)).
2222
* Schema initialization could hit an assertion failure if the sync client applied a downloaded changeset while the Realm file was in the process of being opened ([#7041](https://github.com/realm/realm-core/issues/7041), since v11.4.0).
23+
* Queries using query paths on Mixed values returns inconsistent results ([#7587](https://github.com/realm/realm-core/issues/7587), since v14.0.0)
2324
* Fix client reset failure during sync migration due to previous incomplete client reset. ([PR #7542](https://github.com/realm/realm-core/pull/7542), since v13.11.0)
2425

2526
### Breaking changes
@@ -58,6 +59,8 @@
5859
* Sha-2 is no longer required as a submodule on Windows if linking with OpenSSL.
5960
* The Catch2 submodule has moved to `test/external/catch`.
6061
* Fix possible file corruption if using Transaction::copy_to if nested collections are present.
62+
* Evergreen config was udpated so most linux CI testing is done on ubuntu 22.04 on aarch64 with clang 18, upgrading from clang 11 on ubuntu 20.04 mostly on x86_64 ([PR #7475](https://github.com/realm/realm-core/pull/7475)).
63+
* Evergreen config was updated to move most MacOS testing to MacOS 14 on arm64 with Xcode 15.2, updating from Macos 11 on x86_64 with Xcode 13.1 ([PR #7618](https://github.com/realm/realm-core/pull/7618)).
6164

6265
----------------------------------------------
6366

@@ -92,6 +95,7 @@
9295

9396
### Enhancements
9497
* Introduce sync 'progress_estimate' parameter (value from 0.0 to 1.0) for existing sync 'ProgressNotifierCallback' api to report sync progress on current batch of upload/download until completion ([#7450](https://github.com/realm/realm-core/issues/7450))
98+
* Support assigning nested collections via templated API (PR [#7478](https://github.com/realm/realm-core/pull/7478))
9599

96100
### Fixed
97101
* Fix an assertion failure "m_lock_info && m_lock_info->m_file.get_path() == m_filename" that appears to be related to opening a Realm while the file is in the process of being closed on another thread ([Swift #8507](https://github.com/realm/realm-swift/issues/8507)).

Visual Studio/uwp_demo/App.xaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)