From 939b9a69b3b4ae5296630660e5017d482a8bbe83 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 24 Mar 2024 00:10:03 +0900 Subject: [PATCH 1/5] octo-logger-cpp: add version 1.6.0 --- recipes/octo-logger-cpp/all/conandata.yml | 3 +++ recipes/octo-logger-cpp/all/conanfile.py | 4 ++-- recipes/octo-logger-cpp/config.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/octo-logger-cpp/all/conandata.yml b/recipes/octo-logger-cpp/all/conandata.yml index 92395bec9bd21..eb5f3478e1d43 100644 --- a/recipes/octo-logger-cpp/all/conandata.yml +++ b/recipes/octo-logger-cpp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.6.0": + url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.6.0.tar.gz" + sha256: "c6146df88299791631ec0e7c1aacf83a1369954033b798cbe433150d78ef7da1" "1.5.0": url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.5.0.tar.gz" sha256: "e62e4a54700f7c235111fd2b75c51d96f0b4deaf2c24ce7bc9ef1751ce31ea20" diff --git a/recipes/octo-logger-cpp/all/conanfile.py b/recipes/octo-logger-cpp/all/conanfile.py index d8b77698e6f0d..247a0179f4fb8 100644 --- a/recipes/octo-logger-cpp/all/conanfile.py +++ b/recipes/octo-logger-cpp/all/conanfile.py @@ -52,9 +52,9 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("fmt/10.1.1", transitive_headers=True) + self.requires("fmt/10.2.1", transitive_headers=True) if self.options.get_safe("with_aws"): - self.requires("nlohmann_json/3.11.2") + self.requires("nlohmann_json/3.11.3") self.requires("aws-sdk-cpp/1.9.234") def validate(self): diff --git a/recipes/octo-logger-cpp/config.yml b/recipes/octo-logger-cpp/config.yml index 76947dd2891c2..2f6ea9f8d7119 100644 --- a/recipes/octo-logger-cpp/config.yml +++ b/recipes/octo-logger-cpp/config.yml @@ -1,4 +1,6 @@ versions: + "1.6.0": + folder: "all" "1.5.0": folder: "all" "1.4.0": From 41cf16b69395d19be9c34b9cd0b157e4bc5c61ba Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 28 Mar 2024 12:22:53 +0900 Subject: [PATCH 2/5] update 1.6.1 --- recipes/octo-logger-cpp/all/conandata.yml | 3 +++ recipes/octo-logger-cpp/config.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/octo-logger-cpp/all/conandata.yml b/recipes/octo-logger-cpp/all/conandata.yml index eb5f3478e1d43..f0f9298e6ba6f 100644 --- a/recipes/octo-logger-cpp/all/conandata.yml +++ b/recipes/octo-logger-cpp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.6.1": + url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.6.1.tar.gz" + sha256: "02c1d5303d8c129cb2527a92d49677229230a5feaec002791f96d47de3bccb5a" "1.6.0": url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.6.0.tar.gz" sha256: "c6146df88299791631ec0e7c1aacf83a1369954033b798cbe433150d78ef7da1" diff --git a/recipes/octo-logger-cpp/config.yml b/recipes/octo-logger-cpp/config.yml index 2f6ea9f8d7119..c67832833d08a 100644 --- a/recipes/octo-logger-cpp/config.yml +++ b/recipes/octo-logger-cpp/config.yml @@ -1,5 +1,5 @@ versions: - "1.6.0": + "1.6.1": folder: "all" "1.5.0": folder: "all" From 20dd942367ed2323b36fa0f9ef83791f2832e966 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 28 Mar 2024 12:31:01 +0900 Subject: [PATCH 3/5] revert fmt Co-authored-by: Carlos Zoido --- recipes/octo-logger-cpp/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/octo-logger-cpp/all/conanfile.py b/recipes/octo-logger-cpp/all/conanfile.py index 247a0179f4fb8..81a6fbcd29efe 100644 --- a/recipes/octo-logger-cpp/all/conanfile.py +++ b/recipes/octo-logger-cpp/all/conanfile.py @@ -52,7 +52,7 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): - self.requires("fmt/10.2.1", transitive_headers=True) + self.requires("fmt/10.1.1", transitive_headers=True) if self.options.get_safe("with_aws"): self.requires("nlohmann_json/3.11.3") self.requires("aws-sdk-cpp/1.9.234") From d95dc9246583ab41fbbd98efb407dd9883f76279 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 28 Mar 2024 12:31:18 +0900 Subject: [PATCH 4/5] revert nlohmann_json Co-authored-by: Carlos Zoido --- recipes/octo-logger-cpp/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/octo-logger-cpp/all/conanfile.py b/recipes/octo-logger-cpp/all/conanfile.py index 81a6fbcd29efe..d8b77698e6f0d 100644 --- a/recipes/octo-logger-cpp/all/conanfile.py +++ b/recipes/octo-logger-cpp/all/conanfile.py @@ -54,7 +54,7 @@ def layout(self): def requirements(self): self.requires("fmt/10.1.1", transitive_headers=True) if self.options.get_safe("with_aws"): - self.requires("nlohmann_json/3.11.3") + self.requires("nlohmann_json/3.11.2") self.requires("aws-sdk-cpp/1.9.234") def validate(self): From c5215be188dd36984f38f783597ce0f4b198b2ab Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 28 Mar 2024 13:01:24 +0900 Subject: [PATCH 5/5] remove 1.6.0 --- recipes/octo-logger-cpp/all/conandata.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/octo-logger-cpp/all/conandata.yml b/recipes/octo-logger-cpp/all/conandata.yml index f0f9298e6ba6f..da0e55d721a42 100644 --- a/recipes/octo-logger-cpp/all/conandata.yml +++ b/recipes/octo-logger-cpp/all/conandata.yml @@ -2,9 +2,6 @@ sources: "1.6.1": url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.6.1.tar.gz" sha256: "02c1d5303d8c129cb2527a92d49677229230a5feaec002791f96d47de3bccb5a" - "1.6.0": - url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.6.0.tar.gz" - sha256: "c6146df88299791631ec0e7c1aacf83a1369954033b798cbe433150d78ef7da1" "1.5.0": url: "https://github.com/ofiriluz/octo-logger-cpp/archive/v1.5.0.tar.gz" sha256: "e62e4a54700f7c235111fd2b75c51d96f0b4deaf2c24ce7bc9ef1751ce31ea20"