Skip to content

Commit

Permalink
Bump version to 0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbrunel committed Oct 1, 2020
1 parent 1752255 commit f7639e9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if(DEFINED PROJECT_NAME)
set(SUBPROJECT ON)
endif()

project(qtpromise VERSION 0.5.0 LANGUAGES CXX)
project(qtpromise VERSION 0.6.0 LANGUAGES CXX)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

Expand Down
8 changes: 4 additions & 4 deletions docs/qtpromise/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ installed either as a [`subtree`](#subtree) or a [`submodule`](#submodule). Read
commands in ["Git: submodules vs subtrees"](https://nering.dev/2016/git-submodules-vs-subtrees/)
which provides a good comparison between these two workflows.

The following examples install QtPromise version 0.5.0 under the `3rdparty/qtpromise` subdirectory.
The following examples install QtPromise version 0.6.0 under the `3rdparty/qtpromise` subdirectory.
Note that the install directory is arbitrary and can be any empty directory under your repository.
Once installed, refer to the [CMake](#cmake) or [qmake](#qmake) sections for details of integrating
QtPromise into your project.
Expand All @@ -38,7 +38,7 @@ QtPromise into your project.
```sh
cd <your/project/repository>
git remote add qtpromise https://github.com/simonbrunel/qtpromise.git
git subtree add -P 3rdparty/qtpromise qtpromise v0.5.0 --squash -m "Add QtPromise v0.5.0"
git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromise v0.6.0"
```

#### submodule
Expand All @@ -47,10 +47,10 @@ git subtree add -P 3rdparty/qtpromise qtpromise v0.5.0 --squash -m "Add QtPromis
cd <your/project/repository>
git submodule add https://github.com/simonbrunel/qtpromise.git 3rdparty/qtpromise
cd 3rdparty/qtpromise
git checkout v0.5.0
git checkout v0.6.0
cd ../..
git add 3rdparty/qtpromise
git commit -m "Add QtPromise v0.5.0"
git commit -m "Add QtPromise v0.6.0"
```

### Download
Expand Down
2 changes: 1 addition & 1 deletion qpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"url": "https://github.com/simonbrunel/qtpromise.git"
},
"version": {
"label": "0.5.0"
"label": "0.6.0"
},
"license": "MIT",
"pri_filename": "qtpromise.pri",
Expand Down

0 comments on commit f7639e9

Please sign in to comment.