diff --git a/.github/workflows/branchpush.yml b/.github/workflows/branchpush.yml index 67b25b0e..13377b9e 100644 --- a/.github/workflows/branchpush.yml +++ b/.github/workflows/branchpush.yml @@ -7,6 +7,7 @@ on: - 0.1.0 - 0.2 - 0.3 + - 0.4 - ci_check jobs: build-ubuntu: diff --git a/.travis.yml b/.travis.yml index 5187b384..6e89115c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ branches: - 0.1.0 - 0.2 - 0.3 + - 0.4 - ci_check before_install: - wget -q https://download.qt.io/official_releases/qt/5.13/5.13.2/qt-opensource-windows-x86-5.13.2.exe diff --git a/CHANGES.txt b/CHANGES.txt index effc7023..efe28653 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,19 @@ +2020-06-30 version 0.4.0 (generator/QtProtobuf/QtGrpc) + + QtProtobuf + * Improve serializer reentrancy + * Add static linking for quick plugins + * Add basic tutorial + * Replace qtprotobuf_link_archive with qtprotobuf_link_target + * Fix static build for well-known types + * Fix CPack packaging paths + * Implement "invalid" fields handling in json serializer + QtGrpc + * Add QML gRPC API + generator + * Refactor generator + * Implement nested types support + 2020-05-01 version 0.3.0 (generator/QtProtobuf) QtProtobuf diff --git a/CMakeLists.txt b/CMakeLists.txt index a0f9aec2..85fd94b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.6) -set(QT_PROTOBUF_VERSION 0.3.0) +set(QT_PROTOBUF_VERSION 0.4.0) set(QT_PROTOBUF_PROJECT QtProtobufProject) project(${QT_PROTOBUF_PROJECT} VERSION ${QT_PROTOBUF_VERSION} LANGUAGES CXX) diff --git a/README.md b/README.md index 76627e3e..3a6efdca 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ QtProtobuf provides Qt-native support of Google protocol buffers. Generated code | [0.1.0](https://github.com/semlanik/qtprotobuf/tree/0.1.0) | ![](https://github.com/semlanik/qtprotobuf/workflows/Test%20Verification/badge.svg?branch=0.1.0) | ![](https://travis-ci.com/semlanik/qtprotobuf.svg?branch=0.1.0) | | [0.2](https://github.com/semlanik/qtprotobuf/tree/0.2) | ![](https://github.com/semlanik/qtprotobuf/workflows/Test%20Verification/badge.svg?branch=0.2) | ![](https://travis-ci.com/semlanik/qtprotobuf.svg?branch=0.2) | | [0.3](https://github.com/semlanik/qtprotobuf/tree/0.3) | ![](https://github.com/semlanik/qtprotobuf/workflows/Test%20Verification/badge.svg?branch=0.3) | ![](https://travis-ci.com/semlanik/qtprotobuf.svg?branch=0.3) | +| [0.4](https://github.com/semlanik/qtprotobuf/tree/0.4) | ![](https://github.com/semlanik/qtprotobuf/workflows/Test%20Verification/badge.svg?branch=0.4) | ![](https://travis-ci.com/semlanik/qtprotobuf.svg?branch=0.4) | # Table of contents diff --git a/tests/test_grpc_qml/qml/tst_grpc.qml b/tests/test_grpc_qml/qml/tst_grpc.qml index ea0b45a5..50c113b0 100644 --- a/tests/test_grpc_qml/qml/tst_grpc.qml +++ b/tests/test_grpc_qml/qml/tst_grpc.qml @@ -26,8 +26,8 @@ import QtQuick 2.12 import QtTest 1.0 -import QtProtobuf 0.3 -import QtGrpc 0.3 +import QtProtobuf 0.4 +import QtGrpc 0.4 import qtprotobufnamespace.tests 1.0 TestCase { diff --git a/tests/test_qml/qml/tst_simple.qml b/tests/test_qml/qml/tst_simple.qml index ebe7c817..9ad009e5 100644 --- a/tests/test_qml/qml/tst_simple.qml +++ b/tests/test_qml/qml/tst_simple.qml @@ -26,7 +26,7 @@ import QtQuick 2.12 import QtTest 1.0 -import QtProtobuf 0.3 +import QtProtobuf 0.4 import qtprotobufnamespace.tests 1.0 TestCase {