diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4de5a710c..4071ccbae 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ jobs: build: env: - PACKAGE: sdformat15 + PACKAGE: sdformat16 runs-on: macos-latest steps: - uses: actions/checkout@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index f1eed1eaa..64ce1a08b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0004 NEW) endif(COMMAND CMAKE_POLICY) -project (sdformat15 VERSION 15.0.0) +project (sdformat16 VERSION 16.0.0) # The protocol version has nothing to do with the package version. # It represents the current version of SDFormat implemented by the software @@ -43,7 +43,7 @@ if (BUILD_SDF) gz_configure_project( NO_PROJECT_PREFIX REPLACE_INCLUDE_PATH sdf - VERSION_SUFFIX) + VERSION_SUFFIX pre1) ################################################# # Find tinyxml2. diff --git a/Changelog.md b/Changelog.md index 211119ff2..20a69dfd3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## libsdformat 16.X + +### libsdformat 16.0.0 (20XX-XX-XX) + ## libsdformat 15.X ### libsdformat 15.0.0 (2024-09-25) @@ -64,7 +68,7 @@ * [Pull request #1386](https://github.com/gazebosim/sdformat/pull/1386) * [Pull request #1403](https://github.com/gazebosim/sdformat/pull/1403) -1. Copy 1.11 spec to 1.12 for libsdformat15 +1. Copy 1.11 spec to 1.12 for libsdformat16 * [Pull request #1375](https://github.com/gazebosim/sdformat/pull/1375) 1. Fix find Python3 logic and macOS workflow diff --git a/README.md b/README.md index 299292297..f9a47a6d2 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ conda install libsdformat=12.5.0 --channel conda-forge ## Source Installation -**Note:** the `main` branch is under development for `libsdformat15` and is +**Note:** the `main` branch is under development for `libsdformat16` and is currently unstable. A release branch (`sdf12`, `sdf11`, `sdf10`, `sdf9`, etc.) is recommended for most users. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b346cb51d..49dbc18f1 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) -find_package(sdformat15 REQUIRED) +find_package(sdformat16 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") diff --git a/package.xml b/package.xml index 2cfe9abe1..f09bf670c 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ - sdformat15 - 15.0.0 + sdformat16 + 16.0.0 SDFormat is an XML file format that describes environments, objects, and robots in a manner suitable for robotic applications diff --git a/python/test/gz_test_deps/sdformat.py b/python/test/gz_test_deps/sdformat.py index 5d34df703..11bb9b4f1 100644 --- a/python/test/gz_test_deps/sdformat.py +++ b/python/test/gz_test_deps/sdformat.py @@ -1 +1 @@ -from sdformat15 import * +from sdformat16 import *