ign -> gz Header Migration : ign-utils (2)

.github/ci/packages.apt

@@ -1 +1 @@
-libignition-cmake2-dev
+libignition-cmake3-dev

.github/workflows/ci.yml

@@ -3,17 +3,6 @@ name: Ubuntu CI
 on: [push, pull_request]
 
 jobs:
-  bionic-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Bionic CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Compile and test
-        id: ci
-        uses: ignition-tooling/action-ignition-ci@bionic
-        with:
-          codecov-enabled: true
   focal-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Focal CI
@@ -24,6 +13,7 @@ jobs:
         id: ci
         uses: ignition-tooling/action-ignition-ci@focal
         with:
+          codecov-enabled: true
           cpplint-enabled: true
           doxygen-enabled: true
   jammy-ci:

BUILD.bazel

@@ -18,9 +18,9 @@ exports_files(["LICENSE"])
 
 PROJECT_NAME = "ignition-utils"
 
-PROJECT_MAJOR = 1
+PROJECT_MAJOR = 2
 
-PROJECT_MINOR = 2
+PROJECT_MINOR = 0
 
 PROJECT_PATCH = 0
 

CMakeLists.txt

@@ -3,19 +3,21 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-utils1 VERSION 1.3.0)
+project(ignition-utils2 VERSION 2.0.0)
 
 #============================================================================
 # Find ignition-cmake
 #============================================================================
 # If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake2 2.0.0 REQUIRED)
+find_package(ignition-cmake3 REQUIRED)
 
 #============================================================================
 # Configure the project
 #============================================================================
 set(c++standard 17)
-ign_configure_project(VERSION_SUFFIX)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/utils
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

Changelog.md

@@ -1,25 +1,46 @@
+## Ignition Utils 2.x
+
+## Ignition Utils 2.0.0 (20XX-XX-XX)
+
 ## Ignition Utils 1.x
 
+## Ignition Utils 1.4.0 (2022-03-29)
+
+1. Enable cpplint
+    * [Pull request #41](https://github.com/ignitionrobotics/ign-utils/pull/41)
+
+1. Add doxygen linters
+    * [Pull request #44](https://github.com/ignitionrobotics/ign-utils/pull/44)
+
+1. Custom Ignition CLI11 formatter
+    * [Pull request #42](https://github.com/ignitionrobotics/ign-utils/pull/42)
+
+1. Drop all main functions from gtest files
+    * [Pull request #45](https://github.com/ignitionrobotics/ign-utils/pull/45)
+
+1. Improvements to enable "-Wconversion" 
+    * [Pull request #46](https://github.com/ignitionrobotics/ign-utils/pull/46)
+
 ## Ignition Utils 1.3.0 (2022-02-24)
 
-1. Fix inline namespace issue with clang6 
+1. Fix inline namespace issue with clang6
     * [Pull request #39](https://github.com/ignitionrobotics/ign-utils/pull/39)
 
 1. Move ExtraTestMacros from ign-cmake
     * [Pull request #37](https://github.com/ignitionrobotics/ign-utils/pull/37)
 
 ## Ignition Utils 1.2.0 (2022-01-28)
 
-1. Enable cpplint on focal 
+1. Enable cpplint on focal
     * [Pull request #32](https://github.com/ignitionrobotics/ign-utils/pull/32)
 
 1. Add NeverDestroyed utility class
     * [Pull request #31](https://github.com/ignitionrobotics/ign-utils/pull/31)
 
-1. Move environment functionality to utils 
+1. Move environment functionality to utils
     * [Pull request #30](https://github.com/ignitionrobotics/ign-utils/pull/30)
-     
-1. ImplPtr Get method 
+
+1. ImplPtr Get method
     * [Pull request #27](https://github.com/ignitionrobotics/ign-utils/pull/27)
 
 ## Ignition Utils 1.1.0 (2021-09-02)

README.md

@@ -10,7 +10,7 @@
 Build | Status
 -- | --
 Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-utils/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-utils)
-Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-bionic-amd64)
+Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-focal-amd64)
 Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-homebrew-amd64)
 Windows       | [![Build Status](https://build.osrfoundation.org/job/ign_utils-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_utils-ci-win/)
 

cli/include/CMakeLists.txt

@@ -4,15 +4,16 @@
 # target_include_directories(@tgt@ INTERFACE "$<BUILD_INTERFACE:@incl_dirs>")
 # that for the usual include directories are handled by ign_add_component
 if(IGN_UTILS_VENDOR_CLI11)
-  add_subdirectory(vendored-cli/ignition/utils)
-  target_include_directories(${ign_utils_cli_target_name} 
+  add_subdirectory(vendored-cli/gz/utils)
+  target_include_directories(${gz_utils_cli_target_name}
     INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/vendored-cli>")
 else()
-  add_subdirectory(external-cli/ignition/utils)
-  target_include_directories(${ign_utils_cli_target_name} 
-    INTERFACE 
+  add_subdirectory(external-cli/gz/utils)
+  target_include_directories(${gz_utils_cli_target_name}
+    INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/external-cli>")
 endif()
 
-add_subdirectory(ignition/utils)
+add_subdirectory(gz/utils)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})

cli/include/external-cli/gz/utils/cli/App.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/App.hpp>

cli/include/external-cli/gz/utils/cli/CLI.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/CLI.hpp>

cli/include/external-cli/gz/utils/cli/Config.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Config.hpp>

cli/include/external-cli/gz/utils/cli/ConfigFwd.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/ConfigFwd.hpp>

cli/include/external-cli/gz/utils/cli/Error.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Error.hpp>

cli/include/external-cli/gz/utils/cli/Formatter.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Formatter.hpp>

cli/include/external-cli/gz/utils/cli/FormatterFwd.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/FormatterFwd.hpp>

cli/include/external-cli/gz/utils/cli/Macros.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Macros.hpp>

cli/include/external-cli/gz/utils/cli/Option.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Option.hpp>

cli/include/external-cli/gz/utils/cli/Split.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Split.hpp>

cli/include/external-cli/gz/utils/cli/StringTools.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/StringTools.hpp>

cli/include/external-cli/gz/utils/cli/Timer.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/Timer.hpp>

cli/include/external-cli/gz/utils/cli/TypeTools.hpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <CLI/TypeTools.hpp>