(conan-io#11650) quill: add version 2.1.0

* quill: add version 2.1.0 * remove unused code
AndreyMlashkin · Jul 29, 2022 · fe4b299 · fe4b299
1 parent 85c2b52
commit fe4b299
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/recipes/quill/all/conandata.yml b/recipes/quill/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.1.0":
+    url: "https://github.com/odygrd/quill/archive/v2.1.0.tar.gz"
+    sha256: "66c59501ad827207e7d4682ccba0f1c33ca215269aa13a388df4d59ca195ee76"
   "2.0.2":
     url: "https://github.com/odygrd/quill/archive/v2.0.2.tar.gz"
     sha256: "d2dc9004886b787f8357e97d2f2d0c74a460259f7f95d65ab49d060fe34a9b5c"
@@ -8,24 +11,9 @@ sources:
   "1.7.3":
     url: "https://github.com/odygrd/quill/archive/v1.7.3.tar.gz"
     sha256: "3fff0c5ffb19bbde5429369079741f84a6acce3a781b504cec5e677b05461208"
-  "1.7.2":
-    url: "https://github.com/odygrd/quill/archive/v1.7.2.tar.gz"
-    sha256: "e2153c6e25f3a6cee47c2a9edbabdace418f6d64f62cd701dfdae38d5892bb1b"
-  "1.7.0":
-    url: "https://github.com/odygrd/quill/archive/v1.7.0.tar.gz"
-    sha256: "f6eb9711b949effbd8caf06ee464f66f619b94d3b39f820fa288d0745c620ed1"
   "1.6.3":
     url: "https://github.com/odygrd/quill/archive/v1.6.3.tar.gz"
     sha256: "886120b084db952aafe651c64f459e69fec481b4e189c14daa8c4108afebcba3"
   "1.5.2":
     url: "https://github.com/odygrd/quill/archive/v1.5.2.tar.gz"
     sha256: "e409fda0bd949e997f63de4d422a8f17ccc9cb0d58f11403bd309c7a93aa0d6b"
-  "1.4.0":
-    url: "https://github.com/odygrd/quill/archive/v1.4.0.tar.gz"
-    sha256: "e6e9b603caa32c6693cccda8c547b298f3f73867a45e49b33c006cb17b24fa33"
-  "1.3.3":
-    url: "https://github.com/odygrd/quill/archive/v1.3.3.tar.gz"
-    sha256: "5e185ebe7318fe8ce6e3fd849ec8f7fcb1298ab0302b2268382c7aef1c9542ce"
-  "1.2.3":
-    url: "https://github.com/odygrd/quill/archive/v1.2.3.tar.gz"
-    sha256: "f318fa87a39aea76c66cfe09c686f5ce2cacaf2980678ada310acac8cf42ffd0"
diff --git a/recipes/quill/all/conanfile.py b/recipes/quill/all/conanfile.py
@@ -83,11 +83,9 @@ def validate(self):
 
     def requirements(self):
         if tools.Version(self.version) >= "1.6.3":
-            self.requires("fmt/8.1.1")
-        elif tools.Version(self.version) >= "1.3.3":
-            self.requires("fmt/7.1.3")
+            self.requires("fmt/9.0.0")
         else:
-            self.requires("fmt/6.2.1")
+            self.requires("fmt/7.1.3")
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True)
@@ -104,9 +102,6 @@ def _configure_cmake(self):
         return cmake
 
     def build(self):
-        if tools.Version(self.version) < "1.3.3" and tools.Version(self.deps_cpp_info["fmt"].version) > "6.2.1":
-            raise ConanInvalidConfiguration("The project {}/{} requires fmt <= 6.2.1".format(self.name, self.version))
-
         if tools.Version(self.version) >= "2.0.0":
             tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"),
                 """set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/quill/cmake" CACHE STRING "Modules for CMake" FORCE)""",

diff --git a/recipes/quill/all/test_package/CMakeLists.txt b/recipes/quill/all/test_package/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.8)
 project(test_package CXX)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+conan_basic_setup(TARGETS)
 
-find_package(quill CONFIG REQUIRED)
+find_package(quill REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} quill::quill)

diff --git a/recipes/quill/config.yml b/recipes/quill/config.yml
@@ -1,21 +1,13 @@
 versions:
+  "2.1.0":
+    folder: "all"
   "2.0.2":
     folder: "all"
   "2.0.1":
     folder: "all"
   "1.7.3":
     folder: "all"
-  "1.7.2":
-    folder: "all"
-  "1.7.0":
-    folder: "all"
   "1.6.3":
     folder: "all"
   "1.5.2":
     folder: "all"
-  "1.4.0":
-    folder: "all"
-  "1.3.3":
-    folder: "all"
-  "1.2.3":
-    folder: "all"