From d0cede9c90c5257537c293517a21376408b549fa Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Thu, 9 Dec 2021 10:31:57 -0800 Subject: [PATCH] Bumping to Version 2.0.5 (#6967) --- CMake/Version.cmake | 2 +- CMakeLists.txt | 7 ++++--- include/flatbuffers/base.h | 2 +- tests/MyGame/Example/Ability.lua | 2 +- tests/MyGame/Example/Any.lua | 2 +- tests/MyGame/Example/AnyAmbiguousAliases.lua | 2 +- tests/MyGame/Example/AnyUniqueAliases.lua | 2 +- tests/MyGame/Example/Color.lua | 2 +- tests/MyGame/Example/Monster.lua | 2 +- tests/MyGame/Example/Race.lua | 2 +- tests/MyGame/Example/Referrable.lua | 2 +- tests/MyGame/Example/Stat.lua | 2 +- tests/MyGame/Example/StructOfStructs.lua | 2 +- tests/MyGame/Example/Test.lua | 2 +- tests/MyGame/Example/TestSimpleTableWithEnum.lua | 2 +- tests/MyGame/Example/TypeAliases.lua | 2 +- tests/MyGame/Example/Vec3.lua | 2 +- tests/MyGame/Example2/Monster.lua | 2 +- tests/MyGame/InParentNamespace.lua | 2 +- tests/MyGame/OtherNameSpace/FromInclude.lua | 2 +- tests/MyGame/OtherNameSpace/TableB.lua | 2 +- tests/MyGame/OtherNameSpace/Unused.lua | 2 +- tests/TableA.lua | 2 +- 23 files changed, 26 insertions(+), 25 deletions(-) diff --git a/CMake/Version.cmake b/CMake/Version.cmake index a577eef2a..526323daa 100644 --- a/CMake/Version.cmake +++ b/CMake/Version.cmake @@ -1,6 +1,6 @@ set(VERSION_MAJOR 2) set(VERSION_MINOR 0) -set(VERSION_PATCH 0) +set(VERSION_PATCH 5) set(VERSION_COMMIT 0) find_program(GIT git) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea8de4f43..ca05a1e01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,8 @@ else() project(FlatBuffers) endif (POLICY CMP0048) +include(CMake/Version.cmake) + # generate compile_commands.json set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -417,8 +419,8 @@ if(FLATBUFFERS_BUILD_SHAREDLIB) # - micro updated every release when there is no API/ABI changes # - minor updated when there are additions in API/ABI # - major (ABI number) updated when there are changes in ABI (or removals) - set(FlatBuffers_Library_SONAME_MAJOR "2") - set(FlatBuffers_Library_SONAME_FULL "${FlatBuffers_Library_SONAME_MAJOR}.0.0") + set(FlatBuffers_Library_SONAME_MAJOR ${VERSION_MAJOR}) + set(FlatBuffers_Library_SONAME_FULL "${FlatBuffers_Library_SONAME_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set_target_properties(flatbuffers_shared PROPERTIES OUTPUT_NAME flatbuffers SOVERSION "${FlatBuffers_Library_SONAME_MAJOR}" VERSION "${FlatBuffers_Library_SONAME_FULL}") @@ -625,7 +627,6 @@ if(FLATBUFFERS_BUILD_GRPCTEST) endif() endif() -include(CMake/Version.cmake) if(FLATBUFFERS_INSTALL) include(GNUInstallDirs) diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h index 947d77476..a5ac10d78 100644 --- a/include/flatbuffers/base.h +++ b/include/flatbuffers/base.h @@ -140,7 +140,7 @@ #define FLATBUFFERS_VERSION_MAJOR 2 #define FLATBUFFERS_VERSION_MINOR 0 -#define FLATBUFFERS_VERSION_REVISION 0 +#define FLATBUFFERS_VERSION_REVISION 5 #define FLATBUFFERS_STRING_EXPAND(X) #X #define FLATBUFFERS_STRING(X) FLATBUFFERS_STRING_EXPAND(X) namespace flatbuffers { diff --git a/tests/MyGame/Example/Ability.lua b/tests/MyGame/Example/Ability.lua index f2609c5b4..0555a6acd 100644 --- a/tests/MyGame/Example/Ability.lua +++ b/tests/MyGame/Example/Ability.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Any.lua b/tests/MyGame/Example/Any.lua index 80f933fa3..58c8450f7 100644 --- a/tests/MyGame/Example/Any.lua +++ b/tests/MyGame/Example/Any.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/AnyAmbiguousAliases.lua b/tests/MyGame/Example/AnyAmbiguousAliases.lua index bf24ecabb..4dbd30b31 100644 --- a/tests/MyGame/Example/AnyAmbiguousAliases.lua +++ b/tests/MyGame/Example/AnyAmbiguousAliases.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/AnyUniqueAliases.lua b/tests/MyGame/Example/AnyUniqueAliases.lua index 92c07bf1d..7ca7ed7ea 100644 --- a/tests/MyGame/Example/AnyUniqueAliases.lua +++ b/tests/MyGame/Example/AnyUniqueAliases.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Color.lua b/tests/MyGame/Example/Color.lua index c58765b73..6289568b5 100644 --- a/tests/MyGame/Example/Color.lua +++ b/tests/MyGame/Example/Color.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Monster.lua b/tests/MyGame/Example/Monster.lua index e1d93a63c..98a9dc1b3 100644 --- a/tests/MyGame/Example/Monster.lua +++ b/tests/MyGame/Example/Monster.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Race.lua b/tests/MyGame/Example/Race.lua index 4c0ce195c..00798b64e 100644 --- a/tests/MyGame/Example/Race.lua +++ b/tests/MyGame/Example/Race.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Referrable.lua b/tests/MyGame/Example/Referrable.lua index 4a60e52c0..9f2d3bc9c 100644 --- a/tests/MyGame/Example/Referrable.lua +++ b/tests/MyGame/Example/Referrable.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Stat.lua b/tests/MyGame/Example/Stat.lua index 05e306fda..08ba1cdf9 100644 --- a/tests/MyGame/Example/Stat.lua +++ b/tests/MyGame/Example/Stat.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/StructOfStructs.lua b/tests/MyGame/Example/StructOfStructs.lua index df45cd57e..437441270 100644 --- a/tests/MyGame/Example/StructOfStructs.lua +++ b/tests/MyGame/Example/StructOfStructs.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Test.lua b/tests/MyGame/Example/Test.lua index 7cb278fb7..a1041e50a 100644 --- a/tests/MyGame/Example/Test.lua +++ b/tests/MyGame/Example/Test.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.lua b/tests/MyGame/Example/TestSimpleTableWithEnum.lua index e3db24a0c..061b4f4f6 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.lua +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/TypeAliases.lua b/tests/MyGame/Example/TypeAliases.lua index ce01caa43..051192324 100644 --- a/tests/MyGame/Example/TypeAliases.lua +++ b/tests/MyGame/Example/TypeAliases.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example/Vec3.lua b/tests/MyGame/Example/Vec3.lua index 2b40f01b1..d4bb11241 100644 --- a/tests/MyGame/Example/Vec3.lua +++ b/tests/MyGame/Example/Vec3.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/Example2/Monster.lua b/tests/MyGame/Example2/Monster.lua index 0cd3b9c4a..a30cbbfd0 100644 --- a/tests/MyGame/Example2/Monster.lua +++ b/tests/MyGame/Example2/Monster.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/InParentNamespace.lua b/tests/MyGame/InParentNamespace.lua index 9b65e88ad..1e39a014c 100644 --- a/tests/MyGame/InParentNamespace.lua +++ b/tests/MyGame/InParentNamespace.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //monster_test.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/OtherNameSpace/FromInclude.lua b/tests/MyGame/OtherNameSpace/FromInclude.lua index 7c626669a..95c378ee1 100644 --- a/tests/MyGame/OtherNameSpace/FromInclude.lua +++ b/tests/MyGame/OtherNameSpace/FromInclude.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //include_test/sub/include_test2.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/OtherNameSpace/TableB.lua b/tests/MyGame/OtherNameSpace/TableB.lua index d94c46832..3bb6a7e00 100644 --- a/tests/MyGame/OtherNameSpace/TableB.lua +++ b/tests/MyGame/OtherNameSpace/TableB.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //include_test/sub/include_test2.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/MyGame/OtherNameSpace/Unused.lua b/tests/MyGame/OtherNameSpace/Unused.lua index 38cd5a7af..ea04cdb31 100644 --- a/tests/MyGame/OtherNameSpace/Unused.lua +++ b/tests/MyGame/OtherNameSpace/Unused.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //include_test/sub/include_test2.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs) diff --git a/tests/TableA.lua b/tests/TableA.lua index 18b925b70..e3114db7e 100644 --- a/tests/TableA.lua +++ b/tests/TableA.lua @@ -3,7 +3,7 @@ Automatically generated by the FlatBuffers compiler, do not modify. Or modify. I'm a message, not a cop. - flatc version: 2.0.0 + flatc version: 2.0.5 Declared by : //include_test/include_test1.fbs Rooting type : MyGame.Example.Monster (//monster_test.fbs)