From 2893480319c94e88295de82cfa399e7bd1939ee2 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Tue, 10 Oct 2023 15:54:27 -0500 Subject: [PATCH 1/2] Bumps in Ionic: sdformat14 Signed-off-by: Addisu Z. Taddese --- CMakeLists.txt | 2 +- Changelog.md | 4 ++++ README.md | 2 +- examples/CMakeLists.txt | 2 +- python/test/gz_test_deps/sdformat.py | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index abed6df35..8d739ac42 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 (sdformat14 VERSION 14.0.0) +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 diff --git a/Changelog.md b/Changelog.md index e98490529..a7527acc9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## libsdformat 15.X + +### libsdformat 15.X.X (202X-XX-XX) + ## libsdformat 14.X ### libsdformat 14.0.0 (2023-09-29) diff --git a/README.md b/README.md index 78e8321b9..28808b151 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 `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. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 7541a5de6..d191c1b0a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -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") diff --git a/python/test/gz_test_deps/sdformat.py b/python/test/gz_test_deps/sdformat.py index 51cec2889..5d34df703 100644 --- a/python/test/gz_test_deps/sdformat.py +++ b/python/test/gz_test_deps/sdformat.py @@ -1 +1 @@ -from sdformat14 import * +from sdformat15 import * From 5bff3703043e6cc8fd97218137f93b9664fc57d3 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 11 Oct 2023 14:44:57 -0500 Subject: [PATCH 2/2] Use sdformat15 in macOS workflow Signed-off-by: Addisu Z. Taddese --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ff4cb40c2..61ed88383 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ jobs: build: env: - PACKAGE: sdformat14 + PACKAGE: sdformat15 runs-on: macos-latest steps: - uses: actions/checkout@v3