Skip to content

Commit

Permalink
Bump main to sdformat 16.0.0~pre1 (#1487)
Browse files Browse the repository at this point in the history
* Bump main to sdformat 16.0.0~pre1

---------

Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
  • Loading branch information
caguero and iche033 authored Oct 16, 2024
1 parent bcb9067 commit 3e7e943
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:

env:
PACKAGE: sdformat15
PACKAGE: sdformat16
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,7 +43,7 @@ if (BUILD_SDF)
gz_configure_project(
NO_PROJECT_PREFIX
REPLACE_INCLUDE_PATH sdf
VERSION_SUFFIX)
VERSION_SUFFIX pre1)

#################################################
# Find tinyxml2.
Expand Down
6 changes: 5 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## libsdformat 16.X

### libsdformat 16.0.0 (20XX-XX-XX)

## libsdformat 15.X

### libsdformat 15.0.0 (2024-09-25)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>sdformat15</name>
<version>15.0.0</version>
<name>sdformat16</name>
<version>16.0.0</version>
<description>SDFormat is an XML file format that describes environments, objects, and robots
in a manner suitable for robotic applications</description>

Expand Down
2 changes: 1 addition & 1 deletion python/test/gz_test_deps/sdformat.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from sdformat15 import *
from sdformat16 import *

0 comments on commit 3e7e943

Please sign in to comment.