Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5144 from nicolasnoble/master-is-14

Browse Source 
Flagging master's version properly.
pull/5148/merge
Jan Tattermusch 9 years ago
parent 32454cfbfc 1935c3655c
commit 0618f272c0
16 changed files with 25 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 2
      build.yaml
  3. 2
      package.json
  4. 2
      src/core/surface/version.c
  5. 2
      src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
  6. 2
      src/csharp/Grpc.Core/Version.cs
  7. 7
      src/csharp/Grpc.Core/VersionInfo.cs
  8. 2
      src/csharp/build_packages.bat
  9. 2
      src/python/grpcio/grpc_version.py
  10. 2
      src/ruby/lib/grpc/version.rb
  11. 2
      templates/package.json.template
  12. 5
      templates/src/csharp/Grpc.Core/VersionInfo.cs.template
  13. 2
      tools/doxygen/Doxyfile.c++
  14. 2
      tools/doxygen/Doxyfile.c++.internal
  15. 2
      tools/doxygen/Doxyfile.core
  16. 2
      tools/doxygen/Doxyfile.core.internal

2
Makefile
Unescape View File

@ -361,7 +361,7 @@ E = @echo
Q = @ Q = @
endif endif
VERSION = 0.13.0-dev VERSION = 0.14.0-dev
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

2
build.yaml
Unescape View File

@ -7,7 +7,7 @@ settings:
'#3': Use "-preN" suffixes to identify pre-release versions '#3': Use "-preN" suffixes to identify pre-release versions
'#4': Per-language overrides are possible with (eg) ruby_version tag here '#4': Per-language overrides are possible with (eg) ruby_version tag here
'#5': See the expand_version.py for all the quirks here '#5': See the expand_version.py for all the quirks here
version: 0.13.0-dev version: 0.14.0-dev
filegroups: filegroups:
- name: census - name: census
public_headers: public_headers:

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "grpc", "name": "grpc",
"version": "0.12.0", "version": "0.14.0-dev",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "http://www.grpc.io/", "homepage": "http://www.grpc.io/",

2
src/core/surface/version.c
Unescape View File

@ -36,4 +36,4 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
const char *grpc_version_string(void) { return "0.13.0-dev"; } const char *grpc_version_string(void) { return "0.14.0-dev"; }

2
src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
Unescape View File

@ -84,7 +84,7 @@ namespace Grpc.Core.Tests
{ {
var coreVersion = GrpcEnvironment.GetCoreVersionString(); var coreVersion = GrpcEnvironment.GetCoreVersionString();
var parts = coreVersion.Split('.'); var parts = coreVersion.Split('.');
Assert.AreEqual(4, parts.Length); Assert.AreEqual(3, parts.Length);
} }
} }
} }

2
src/csharp/Grpc.Core/Version.cs
Unescape View File

@ -34,4 +34,4 @@
using System.Reflection; using System.Reflection;
// The current version of gRPC C#. // The current version of gRPC C#.
[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentVersion + ".0")] [assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentAssemblyVersion)]

7
src/csharp/Grpc.Core/VersionInfo.cs
Unescape View File

@ -38,9 +38,14 @@ namespace Grpc.Core
/// </summary> /// </summary>
public static class VersionInfo public static class VersionInfo
{ {
/// <summary>
/// Current version of gRPC C# assemblies
/// </summary>
public const string CurrentAssemblyVersion = "0.14.0.0";
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>
public const string CurrentVersion = "0.13.0-dev"; public const string CurrentVersion = "0.14.0-dev";
} }
} }

2
src/csharp/build_packages.bat
Unescape View File

@ -1,7 +1,7 @@
@rem Builds gRPC NuGet packages @rem Builds gRPC NuGet packages
@rem Current package versions @rem Current package versions
set VERSION=0.13.0-dev set VERSION=0.14.0-dev
set PROTOBUF_VERSION=3.0.0-beta2 set PROTOBUF_VERSION=3.0.0-beta2
@rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well.

2
src/python/grpcio/grpc_version.py
Unescape View File

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
VERSION='0.13.0.dev0' VERSION='0.14.0.dev0'

2
src/ruby/lib/grpc/version.rb
Unescape View File

@ -29,5 +29,5 @@
# GRPC contains the General RPC module. # GRPC contains the General RPC module.
module GRPC module GRPC
VERSION = '0.13.0-dev' VERSION = '0.14.0-dev'
end end

2
templates/package.json.template
Unescape View File

@ -2,7 +2,7 @@
--- | --- |
{ {
"name": "grpc", "name": "grpc",
"version": "0.12.0", "version": "${settings.node_version}",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "http://www.grpc.io/", "homepage": "http://www.grpc.io/",

5
templates/src/csharp/Grpc.Core/VersionInfo.cs.template
Unescape View File

@ -40,6 +40,11 @@
/// </summary> /// </summary>
public static class VersionInfo public static class VersionInfo
{ {
/// <summary>
/// Current version of gRPC C# assemblies
/// </summary>
public const string CurrentAssemblyVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}.0";
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>

2
tools/doxygen/Doxyfile.c++
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 0.13.0-dev PROJECT_NUMBER = 0.14.0-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.c++.internal
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 0.13.0-dev PROJECT_NUMBER = 0.14.0-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.core
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 0.13.0-dev PROJECT_NUMBER = 0.14.0-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.core.internal
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 0.13.0-dev PROJECT_NUMBER = 0.14.0-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

Write Preview
Loading…
Cancel
Save