summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter van Oortmerssen <aardappel@gmail.com>2017-01-03 14:56:44 -0800
committerWouter van Oortmerssen <aardappel@gmail.com>2017-01-03 14:56:44 -0800
commitb29ba4c70c7b8ef415e37809574ac74a9bf0b632 (patch)
tree9e9dcfb62988ca9bd01944b4b715ceafaeae7501
parentfea6b525ee57bf61d307abc16ade8d9041a3a01d (diff)
downloadflatbuffers-b29ba4c70c7b8ef415e37809574ac74a9bf0b632.tar.gz
flatbuffers-b29ba4c70c7b8ef415e37809574ac74a9bf0b632.tar.bz2
flatbuffers-b29ba4c70c7b8ef415e37809574ac74a9bf0b632.zip
Updated version to 1.5v1.5.0
Change-Id: I34007829cdd3ad024df21f68bb369016d5d21131
-rw-r--r--include/flatbuffers/flatbuffers.h2
-rw-r--r--pom.xml2
-rw-r--r--src/flatc.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 99d1ca81..aa1d9179 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -88,7 +88,7 @@
#endif // !defined(FLATBUFFERS_LITTLEENDIAN)
#define FLATBUFFERS_VERSION_MAJOR 1
-#define FLATBUFFERS_VERSION_MINOR 0
+#define FLATBUFFERS_VERSION_MINOR 5
#define FLATBUFFERS_VERSION_REVISION 0
#define FLATBUFFERS_STRING_EXPAND(X) #X
#define FLATBUFFERS_STRING(X) FLATBUFFERS_STRING_EXPAND(X)
diff --git a/pom.xml b/pom.xml
index 86d7f532..d1d050d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>FlatBuffers Java API</name>
<description>
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 0dc30f79..7fc04012 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -19,7 +19,7 @@
#include "flatbuffers/util.h"
#include <limits>
-#define FLATC_VERSION "1.4.0 (" __DATE__ ")"
+#define FLATC_VERSION "1.5.0 (" __DATE__ ")"
static void Error(const std::string &err, bool usage = false,
bool show_exe_name = true);