Skip to content

Commit d6861cc

Browse files
Merge branch 'master' into master
2 parents ae99831 + c7b6b66 commit d6861cc

Some content is hidden

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

43 files changed

+1223
-524
lines changed

.bazelci/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tasks:
1010
bazel: ${{ bazel }}
1111
environment:
1212
CC: clang
13-
SWIFT_VERSION: "5.9"
13+
SWIFT_VERSION: "5.10"
1414
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
1515
PATH: "$PATH:$SWIFT_HOME/usr/bin"
1616
shell_commands:
@@ -26,7 +26,7 @@ tasks:
2626
bazel: ${{ bazel }}
2727
environment:
2828
CC: clang
29-
SWIFT_VERSION: "5.9"
29+
SWIFT_VERSION: "5.10"
3030
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
3131
PATH: "$PATH:$SWIFT_HOME/usr/bin"
3232
shell_commands:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ jobs:
503503
name: Test Swift
504504
strategy:
505505
matrix:
506-
swift: ["5.9", "5.10", "6.1"]
506+
swift: ["5.10", "6.1", "6.2"]
507507
# Only 22.04 has swift at the moment https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L30
508508
runs-on: ubuntu-22.04
509509
steps:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
- name: Install Dependencies
3838
run: |
3939
python3 -m pip install --upgrade pip
40-
python3 -m pip install setuptools wheel twine
40+
python3 -m pip install build twine
4141
4242
- name: Build
4343
run: |
44-
python3 setup.py sdist bdist_wheel
44+
python3 -m build .
4545
4646
- name: Upload to PyPi
4747
run: |

FlatBuffers.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
s.ios.deployment_target = '11.0'
1717
s.osx.deployment_target = '10.14'
1818

19-
s.swift_version = '5.0'
19+
s.swift_version = '5.10'
2020
s.source_files = 'swift/Sources/Flatbuffers/*.swift'
2121
s.pod_target_xcconfig = {
2222
'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES'

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

benchmarks/swift/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

docs/source/support.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Codegen for all basic features | Yes | Yes | Yes | Yes | Yes | Ye
2424
JSON parsing | Yes | No | No | No | No | No | No | Yes | No | No | Yes | No | No
2525
Simple mutation | Yes | Yes | Yes | Yes | No | No | No | No | No | No | No | No | Yes
2626
Reflection | Yes | No | No | No | No | No | No | Basic | No | No | No | No | No
27-
Buffer verifier | Yes | No | No | No | No | No | No | Yes | No | No | No | No | No
28-
Native Object API | Yes | No | Yes | Yes | Yes | Yes | Yes | No | No | Yes | No | No | No
27+
Buffer verifier | Yes | No | No | No | No | No | No | Yes | No | No | No | No | Yes
28+
Native Object API | Yes | No | Yes | Yes | Yes | Yes | Yes | No | No | Yes | No | No | Yes
2929
Optional Scalars | Yes | Yes | Yes | No | No | Yes | Yes | Yes | No | No | Yes | Yes | Yes
30-
Flexbuffers | Yes | Yes | ? | ? | ? | ? | ? | ? | ? | ? | ? | Yes | ?
30+
Flexbuffers | Yes | Yes | ? | ? | ? | ? | ? | ? | ? | ? | ? | Yes | Yes
3131
Testing: basic | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes | ? | Yes | Yes | Yes | Yes
3232
Testing: fuzz | Yes | No | No | Yes | Yes | No | No | No | ? | No | No | Yes | No
3333
Performance: | Superb | Great | Great | Great | Ok | ? | ? | Superb | ? | ? | Great | Superb | Great
34-
Platform: Windows | VS2010 | Yes | Yes | ? | ? | ? | Yes | VS2010 | ? | Yes | Yes | Yes | No
34+
Platform: Windows | VS2010 | Yes | Yes | ? | ? | ? | Yes | VS2010 | ? | Yes | Yes | Yes | Yes
3535
Platform: Linux | GCC282 | Yes | ? | Yes | Yes | ? | Yes | Yes | ? | Yes | Yes | Yes | Yes
3636
Platform: OS X | Xcode4 | ? | ? | ? | Yes | ? | Yes | Yes | ? | Yes | Yes | Yes | Yes
3737
Platform: Android | NDK10d | Yes | ? | ? | ? | ? | ? | ? | ? | Flutter | Yes | ? | No

grpc/examples/swift/Greeter/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2020 Google Inc. All rights reserved.
44
*

include/flatbuffers/flatbuffer_builder.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,16 @@ class FlatBufferBuilderImpl {
834834
return Offset<Vector<uint8_t>>(EndVector(v.size()));
835835
}
836836

837+
Offset64<Vector64<uint8_t>> CreateVector64(const std::vector<bool>& v) {
838+
StartVector<uint8_t, Offset64, Vector64<uint8_t>::size_type>(v.size());
839+
for (auto i = v.size(); i > 0;) {
840+
PushElement(static_cast<uint8_t>(v[--i]));
841+
}
842+
return Offset64<Vector64<uint8_t>>(
843+
EndVector<Vector64<uint8_t>::size_type,
844+
Offset64<Vector64<uint8_t>>::offset_type>(v.size()));
845+
}
846+
837847
/// @brief Serialize values returned by a function into a FlatBuffer `vector`.
838848
/// This is a convenience function that takes care of iteration for you.
839849
/// @tparam T The data type of the `std::vector` elements.

python/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
/dist/
22
/*.egg-info/
3+
4+
# this file is duplicated by the build step
5+
LICENSE

0 commit comments

Comments
 (0)