Skip to content

Commit

Permalink
Bumps in Ionic: sdformat15 (gazebosim#1338)
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merging sdf dom element changes with main
  • Loading branch information
azeey authored and aagrawal05 committed Apr 2, 2024
1 parent 55260ad commit 3ec89ba
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 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: sdformat14
PACKAGE: sdformat15
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion 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 (sdformat14 VERSION 14.1.1)
project (sdformat15 VERSION 15.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
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## libsdformat 15.X

### libsdformat 15.X.X (202X-XX-XX)

## libsdformat 14.X

### libsdformat 14.1.1 (2024-03-28)
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 `libsdformat14` and is
**Note:** the `main` branch is under development for `libsdformat15` 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.10.2 FATAL_ERROR)

find_package(sdformat14 REQUIRED)
find_package(sdformat15 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

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 sdformat14 import *
from sdformat15 import *

0 comments on commit 3ec89ba

Please sign in to comment.