summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter van Oortmerssen <aardappel@gmail.com>2021-05-10 11:14:47 -0700
committerWouter van Oortmerssen <aardappel@gmail.com>2021-05-10 11:14:47 -0700
commit8a7d013f855821d6482038cc89078d082fdaea95 (patch)
tree3fb10d8acfa97bc065d1fdd13b98d3c592e7b957
parent170af59788e07eb04b24fd19921bab286d637a40 (diff)
downloadflatbuffers-8a7d013f855821d6482038cc89078d082fdaea95.tar.gz
flatbuffers-8a7d013f855821d6482038cc89078d082fdaea95.tar.bz2
flatbuffers-8a7d013f855821d6482038cc89078d082fdaea95.zip
Updated main version numbers to 2.0
-rw-r--r--android/app/build.gradle2
-rw-r--r--dart/pubspec.yaml2
-rw-r--r--grpc/examples/ts/greeter/package.json2
-rw-r--r--grpc/flatbuffers-java-grpc/pom.xml4
-rw-r--r--grpc/pom.xml2
-rw-r--r--grpc/tests/pom.xml4
-rw-r--r--java/com/google/flatbuffers/Constants.java2
-rw-r--r--kotlin/benchmark/build.gradle.kts2
-rw-r--r--kotlin/build.gradle.kts2
-rw-r--r--kotlin/flatbuffers-kotlin/build.gradle.kts4
-rw-r--r--net/FlatBuffers/FlatBufferConstants.cs2
-rw-r--r--package.json2
-rw-r--r--pom.xml2
-rw-r--r--src/idl_gen_csharp.cpp2
-rw-r--r--src/idl_gen_java.cpp2
-rw-r--r--src/idl_gen_kotlin.cpp2
-rw-r--r--src/idl_gen_swift.cpp2
-rw-r--r--swift/Sources/FlatBuffers/Constants.swift2
18 files changed, 21 insertions, 21 deletions
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4888067d..f72f21f0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -139,6 +139,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
+ implementation 'com.google.flatbuffers:flatbuffers-java:2.0.0'
}
diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml
index 78a7bf17..c13d3ce9 100644
--- a/dart/pubspec.yaml
+++ b/dart/pubspec.yaml
@@ -1,5 +1,5 @@
name: flat_buffers
-version: 1.12.0
+version: 2.0.0
description: >
FlatBuffers reading and writing library for Dart. Use the flatc compiler to
generate Dart classes for a FlatBuffers schema, and this library to assist with
diff --git a/grpc/examples/ts/greeter/package.json b/grpc/examples/ts/greeter/package.json
index aab27b2a..c216544b 100644
--- a/grpc/examples/ts/greeter/package.json
+++ b/grpc/examples/ts/greeter/package.json
@@ -8,7 +8,7 @@
"server": "node dist/server.js"
},
"dependencies": {
- "flatbuffers": "^1.12.0",
+ "flatbuffers": "^2.0.0",
"grpc": "^1.24.3"
}
}
diff --git a/grpc/flatbuffers-java-grpc/pom.xml b/grpc/flatbuffers-java-grpc/pom.xml
index 17814f65..f9d96573 100644
--- a/grpc/flatbuffers-java-grpc/pom.xml
+++ b/grpc/flatbuffers-java-grpc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
- <version>1.12.0</version>
+ <version>2.0.0</version>
</parent>
<artifactId>flatbuffers-java-grpc</artifactId>
<name>${project.artifactId}</name>
@@ -24,7 +24,7 @@
</developer>
</developers>
<properties>
- <gRPC.version>1.12.0</gRPC.version>
+ <gRPC.version>2.0.0</gRPC.version>
</properties>
<dependencies>
<dependency>
diff --git a/grpc/pom.xml b/grpc/pom.xml
index 1eaf8d9a..f50a9bd3 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
<packaging>pom</packaging>
- <version>1.12.0</version>
+ <version>2.0.0</version>
<name>flatbuffers-parent</name>
<description>parent pom for flatbuffers java artifacts</description>
<properties>
diff --git a/grpc/tests/pom.xml b/grpc/tests/pom.xml
index 26e7624d..e80e93b6 100644
--- a/grpc/tests/pom.xml
+++ b/grpc/tests/pom.xml
@@ -4,13 +4,13 @@
<parent>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId>
- <version>1.12.0</version>
+ <version>2.0.0</version>
</parent>
<artifactId>grpc-test</artifactId>
<description>Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs
</description>
<properties>
- <gRPC.version>1.12.0</gRPC.version>
+ <gRPC.version>2.0.0</gRPC.version>
</properties>
<dependencies>
<dependency>
diff --git a/java/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java
index 0623b942..0c0920f6 100644
--- a/java/com/google/flatbuffers/Constants.java
+++ b/java/com/google/flatbuffers/Constants.java
@@ -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_1_12_0() {}
+ public static void FLATBUFFERS_2_0_0() {}
}
/// @endcond
diff --git a/kotlin/benchmark/build.gradle.kts b/kotlin/benchmark/build.gradle.kts
index 4e84fd1d..2294e4c0 100644
--- a/kotlin/benchmark/build.gradle.kts
+++ b/kotlin/benchmark/build.gradle.kts
@@ -15,7 +15,7 @@ allOpen {
}
group = "com.google.flatbuffers.jmh"
-version = "1.12.0-SNAPSHOT"
+version = "2.0.0-SNAPSHOT"
// This plugin generates a static html page with the aggregation
// of all benchmarks ran. very useful visualization tool.
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
index aff0720c..455ee0d7 100644
--- a/kotlin/build.gradle.kts
+++ b/kotlin/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
}
group = "com.google.flatbuffers"
-version = "1.12.0-SNAPSHOT"
+version = "2.0.0-SNAPSHOT"
subprojects {
diff --git a/kotlin/flatbuffers-kotlin/build.gradle.kts b/kotlin/flatbuffers-kotlin/build.gradle.kts
index 3a2447de..b74807ee 100644
--- a/kotlin/flatbuffers-kotlin/build.gradle.kts
+++ b/kotlin/flatbuffers-kotlin/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
}
group = "com.google.flatbuffers.kotlin"
-version = "1.12.0-SNAPSHOT"
+version = "2.0.0-SNAPSHOT"
kotlin {
explicitApi()
@@ -29,7 +29,7 @@ kotlin {
implementation(kotlin("stdlib-common"))
}
}
-
+
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
diff --git a/net/FlatBuffers/FlatBufferConstants.cs b/net/FlatBuffers/FlatBufferConstants.cs
index 1d4c5dce..473f79a9 100644
--- a/net/FlatBuffers/FlatBufferConstants.cs
+++ b/net/FlatBuffers/FlatBufferConstants.cs
@@ -32,6 +32,6 @@ namespace FlatBuffers
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_1_12_0() {}
+ public static void FLATBUFFERS_2_0_0() {}
}
}
diff --git a/package.json b/package.json
index 04ed26b9..7798eb48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "flatbuffers",
- "version": "1.12.0",
+ "version": "2.0.0",
"description": "Memory Efficient Serialization Library",
"files": [
"js/*.js",
diff --git a/pom.xml b/pom.xml
index b9153383..87285955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
- <version>1.12.0</version>
+ <version>2.0.0</version>
<packaging>bundle</packaging>
<name>FlatBuffers Java API</name>
<description>
diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp
index a5423a23..681ab6d6 100644
--- a/src/idl_gen_csharp.cpp
+++ b/src/idl_gen_csharp.cpp
@@ -553,7 +553,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_1_12_0(); ";
+ code += "FLATBUFFERS_2_0_0(); ";
code += "}\n";
// Generate a special accessor for the table that when used as the root
diff --git a/src/idl_gen_java.cpp b/src/idl_gen_java.cpp
index 9d1d35a7..cfd3a55c 100644
--- a/src/idl_gen_java.cpp
+++ b/src/idl_gen_java.cpp
@@ -591,7 +591,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_1_12_0(); ";
+ code += "FLATBUFFERS_2_0_0(); ";
code += "}\n";
// Generate a special accessor for the table that when used as the root
diff --git a/src/idl_gen_kotlin.cpp b/src/idl_gen_kotlin.cpp
index 4c921958..fb4ce87a 100644
--- a/src/idl_gen_kotlin.cpp
+++ b/src/idl_gen_kotlin.cpp
@@ -494,7 +494,7 @@ class KotlinGenerator : public BaseGenerator {
// runtime.
GenerateFunOneLine(
writer, "validateVersion", "", "",
- [&]() { writer += "Constants.FLATBUFFERS_1_12_0()"; },
+ [&]() { writer += "Constants.FLATBUFFERS_2_0_0()"; },
options.gen_jvmstatic);
GenerateGetRootAsAccessors(Esc(struct_def.name), writer, options);
diff --git a/src/idl_gen_swift.cpp b/src/idl_gen_swift.cpp
index 9e48f820..3fffd394 100644
--- a/src/idl_gen_swift.cpp
+++ b/src/idl_gen_swift.cpp
@@ -1482,7 +1482,7 @@ class SwiftGenerator : public BaseGenerator {
}
std::string ValidateFunc() {
- return "static func validateVersion() { FlatBuffersVersion_1_12_0() }";
+ return "static func validateVersion() { FlatBuffersVersion_2_0_0() }";
}
std::string GenType(const Type &type,
diff --git a/swift/Sources/FlatBuffers/Constants.swift b/swift/Sources/FlatBuffers/Constants.swift
index 44021e91..470b7252 100644
--- a/swift/Sources/FlatBuffers/Constants.swift
+++ b/swift/Sources/FlatBuffers/Constants.swift
@@ -109,4 +109,4 @@ extension UInt64: Scalar {
public typealias NumericValue = UInt64
}
-public func FlatBuffersVersion_1_12_0() {}
+public func FlatBuffersVersion_2_0_0() {}