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

FlatBuffers Version 22.12.06 #7702

Merged
merged 1 commit into from
Dec 7, 2022
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ All major or breaking changes will be documented in this file, as well as any
new features that should be highlighted. Minor fixes or improvements are not
necessarily listed.

## 22.10.25 (Oct 25 2002)
## 22.12.06 (Dec 06 2022)

* Bug fixing release, no major changes.

## 22.10.25 (Oct 25 2022)

* Added Nim language support with generator and runtime libraries (#7534).

Expand Down
4 changes: 2 additions & 2 deletions CMake/Version.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(VERSION_MAJOR 22)
set(VERSION_MINOR 11)
set(VERSION_PATCH 23)
set(VERSION_MINOR 12)
set(VERSION_PATCH 06)
set(VERSION_COMMIT 0)

if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
Expand Down
2 changes: 1 addition & 1 deletion FlatBuffers.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FlatBuffers'
s.version = '22.11.23'
s.version = '22.12.06'
s.summary = 'FlatBuffers: Memory Efficient Serialization Library'

s.description = "FlatBuffers is a cross platform serialization library architected for
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/generated/com/fbs/app/Animal.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Animal : Table() {
return if(o != 0) bb.getShort(o + bb_pos).toUShort() else 0u
}
companion object {
fun validateVersion() = Constants.FLATBUFFERS_22_11_23()
fun validateVersion() = Constants.FLATBUFFERS_22_12_06()
fun getRootAsAnimal(_bb: ByteBuffer): Animal = getRootAsAnimal(_bb, Animal())
fun getRootAsAnimal(_bb: ByteBuffer, obj: Animal): Animal {
_bb.order(ByteOrder.LITTLE_ENDIAN)
Expand Down
2 changes: 1 addition & 1 deletion dart/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: flat_buffers
version: 22.11.23
version: 22.12.06
description: FlatBuffers reading and writing library for Dart. Based on original work by Konstantin Scheglov and Paul Berry of the Dart SDK team.
homepage: https://github.com/google/flatbuffers
documentation: https://google.github.io/flatbuffers/index.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import FlatBuffers

public struct models_HelloReply: FlatBufferObject, Verifiable {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }
public var __buffer: ByteBuffer! { return _accessor.bb }
private var _accessor: Table

Expand Down Expand Up @@ -55,7 +55,7 @@ extension models_HelloReply: Encodable {

public struct models_HelloRequest: FlatBufferObject, Verifiable {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }
public var __buffer: ByteBuffer! { return _accessor.bb }
private var _accessor: Table

Expand Down
4 changes: 2 additions & 2 deletions include/flatbuffers/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@
#endif // !defined(FLATBUFFERS_LITTLEENDIAN)

#define FLATBUFFERS_VERSION_MAJOR 22
#define FLATBUFFERS_VERSION_MINOR 11
#define FLATBUFFERS_VERSION_REVISION 23
#define FLATBUFFERS_VERSION_MINOR 12
#define FLATBUFFERS_VERSION_REVISION 06
#define FLATBUFFERS_STRING_EXPAND(X) #X
#define FLATBUFFERS_STRING(X) FLATBUFFERS_STRING_EXPAND(X)
namespace flatbuffers {
Expand Down
4 changes: 2 additions & 2 deletions include/flatbuffers/reflection_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// Ensure the included flatbuffers.h is the same version as when this file was
// generated, otherwise it may not be compatible.
static_assert(FLATBUFFERS_VERSION_MAJOR == 22 &&
FLATBUFFERS_VERSION_MINOR == 11 &&
FLATBUFFERS_VERSION_REVISION == 23,
FLATBUFFERS_VERSION_MINOR == 12 &&
FLATBUFFERS_VERSION_REVISION == 6,
"Non-compatible flatbuffers version included");

namespace reflection {
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
<version>22.11.23</version>
<version>22.12.06</version>
<packaging>bundle</packaging>
<name>FlatBuffers Java API</name>
<description>
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/com/google/flatbuffers/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class Constants {
Changes to the Java implementation need to be sure to change
the version here and in the code generator on every possible
incompatible change */
public static void FLATBUFFERS_22_11_23() {}
public static void FLATBUFFERS_22_12_06() {}
}

/// @endcond
2 changes: 1 addition & 1 deletion net/FlatBuffers/FlatBufferConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ the runtime and generated code are modified in sync.
Changes to the C# implementation need to be sure to change
the version here and in the code generator on every possible
incompatible change */
public static void FLATBUFFERS_22_11_23() {}
public static void FLATBUFFERS_22_12_06() {}
}
}
2 changes: 1 addition & 1 deletion net/FlatBuffers/Google.FlatBuffers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;net46</TargetFrameworks>
<Description>A cross-platform memory efficient serialization library</Description>
<PackageVersion>22.11.23</PackageVersion>
<PackageVersion>22.12.06</PackageVersion>
<Authors>Google LLC</Authors>
<PackageProjectUrl>https://github.com/google/flatbuffers</PackageProjectUrl>
<RepositoryUrl>https://github.com/google/flatbuffers</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flatbuffers",
"version": "22.11.23",
"version": "22.12.06",
"description": "Memory Efficient Serialization Library",
"files": [
"js/**/*.js",
Expand Down
2 changes: 1 addition & 1 deletion python/flatbuffers/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

# Placeholder, to be updated during the release process
# by the setup.py
__version__ = u"22.11.23"
__version__ = u"22.12.06"
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setup(
name='flatbuffers',
version='22.11.23',
version='22.12.06',
license='Apache 2.0',
license_files='../LICENSE.txt',
author='Derek Bailey',
Expand Down
2 changes: 1 addition & 1 deletion rust/flatbuffers/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "flatbuffers"
version = "22.11.23"
version = "22.12.6"
edition = "2018"
authors = ["Robert Winslow <hello@rwinslow.com>", "FlatBuffers Maintainers"]
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions samples/monster_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// Ensure the included flatbuffers.h is the same version as when this file was
// generated, otherwise it may not be compatible.
static_assert(FLATBUFFERS_VERSION_MAJOR == 22 &&
FLATBUFFERS_VERSION_MINOR == 11 &&
FLATBUFFERS_VERSION_REVISION == 23,
FLATBUFFERS_VERSION_MINOR == 12 &&
FLATBUFFERS_VERSION_REVISION == 6,
"Non-compatible flatbuffers version included");

namespace MyGame {
Expand Down
8 changes: 4 additions & 4 deletions samples/monster_generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public enum MyGame_Sample_Equipment: UInt8, Enum {

public struct MyGame_Sample_Vec3: NativeStruct {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }

private var _x: Float32
private var _y: Float32
Expand All @@ -56,7 +56,7 @@ public struct MyGame_Sample_Vec3: NativeStruct {

public struct MyGame_Sample_Vec3_Mutable: FlatBufferObject {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }
public var __buffer: ByteBuffer! { return _accessor.bb }
private var _accessor: Struct

Expand All @@ -72,7 +72,7 @@ public struct MyGame_Sample_Vec3_Mutable: FlatBufferObject {

public struct MyGame_Sample_Monster: FlatBufferObject {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }
public var __buffer: ByteBuffer! { return _accessor.bb }
private var _accessor: Table

Expand Down Expand Up @@ -162,7 +162,7 @@ public struct MyGame_Sample_Monster: FlatBufferObject {

public struct MyGame_Sample_Weapon: FlatBufferObject {

static func validateVersion() { FlatBuffersVersion_22_11_23() }
static func validateVersion() { FlatBuffersVersion_22_12_06() }
public var __buffer: ByteBuffer! { return _accessor.bb }
private var _accessor: Table

Expand Down
2 changes: 1 addition & 1 deletion src/idl_gen_csharp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ class CSharpGenerator : public BaseGenerator {
// Force compile time error if not using the same version runtime.
code += " public static void ValidateVersion() {";
code += " FlatBufferConstants.";
code += "FLATBUFFERS_22_11_23(); ";
code += "FLATBUFFERS_22_12_06(); ";
code += "}\n";

// Generate a special accessor for the table that when used as the root
Expand Down
2 changes: 1 addition & 1 deletion src/idl_gen_java.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ class JavaGenerator : public BaseGenerator {
// Force compile time error if not using the same version runtime.
code += " public static void ValidateVersion() {";
code += " Constants.";
code += "FLATBUFFERS_22_11_23(); ";
code += "FLATBUFFERS_22_12_06(); ";
code += "}\n";

// Generate a special accessor for the table that when used as the root
Expand Down
2 changes: 1 addition & 1 deletion src/idl_gen_kotlin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ class KotlinGenerator : public BaseGenerator {
// runtime.
GenerateFunOneLine(
writer, "validateVersion", "", "",
[&]() { writer += "Constants.FLATBUFFERS_22_11_23()"; },
[&]() { writer += "Constants.FLATBUFFERS_22_12_06()"; },
options.gen_jvmstatic);

GenerateGetRootAsAccessors(namer_.Type(struct_def), writer, options);
Expand Down
2 changes: 1 addition & 1 deletion src/idl_gen_swift.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,7 @@ class SwiftGenerator : public BaseGenerator {
}

std::string ValidateFunc() {
return "static func validateVersion() { FlatBuffersVersion_22_11_23() }";
return "static func validateVersion() { FlatBuffersVersion_22_12_06() }";
}

std::string GenType(const Type &type,
Expand Down
2 changes: 1 addition & 1 deletion swift/Sources/FlatBuffers/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ extension UInt64: Scalar, Verifiable {
public typealias NumericValue = UInt64
}

public func FlatBuffersVersion_22_11_23() {}
public func FlatBuffersVersion_22_12_06() {}
2 changes: 1 addition & 1 deletion tests/Abc.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
]#
Expand Down
2 changes: 1 addition & 1 deletion tests/DictionaryLookup/LongFloatEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@SuppressWarnings("unused")
public final class LongFloatEntry extends Table {
public static void ValidateVersion() { Constants.FLATBUFFERS_22_11_23(); }
public static void ValidateVersion() { Constants.FLATBUFFERS_22_12_06(); }
public static LongFloatEntry getRootAsLongFloatEntry(ByteBuffer _bb) { return getRootAsLongFloatEntry(_bb, new LongFloatEntry()); }
public static LongFloatEntry getRootAsLongFloatEntry(ByteBuffer _bb, LongFloatEntry obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
Expand Down
2 changes: 1 addition & 1 deletion tests/DictionaryLookup/LongFloatEntry.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class LongFloatEntry : Table() {
return (val_1 - val_2).sign
}
companion object {
fun validateVersion() = Constants.FLATBUFFERS_22_11_23()
fun validateVersion() = Constants.FLATBUFFERS_22_12_06()
fun getRootAsLongFloatEntry(_bb: ByteBuffer): LongFloatEntry = getRootAsLongFloatEntry(_bb, LongFloatEntry())
fun getRootAsLongFloatEntry(_bb: ByteBuffer, obj: LongFloatEntry): LongFloatEntry {
_bb.order(ByteOrder.LITTLE_ENDIAN)
Expand Down
2 changes: 1 addition & 1 deletion tests/DictionaryLookup/LongFloatMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@SuppressWarnings("unused")
public final class LongFloatMap extends Table {
public static void ValidateVersion() { Constants.FLATBUFFERS_22_11_23(); }
public static void ValidateVersion() { Constants.FLATBUFFERS_22_12_06(); }
public static LongFloatMap getRootAsLongFloatMap(ByteBuffer _bb) { return getRootAsLongFloatMap(_bb, new LongFloatMap()); }
public static LongFloatMap getRootAsLongFloatMap(ByteBuffer _bb, LongFloatMap obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
Expand Down
2 changes: 1 addition & 1 deletion tests/DictionaryLookup/LongFloatMap.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class LongFloatMap : Table() {
}
}
companion object {
fun validateVersion() = Constants.FLATBUFFERS_22_11_23()
fun validateVersion() = Constants.FLATBUFFERS_22_12_06()
fun getRootAsLongFloatMap(_bb: ByteBuffer): LongFloatMap = getRootAsLongFloatMap(_bb, LongFloatMap())
fun getRootAsLongFloatMap(_bb: ByteBuffer, obj: LongFloatMap): LongFloatMap {
_bb.order(ByteOrder.LITTLE_ENDIAN)
Expand Down
2 changes: 1 addition & 1 deletion tests/KeywordTest/KeywordsInTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct KeywordsInTable : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_11_23(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_12_06(); }
public static KeywordsInTable GetRootAsKeywordsInTable(ByteBuffer _bb) { return GetRootAsKeywordsInTable(_bb, new KeywordsInTable()); }
public static KeywordsInTable GetRootAsKeywordsInTable(ByteBuffer _bb, KeywordsInTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
Expand Down
2 changes: 1 addition & 1 deletion tests/MoreDefaults.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
]#
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/Ability.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by : //monster_test.fbs
Rooting type : MyGame.Example.Monster (//monster_test.fbs)
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/Ability.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
Rooting type : MyGame.Example.Monster ()
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/Any.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by : //monster_test.fbs
Rooting type : MyGame.Example.Monster (//monster_test.fbs)
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/Any.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
Rooting type : MyGame.Example.Monster ()
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/AnyAmbiguousAliases.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by : //monster_test.fbs
Rooting type : MyGame.Example.Monster (//monster_test.fbs)
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/AnyAmbiguousAliases.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
Rooting type : MyGame.Example.Monster ()
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/AnyUniqueAliases.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by : //monster_test.fbs
Rooting type : MyGame.Example.Monster (//monster_test.fbs)
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/AnyUniqueAliases.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Automatically generated by the FlatBuffers compiler, do not modify.
Or modify. I'm a message, not a cop.

flatc version: 22.11.23
flatc version: 22.12.06

Declared by :
Rooting type : MyGame.Example.Monster ()
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/ArrayTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct ArrayTable : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_11_23(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_12_06(); }
public static ArrayTable GetRootAsArrayTable(ByteBuffer _bb) { return GetRootAsArrayTable(_bb, new ArrayTable()); }
public static ArrayTable GetRootAsArrayTable(ByteBuffer _bb, ArrayTable obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public static bool ArrayTableBufferHasIdentifier(ByteBuffer _bb) { return Table.__has_identifier(_bb, "ARRT"); }
Expand Down
2 changes: 1 addition & 1 deletion tests/MyGame/Example/ArrayTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@SuppressWarnings("unused")
public final class ArrayTable extends Table {
public static void ValidateVersion() { Constants.FLATBUFFERS_22_11_23(); }
public static void ValidateVersion() { Constants.FLATBUFFERS_22_12_06(); }
public static ArrayTable getRootAsArrayTable(ByteBuffer _bb) { return getRootAsArrayTable(_bb, new ArrayTable()); }
public static ArrayTable getRootAsArrayTable(ByteBuffer _bb, ArrayTable obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public static boolean ArrayTableBufferHasIdentifier(ByteBuffer _bb) { return __has_identifier(_bb, "ARRT"); }
Expand Down
Loading