aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Poletti <poletti.marco@gmail.com>2020-07-12 10:02:58 -0700
committerMarco Poletti <poletti.marco@gmail.com>2020-07-12 10:02:58 -0700
commit29c9fd265cfa72ee72fb64257fe4b72198d87264 (patch)
tree14f40f915580ee7df397d5a5348a1f1090f14960
parentaeb903162f2c6bbcc378e8024142995cae79e6f8 (diff)
downloadgoogle-fruit-29c9fd265cfa72ee72fb64257fe4b72198d87264.tar.gz
Bump the Fruit version to 3.6.0.
-rw-r--r--CMakeLists.txt2
-rw-r--r--conanfile.py2
-rwxr-xr-xextras/packaging/deploy_to_bintray.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5b6a64..7efcf7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.2)
-project(Fruit VERSION 3.5.0 LANGUAGES CXX)
+project(Fruit VERSION 3.6.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 9c87a68..a96d39c 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,7 @@ import os
class FruitConan(ConanFile):
name = "fruit"
- version = "3.5.0"
+ version = "3.6.0"
license = "Apache"
url = "https://github.com/google/fruit"
homepage = "https://github.com/google/fruit"
diff --git a/extras/packaging/deploy_to_bintray.sh b/extras/packaging/deploy_to_bintray.sh
index 0365a6d..78d5c51 100755
--- a/extras/packaging/deploy_to_bintray.sh
+++ b/extras/packaging/deploy_to_bintray.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-FRUIT_VERSION=3.5.0
+FRUIT_VERSION=3.6.0
# To authenticate:
# conan user -p <BINTRAY_API_KEY_HERE> -r fruit-bintray polettimarco