diff --git a/android/app/build.gradle b/android/app/build.gradle index 4888067de..f72f21f0b 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 78a7bf17c..c13d3ce93 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 aab27b2a2..c216544bd 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 17814f65c..f9d96573c 100644 --- a/grpc/flatbuffers-java-grpc/pom.xml +++ b/grpc/flatbuffers-java-grpc/pom.xml @@ -6,7 +6,7 @@ com.google.flatbuffers flatbuffers-parent - 1.12.0 + 2.0.0 flatbuffers-java-grpc ${project.artifactId} @@ -24,7 +24,7 @@ - 1.12.0 + 2.0.0 diff --git a/grpc/pom.xml b/grpc/pom.xml index 1eaf8d9a0..f50a9bd39 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -4,7 +4,7 @@ com.google.flatbuffers flatbuffers-parent pom - 1.12.0 + 2.0.0 flatbuffers-parent parent pom for flatbuffers java artifacts diff --git a/grpc/tests/pom.xml b/grpc/tests/pom.xml index 26e7624d8..e80e93b61 100644 --- a/grpc/tests/pom.xml +++ b/grpc/tests/pom.xml @@ -4,13 +4,13 @@ com.google.flatbuffers flatbuffers-parent - 1.12.0 + 2.0.0 grpc-test Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs - 1.12.0 + 2.0.0 diff --git a/java/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java index 0623b9421..0c0920f6d 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 4e84fd1d3..2294e4c03 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 aff0720c6..455ee0d70 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 3a2447de7..b74807eed 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 1d4c5dce3..473f79a93 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 04ed26b99..7798eb484 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 b91533838..87285955e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.flatbuffers flatbuffers-java - 1.12.0 + 2.0.0 bundle FlatBuffers Java API diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp index a5423a235..681ab6d64 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 9d1d35a7e..cfd3a55cd 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 4c9219585..fb4ce87a6 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 9e48f8200..3fffd3945 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 44021e91e..470b7252b 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() {}