Merge pull request #9533 from murgatroid99/version_1.1.1_bump

Bump version to 1.1.1
pull/9567/head
Michael Lumish 8 years ago committed by GitHub
commit 0e8763ffb1
  1. 2
      CMakeLists.txt
  2. 4
      Makefile
  3. 2
      build.yaml
  4. 2
      package.json
  5. 4
      package.xml
  6. 2
      src/cpp/common/version_cc.cc
  7. 4
      src/csharp/Grpc.Auth/project.json
  8. 4
      src/csharp/Grpc.Core/VersionInfo.cs
  9. 2
      src/csharp/Grpc.Core/project.json
  10. 4
      src/csharp/Grpc.HealthCheck/project.json
  11. 4
      src/csharp/Grpc.Reflection/project.json
  12. 2
      src/csharp/build_packages_dotnetcli.bat
  13. 4
      src/csharp/build_packages_dotnetcli.sh
  14. 4
      src/node/health_check/package.json
  15. 2
      src/node/tools/package.json
  16. 2
      src/php/composer.json
  17. 2
      src/python/grpcio/grpc_version.py
  18. 2
      src/python/grpcio_health_checking/grpc_version.py
  19. 2
      src/python/grpcio_reflection/grpc_version.py
  20. 2
      src/python/grpcio_tests/grpc_version.py
  21. 2
      src/ruby/lib/grpc/version.rb
  22. 2
      src/ruby/tools/version.rb
  23. 2
      tools/distrib/python/grpcio_tools/grpc_version.py
  24. 2
      tools/doxygen/Doxyfile.c++
  25. 2
      tools/doxygen/Doxyfile.c++.internal

@ -42,7 +42,7 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(PACKAGE_NAME "grpc") set(PACKAGE_NAME "grpc")
set(PACKAGE_VERSION "1.1.0") set(PACKAGE_VERSION "1.1.1")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

@ -442,8 +442,8 @@ Q = @
endif endif
CORE_VERSION = 2.0.0 CORE_VERSION = 2.0.0
CPP_VERSION = 1.1.0 CPP_VERSION = 1.1.1
CSHARP_VERSION = 1.1.0 CSHARP_VERSION = 1.1.1
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)

@ -14,7 +14,7 @@ settings:
'#10': See the expand_version.py for all the quirks here '#10': See the expand_version.py for all the quirks here
core_version: 2.0.0 core_version: 2.0.0
g_stands_for: good g_stands_for: good
version: 1.1.0 version: 1.1.1
filegroups: filegroups:
- name: census - name: census
public_headers: public_headers:

@ -1,6 +1,6 @@
{ {
"name": "grpc", "name": "grpc",
"version": "1.1.0", "version": "1.1.1",
"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/",

@ -13,8 +13,8 @@
<date>2017-01-13</date> <date>2017-01-13</date>
<time>16:06:07</time> <time>16:06:07</time>
<version> <version>
<release>1.1.0</release> <release>1.1.1</release>
<api>1.1.0</api> <api>1.1.1</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</release>

@ -37,5 +37,5 @@
#include <grpc++/grpc++.h> #include <grpc++/grpc++.h>
namespace grpc { namespace grpc {
grpc::string Version() { return "1.1.0"; } grpc::string Version() { return "1.1.1"; }
} }

@ -1,5 +1,5 @@
{ {
"version": "1.1.0", "version": "1.1.1",
"title": "gRPC C# Auth", "title": "gRPC C# Auth",
"authors": [ "Google Inc." ], "authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.", "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
} }
}, },
"dependencies": { "dependencies": {
"Grpc.Core": "1.1.0", "Grpc.Core": "1.1.1",
"Google.Apis.Auth": "1.16.0" "Google.Apis.Auth": "1.16.0"
}, },
"frameworks": { "frameworks": {

@ -48,11 +48,11 @@ namespace Grpc.Core
/// <summary> /// <summary>
/// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
/// </summary> /// </summary>
public const string CurrentAssemblyFileVersion = "1.1.0.0"; public const string CurrentAssemblyFileVersion = "1.1.1.0";
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>
public const string CurrentVersion = "1.1.0"; public const string CurrentVersion = "1.1.1";
} }
} }

@ -1,5 +1,5 @@
{ {
"version": "1.1.0", "version": "1.1.1",
"title": "gRPC C# Core", "title": "gRPC C# Core",
"authors": [ "Google Inc." ], "authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.", "copyright": "Copyright 2015, Google Inc.",

@ -1,5 +1,5 @@
{ {
"version": "1.1.0", "version": "1.1.1",
"title": "gRPC C# Healthchecking", "title": "gRPC C# Healthchecking",
"authors": [ "Google Inc." ], "authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.", "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
} }
}, },
"dependencies": { "dependencies": {
"Grpc.Core": "1.1.0", "Grpc.Core": "1.1.1",
"Google.Protobuf": "3.0.0" "Google.Protobuf": "3.0.0"
}, },
"frameworks": { "frameworks": {

@ -1,5 +1,5 @@
{ {
"version": "1.1.0", "version": "1.1.1",
"title": "gRPC C# Reflection", "title": "gRPC C# Reflection",
"authors": [ "Google Inc." ], "authors": [ "Google Inc." ],
"copyright": "Copyright 2016, Google Inc.", "copyright": "Copyright 2016, Google Inc.",
@ -21,7 +21,7 @@
} }
}, },
"dependencies": { "dependencies": {
"Grpc.Core": "1.1.0", "Grpc.Core": "1.1.1",
"Google.Protobuf": "3.0.0" "Google.Protobuf": "3.0.0"
}, },
"frameworks": { "frameworks": {

@ -28,7 +28,7 @@
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@rem Current package versions @rem Current package versions
set VERSION=1.1.0 set VERSION=1.1.1
set PROTOBUF_VERSION=3.0.0 set PROTOBUF_VERSION=3.0.0
@rem Adjust the location of nuget.exe @rem Adjust the location of nuget.exe

@ -65,7 +65,7 @@ dotnet pack --configuration Release Grpc.Auth/project.json --output ../../artifa
dotnet pack --configuration Release Grpc.HealthCheck/project.json --output ../../artifacts dotnet pack --configuration Release Grpc.HealthCheck/project.json --output ../../artifacts
dotnet pack --configuration Release Grpc.Reflection/project.json --output ../../artifacts dotnet pack --configuration Release Grpc.Reflection/project.json --output ../../artifacts
nuget pack Grpc.nuspec -Version "1.1.0" -OutputDirectory ../../artifacts nuget pack Grpc.nuspec -Version "1.1.1" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.1.0" -OutputDirectory ../../artifacts nuget pack Grpc.Tools.nuspec -Version "1.1.1" -OutputDirectory ../../artifacts
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

@ -1,6 +1,6 @@
{ {
"name": "grpc-health-check", "name": "grpc-health-check",
"version": "1.1.0", "version": "1.1.1",
"author": "Google Inc.", "author": "Google Inc.",
"description": "Health check service for use with gRPC", "description": "Health check service for use with gRPC",
"repository": { "repository": {
@ -15,7 +15,7 @@
} }
], ],
"dependencies": { "dependencies": {
"grpc": "^1.1.0", "grpc": "^1.1.1",
"lodash": "^3.9.3", "lodash": "^3.9.3",
"google-protobuf": "^3.0.0" "google-protobuf": "^3.0.0"
}, },

@ -1,6 +1,6 @@
{ {
"name": "grpc-tools", "name": "grpc-tools",
"version": "1.1.0", "version": "1.1.1",
"author": "Google Inc.", "author": "Google Inc.",
"description": "Tools for developing with gRPC on Node.js", "description": "Tools for developing with gRPC on Node.js",
"homepage": "http://www.grpc.io/", "homepage": "http://www.grpc.io/",

@ -5,7 +5,7 @@
"keywords": ["rpc"], "keywords": ["rpc"],
"homepage": "http://grpc.io", "homepage": "http://grpc.io",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"version": "1.1.0", "version": "1.1.1",
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"ext-grpc": "*", "ext-grpc": "*",

@ -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='1.1.0' VERSION='1.1.1'

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
VERSION='1.1.0' VERSION='1.1.1'

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
VERSION='1.1.0' VERSION='1.1.1'

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
VERSION='1.1.0' VERSION='1.1.1'

@ -29,5 +29,5 @@
# GRPC contains the General RPC module. # GRPC contains the General RPC module.
module GRPC module GRPC
VERSION = '1.1.0' VERSION = '1.1.1'
end end

@ -29,6 +29,6 @@
module GRPC module GRPC
module Tools module Tools
VERSION = '1.1.0' VERSION = '1.1.1'
end end
end end

@ -29,4 +29,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
VERSION='1.1.0' VERSION='1.1.1'

@ -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 = 1.1.0 PROJECT_NUMBER = 1.1.1
# 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

@ -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 = 1.1.0 PROJECT_NUMBER = 1.1.1
# 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

Loading…
Cancel
Save