summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter van Oortmerssen <aardappel@gmail.com>2021-05-10 11:27:06 -0700
committerWouter van Oortmerssen <aardappel@gmail.com>2021-05-10 11:29:32 -0700
commit6ed780dbd50f3fd4f2a12b13f5ef709da5372401 (patch)
tree5967f0461db439264e0fc0a33398d6827f4b565a
parent3412fab8ee5ef24432c3b71ba50ab65fe31a2ef3 (diff)
downloadflatbuffers-6ed780dbd50f3fd4f2a12b13f5ef709da5372401.tar.gz
flatbuffers-6ed780dbd50f3fd4f2a12b13f5ef709da5372401.tar.bz2
flatbuffers-6ed780dbd50f3fd4f2a12b13f5ef709da5372401.zip
C++/Rust version changes
-rw-r--r--CMake/Version.cmake4
-rw-r--r--CMakeLists.txt4
-rw-r--r--include/flatbuffers/base.h4
-rw-r--r--rust/flatbuffers/Cargo.toml4
-rw-r--r--rust/flexbuffers/Cargo.toml2
-rw-r--r--tests/MyGame/Example/MonsterStorageGrpc.java2
6 files changed, 10 insertions, 10 deletions
diff --git a/CMake/Version.cmake b/CMake/Version.cmake
index dff88913..cc6ca1fa 100644
--- a/CMake/Version.cmake
+++ b/CMake/Version.cmake
@@ -1,5 +1,5 @@
-set(VERSION_MAJOR 1)
-set(VERSION_MINOR 12)
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 0)
set(VERSION_PATCH 0)
set(VERSION_COMMIT 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dc6465f..ec782239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,8 +382,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 "1")
- set(FlatBuffers_Library_SONAME_FULL "${FlatBuffers_Library_SONAME_MAJOR}.12.0")
+ set(FlatBuffers_Library_SONAME_MAJOR "2")
+ set(FlatBuffers_Library_SONAME_FULL "${FlatBuffers_Library_SONAME_MAJOR}.0.0")
set_target_properties(flatbuffers_shared PROPERTIES OUTPUT_NAME flatbuffers
SOVERSION "${FlatBuffers_Library_SONAME_MAJOR}"
VERSION "${FlatBuffers_Library_SONAME_FULL}")
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
index 54a51aac..cc9e22dc 100644
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
@@ -142,8 +142,8 @@
#endif
#endif // !defined(FLATBUFFERS_LITTLEENDIAN)
-#define FLATBUFFERS_VERSION_MAJOR 1
-#define FLATBUFFERS_VERSION_MINOR 12
+#define FLATBUFFERS_VERSION_MAJOR 2
+#define FLATBUFFERS_VERSION_MINOR 0
#define FLATBUFFERS_VERSION_REVISION 0
#define FLATBUFFERS_STRING_EXPAND(X) #X
#define FLATBUFFERS_STRING(X) FLATBUFFERS_STRING_EXPAND(X)
diff --git a/rust/flatbuffers/Cargo.toml b/rust/flatbuffers/Cargo.toml
index 1dd1cf7f..3a5d3016 100644
--- a/rust/flatbuffers/Cargo.toml
+++ b/rust/flatbuffers/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "flatbuffers"
-version = "0.9.0"
-edition = "2018"
+version = "2.0.0"
+edition = "2021"
authors = ["Robert Winslow <hello@rwinslow.com>", "FlatBuffers Maintainers"]
license = "Apache-2.0"
description = "Official FlatBuffers Rust runtime library."
diff --git a/rust/flexbuffers/Cargo.toml b/rust/flexbuffers/Cargo.toml
index 30217ffe..e4fa6fa5 100644
--- a/rust/flexbuffers/Cargo.toml
+++ b/rust/flexbuffers/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "flexbuffers"
-version = "0.3.0"
+version = "2.0.0"
authors = ["Casper Neo <cneo@google.com>", "FlatBuffers Maintainers"]
edition = "2018"
license = "Apache-2.0"
diff --git a/tests/MyGame/Example/MonsterStorageGrpc.java b/tests/MyGame/Example/MonsterStorageGrpc.java
index 8e468d48..40103aeb 100644
--- a/tests/MyGame/Example/MonsterStorageGrpc.java
+++ b/tests/MyGame/Example/MonsterStorageGrpc.java
@@ -1,4 +1,4 @@
-//Generated by flatc compiler (version 1.12.0)
+//Generated by flatc compiler (version 2.0.0)
//If you make any local changes, they will be lost
//source: monster_test.fbs