From c939cab2dee0284b6bbb8e771cffe69f214e5062 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 9 Aug 2022 13:58:06 -0700 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20main=20to=2014.0?= =?UTF-8?q?.0~pre1=20(#1104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- .github/workflows/macos.yml | 2 +- CMakeLists.txt | 2 +- Changelog.md | 4 ++++ README.md | 2 +- examples/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 36c362329..0eb800ca2 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ jobs: build: env: - PACKAGE: sdformat13 + PACKAGE: sdformat14 runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 584b7c89b..b11259156 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 (sdformat13 VERSION 13.0.0) +project (sdformat14 VERSION 14.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 7133ac891..5bf0537ac 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## libsdformat 14.X + +### libsdformat 14.0.0 (202X-XX-XX) + ## libsdformat 13.X ### libsdformat 13.0.0 (202X-XX-XX) diff --git a/README.md b/README.md index 5802cd718..b5413885e 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 `libsdformat13` and is +**Note:** the `main` branch is under development for `libsdformat14` 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 39caedb85..7541a5de6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(sdformat13 REQUIRED) +find_package(sdformat14 REQUIRED) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")