From b726177764f6f4f2468623ccb84e2502062e8ab4 Mon Sep 17 00:00:00 2001 From: Marco Poletti Date: Sun, 5 Apr 2020 18:03:36 -0700 Subject: [PATCH] Bump the version to 3.5.0. --- CMakeLists.txt | 2 +- conanfile.py | 2 +- extras/packaging/deploy_to_bintray.bat | 2 +- extras/packaging/deploy_to_bintray.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 524d1f3b..d5b6a643 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) -project(Fruit VERSION 3.4.0 LANGUAGES CXX) +project(Fruit VERSION 3.5.0 LANGUAGES CXX) set(FRUIT_IS_BEING_BUILT_BY_CONAN FALSE CACHE BOOL "This is set in Conan builds.") if("${FRUIT_IS_BEING_BUILT_BY_CONAN}") diff --git a/conanfile.py b/conanfile.py index 9d2c664f..9c87a68c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ class FruitConan(ConanFile): name = "fruit" - version = "3.4.0" + version = "3.5.0" license = "Apache" url = "https://github.com/google/fruit" homepage = "https://github.com/google/fruit" diff --git a/extras/packaging/deploy_to_bintray.bat b/extras/packaging/deploy_to_bintray.bat index 24733436..1a289146 100644 --- a/extras/packaging/deploy_to_bintray.bat +++ b/extras/packaging/deploy_to_bintray.bat @@ -1,4 +1,4 @@ -set FRUIT_VERSION=3.4.0 +set FRUIT_VERSION=354.0 for %%G in (Release Debug) DO CMD /C for %%H in (True False) DO CMD /C for %%I in (True False) DO conan create . google/stable -o fruit:shared=%%H -o fruit:use_boost=%%I -s build_type=%%G diff --git a/extras/packaging/deploy_to_bintray.sh b/extras/packaging/deploy_to_bintray.sh index 31a80c77..0365a6df 100755 --- a/extras/packaging/deploy_to_bintray.sh +++ b/extras/packaging/deploy_to_bintray.sh @@ -1,6 +1,6 @@ #!/bin/bash -FRUIT_VERSION=3.4.0 +FRUIT_VERSION=3.5.0 # To authenticate: # conan user -p -r fruit-bintray polettimarco