diff --git a/CMakeLists.txt b/CMakeLists.txt index 68c4b3b..c20a630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if(DEFINED PROJECT_NAME) set(SUBPROJECT ON) endif() -project(qtpromise VERSION 0.6.0 LANGUAGES CXX) +project(qtpromise VERSION 0.7.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") diff --git a/LICENSE b/LICENSE index ac9273e..5263009 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017-2020 Simon Brunel, https://github.com/simonbrunel +Copyright (c) 2017-present Simon Brunel, https://github.com/simonbrunel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/qtpromise/getting-started.md b/docs/qtpromise/getting-started.md index 6847b9d..e48305f 100644 --- a/docs/qtpromise/getting-started.md +++ b/docs/qtpromise/getting-started.md @@ -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.6.0 under the `3rdparty/qtpromise` subdirectory. +The following examples install QtPromise version 0.7.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. @@ -38,7 +38,7 @@ QtPromise into your project. ```sh cd git remote add qtpromise https://github.com/simonbrunel/qtpromise.git -git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromise v0.6.0" +git subtree add -P 3rdparty/qtpromise qtpromise v0.7.0 --squash -m "Add QtPromise v0.7.0" ``` #### submodule @@ -47,10 +47,10 @@ git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromis cd git submodule add https://github.com/simonbrunel/qtpromise.git 3rdparty/qtpromise cd 3rdparty/qtpromise -git checkout v0.6.0 +git checkout v0.7.0 cd ../.. git add 3rdparty/qtpromise -git commit -m "Add QtPromise v0.6.0" +git commit -m "Add QtPromise v0.7.0" ``` ### Download @@ -60,7 +60,7 @@ as a `zip` or `tar.gz` archive. Under Linux, you can use the following commands: ```sh cd -wget -q -O qtpromise.tar.gz https://github.com/simonbrunel/qtpromise/archive/v0.5.0.tar.gz +wget -q -O qtpromise.tar.gz https://github.com/simonbrunel/qtpromise/archive/v0.7.0.tar.gz tar xzf qtpromise.tar.gz --strip 1 --one-top-level=3rdparty/qtpromise rm qtpromise.tar.gz ``` @@ -97,7 +97,7 @@ include(FetchContent) FetchContent_Declare(qtpromise GIT_REPOSITORY https://github.com/simonbrunel/qtpromise.git - GIT_TAG v0.6.0 + GIT_TAG v0.7.0 GIT_SHALLOW true ) diff --git a/qpm.json b/qpm.json index d3612c5..7222237 100644 --- a/qpm.json +++ b/qpm.json @@ -10,7 +10,7 @@ "url": "https://github.com/simonbrunel/qtpromise.git" }, "version": { - "label": "0.6.0" + "label": "0.7.0" }, "license": "MIT", "pri_filename": "qtpromise.pri",