diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca539218..f34b97bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,19 +3,6 @@ name: Ubuntu CI on: [push, pull_request] jobs: - focal-ci: - runs-on: ubuntu-latest - name: Ubuntu Focal CI - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Compile and test - id: ci - uses: gazebo-tooling/action-gz-ci@focal - with: - codecov-enabled: true - cppcheck-enabled: true - cpplint-enabled: true jammy-ci: runs-on: ubuntu-latest name: Ubuntu Jammy CI diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 992a1312..a35a0475 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/ignition/fuel_tools.hh b/include/ignition/fuel_tools.hh deleted file mode 100644 index ffffce19..00000000 --- a/include/ignition/fuel_tools.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 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 -#include diff --git a/include/ignition/fuel_tools/ClientConfig.hh b/include/ignition/fuel_tools/ClientConfig.hh deleted file mode 100644 index 61c4c834..00000000 --- a/include/ignition/fuel_tools/ClientConfig.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/CollectionIdentifier.hh b/include/ignition/fuel_tools/CollectionIdentifier.hh deleted file mode 100644 index d1190876..00000000 --- a/include/ignition/fuel_tools/CollectionIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2020 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 -#include diff --git a/include/ignition/fuel_tools/Export.hh b/include/ignition/fuel_tools/Export.hh deleted file mode 100644 index 2d32dfcc..00000000 --- a/include/ignition/fuel_tools/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2022 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 -#include diff --git a/include/ignition/fuel_tools/FuelClient.hh b/include/ignition/fuel_tools/FuelClient.hh deleted file mode 100644 index d2bcb4e2..00000000 --- a/include/ignition/fuel_tools/FuelClient.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/Helpers.hh b/include/ignition/fuel_tools/Helpers.hh deleted file mode 100644 index 990c4a60..00000000 --- a/include/ignition/fuel_tools/Helpers.hh +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include - -#define ign_strcat gz_strcat -#define ign_strcpy gz_strcpy -#define ign_sprintf gz_sprintf -#define ign_strdup gz_strdup diff --git a/include/ignition/fuel_tools/Interface.hh b/include/ignition/fuel_tools/Interface.hh deleted file mode 100644 index e96f09a7..00000000 --- a/include/ignition/fuel_tools/Interface.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 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 -#include diff --git a/include/ignition/fuel_tools/JSONParser.hh b/include/ignition/fuel_tools/JSONParser.hh deleted file mode 100644 index 91b74a06..00000000 --- a/include/ignition/fuel_tools/JSONParser.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/Model.hh b/include/ignition/fuel_tools/Model.hh deleted file mode 100644 index 4027323f..00000000 --- a/include/ignition/fuel_tools/Model.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/ModelIdentifier.hh b/include/ignition/fuel_tools/ModelIdentifier.hh deleted file mode 100644 index 23845149..00000000 --- a/include/ignition/fuel_tools/ModelIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/ModelIter.hh b/include/ignition/fuel_tools/ModelIter.hh deleted file mode 100644 index 05a757a2..00000000 --- a/include/ignition/fuel_tools/ModelIter.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/RestClient.hh b/include/ignition/fuel_tools/RestClient.hh deleted file mode 100644 index 4daf0e1a..00000000 --- a/include/ignition/fuel_tools/RestClient.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/Result.hh b/include/ignition/fuel_tools/Result.hh deleted file mode 100644 index e7c87e8c..00000000 --- a/include/ignition/fuel_tools/Result.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/WorldIdentifier.hh b/include/ignition/fuel_tools/WorldIdentifier.hh deleted file mode 100644 index 497775ee..00000000 --- a/include/ignition/fuel_tools/WorldIdentifier.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 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 -#include diff --git a/include/ignition/fuel_tools/WorldIter.hh b/include/ignition/fuel_tools/WorldIter.hh deleted file mode 100644 index d2862468..00000000 --- a/include/ignition/fuel_tools/WorldIter.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2018 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 -#include diff --git a/include/ignition/fuel_tools/Zip.hh b/include/ignition/fuel_tools/Zip.hh deleted file mode 100644 index 21168112..00000000 --- a/include/ignition/fuel_tools/Zip.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2017 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 -#include diff --git a/include/ignition/fuel_tools/config.hh b/include/ignition/fuel_tools/config.hh deleted file mode 100644 index 9b866308..00000000 --- a/include/ignition/fuel_tools/config.hh +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2022 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. - * - */ - -#ifndef IGNITION_FUEL_TOOLS__CONFIG_HH_ -#define IGNITION_FUEL_TOOLS__CONFIG_HH_ - -#include - -#define IGNITION_FUEL_TOOLS_MAJOR_VERSION GZ_FUEL_TOOLS_MAJOR_VERSION -#define IGNITION_FUEL_TOOLS_MINOR_VERSION GZ_FUEL_TOOLS_MINOR_VERSION -#define IGNITION_FUEL_TOOLS_PATCH_VERSION GZ_FUEL_TOOLS_PATCH_VERSION - -#define IGNITION_FUEL_TOOLS_VERSION GZ_FUEL_TOOLS_VERSION -#define IGNITION_FUEL_TOOLS_VERSION_FULL GZ_FUEL_TOOLS_VERSION_FULL - -#define IGNITION_FUEL_TOOLS_VERSION_HEADER GZ_FUEL_TOOLS_VERSION_HEADER - -#define IGNITION_FUEL_INITIAL_CONFIG_PATH GZ_FUEL_INITIAL_CONFIG_PATH - -namespace gz -{ -} - -namespace ignition -{ - #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION - #pragma message("ignition namespace is deprecated! Use gz instead!") - #endif - using namespace gz; -} - -#endif diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc index 1b11c76e..13e4d4cb 100644 --- a/src/ClientConfig.cc +++ b/src/ClientConfig.cc @@ -211,17 +211,7 @@ ClientConfig::ClientConfig() : dataPtr(new ClientConfigPrivate) std::string gzFuelPath = ""; if (!gz::common::env("GZ_FUEL_CACHE_PATH", gzFuelPath)) { - // TODO(CH3): Deprecated. Remove on tock. - if (gz::common::env("IGN_FUEL_CACHE_PATH", gzFuelPath)) - { - gzwarn << "Using deprecated environment variable [IGN_FUEL_CACHE_PATH] " - << "to set cache path. Please use [GZ_FUEL_CACHE_PATH] instead." - << std::endl; - } - else - { - return; - } + return; } if (!gz::common::isDirectory(gzFuelPath)) @@ -449,18 +439,6 @@ bool ClientConfig::LoadConfig(const std::string &_file) << "path in the configuration file will be ignored" << std::endl; cacheLocation = gzFuelPath; } - // TODO(CH3): Deprecated. Remove on tock. - else if (gz::common::env("IGN_FUEL_CACHE_PATH", gzFuelPath)) - { - gzwarn << "Using deprecated environment variable [IGN_FUEL_CACHE_PATH] " - << "to set cache path. Please use [GZ_FUEL_CACHE_PATH] instead." - << std::endl; - - gzwarn << "GZ_FUEL_CACHE_PATH is set to [" << gzFuelPath << "]. The " - << "path in the configuration file will be ignored" << std::endl; - - cacheLocation = gzFuelPath; - } this->SetCacheLocation(cacheLocation); // Cleanup. diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index c2e7408c..00000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2022 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 - -#define SUPPRESS_IGNITION_HEADER_DEPRECATION - -#include -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - ignition::fuel_tools::Model model; -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION