Updated main version numbers to 2.0

This commit is contained in:
Wouter van Oortmerssen
2021-05-10 11:14:47 -07:00
parent 170af59788
commit 8a7d013f85
18 changed files with 21 additions and 21 deletions

View File

@@ -139,6 +139,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0' 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'
} }

View File

@@ -1,5 +1,5 @@
name: flat_buffers name: flat_buffers
version: 1.12.0 version: 2.0.0
description: > description: >
FlatBuffers reading and writing library for Dart. Use the flatc compiler to 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 generate Dart classes for a FlatBuffers schema, and this library to assist with

View File

@@ -8,7 +8,7 @@
"server": "node dist/server.js" "server": "node dist/server.js"
}, },
"dependencies": { "dependencies": {
"flatbuffers": "^1.12.0", "flatbuffers": "^2.0.0",
"grpc": "^1.24.3" "grpc": "^1.24.3"
} }
} }

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.google.flatbuffers</groupId> <groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId> <artifactId>flatbuffers-parent</artifactId>
<version>1.12.0</version> <version>2.0.0</version>
</parent> </parent>
<artifactId>flatbuffers-java-grpc</artifactId> <artifactId>flatbuffers-java-grpc</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@@ -24,7 +24,7 @@
</developer> </developer>
</developers> </developers>
<properties> <properties>
<gRPC.version>1.12.0</gRPC.version> <gRPC.version>2.0.0</gRPC.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@@ -4,7 +4,7 @@
<groupId>com.google.flatbuffers</groupId> <groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId> <artifactId>flatbuffers-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.12.0</version> <version>2.0.0</version>
<name>flatbuffers-parent</name> <name>flatbuffers-parent</name>
<description>parent pom for flatbuffers java artifacts</description> <description>parent pom for flatbuffers java artifacts</description>
<properties> <properties>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>com.google.flatbuffers</groupId> <groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-parent</artifactId> <artifactId>flatbuffers-parent</artifactId>
<version>1.12.0</version> <version>2.0.0</version>
</parent> </parent>
<artifactId>grpc-test</artifactId> <artifactId>grpc-test</artifactId>
<description>Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs <description>Example/Test project demonstrating usage of flatbuffers with GRPC-Java instead of protobufs
</description> </description>
<properties> <properties>
<gRPC.version>1.12.0</gRPC.version> <gRPC.version>2.0.0</gRPC.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@@ -46,7 +46,7 @@ public class Constants {
Changes to the Java implementation need to be sure to change Changes to the Java implementation need to be sure to change
the version here and in the code generator on every possible the version here and in the code generator on every possible
incompatible change */ incompatible change */
public static void FLATBUFFERS_1_12_0() {} public static void FLATBUFFERS_2_0_0() {}
} }
/// @endcond /// @endcond

View File

@@ -15,7 +15,7 @@ allOpen {
} }
group = "com.google.flatbuffers.jmh" 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 // This plugin generates a static html page with the aggregation
// of all benchmarks ran. very useful visualization tool. // of all benchmarks ran. very useful visualization tool.

View File

@@ -3,7 +3,7 @@ plugins {
} }
group = "com.google.flatbuffers" group = "com.google.flatbuffers"
version = "1.12.0-SNAPSHOT" version = "2.0.0-SNAPSHOT"
subprojects { subprojects {

View File

@@ -3,7 +3,7 @@ plugins {
} }
group = "com.google.flatbuffers.kotlin" group = "com.google.flatbuffers.kotlin"
version = "1.12.0-SNAPSHOT" version = "2.0.0-SNAPSHOT"
kotlin { kotlin {
explicitApi() explicitApi()
@@ -29,7 +29,7 @@ kotlin {
implementation(kotlin("stdlib-common")) implementation(kotlin("stdlib-common"))
} }
} }
val commonTest by getting { val commonTest by getting {
dependencies { dependencies {
implementation(kotlin("test-common")) implementation(kotlin("test-common"))

View File

@@ -32,6 +32,6 @@ namespace FlatBuffers
Changes to the C# implementation need to be sure to change Changes to the C# implementation need to be sure to change
the version here and in the code generator on every possible the version here and in the code generator on every possible
incompatible change */ incompatible change */
public static void FLATBUFFERS_1_12_0() {} public static void FLATBUFFERS_2_0_0() {}
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "flatbuffers", "name": "flatbuffers",
"version": "1.12.0", "version": "2.0.0",
"description": "Memory Efficient Serialization Library", "description": "Memory Efficient Serialization Library",
"files": [ "files": [
"js/*.js", "js/*.js",

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.google.flatbuffers</groupId> <groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId> <artifactId>flatbuffers-java</artifactId>
<version>1.12.0</version> <version>2.0.0</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>FlatBuffers Java API</name> <name>FlatBuffers Java API</name>
<description> <description>

View File

@@ -553,7 +553,7 @@ class CSharpGenerator : public BaseGenerator {
// Force compile time error if not using the same version runtime. // Force compile time error if not using the same version runtime.
code += " public static void ValidateVersion() {"; code += " public static void ValidateVersion() {";
code += " FlatBufferConstants."; code += " FlatBufferConstants.";
code += "FLATBUFFERS_1_12_0(); "; code += "FLATBUFFERS_2_0_0(); ";
code += "}\n"; code += "}\n";
// Generate a special accessor for the table that when used as the root // Generate a special accessor for the table that when used as the root

View File

@@ -591,7 +591,7 @@ class JavaGenerator : public BaseGenerator {
// Force compile time error if not using the same version runtime. // Force compile time error if not using the same version runtime.
code += " public static void ValidateVersion() {"; code += " public static void ValidateVersion() {";
code += " Constants."; code += " Constants.";
code += "FLATBUFFERS_1_12_0(); "; code += "FLATBUFFERS_2_0_0(); ";
code += "}\n"; code += "}\n";
// Generate a special accessor for the table that when used as the root // Generate a special accessor for the table that when used as the root

View File

@@ -494,7 +494,7 @@ class KotlinGenerator : public BaseGenerator {
// runtime. // runtime.
GenerateFunOneLine( GenerateFunOneLine(
writer, "validateVersion", "", "", writer, "validateVersion", "", "",
[&]() { writer += "Constants.FLATBUFFERS_1_12_0()"; }, [&]() { writer += "Constants.FLATBUFFERS_2_0_0()"; },
options.gen_jvmstatic); options.gen_jvmstatic);
GenerateGetRootAsAccessors(Esc(struct_def.name), writer, options); GenerateGetRootAsAccessors(Esc(struct_def.name), writer, options);

View File

@@ -1482,7 +1482,7 @@ class SwiftGenerator : public BaseGenerator {
} }
std::string ValidateFunc() { 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, std::string GenType(const Type &type,

View File

@@ -109,4 +109,4 @@ extension UInt64: Scalar {
public typealias NumericValue = UInt64 public typealias NumericValue = UInt64
} }
public func FlatBuffersVersion_1_12_0() {} public func FlatBuffersVersion_2_0_0() {}