Skip to content

Commit

Permalink
Merge pull request wolfSSL#386 from embhorn/v1.18.0_rel_prep
Browse files Browse the repository at this point in the history
V1.18.0 rel prep
  • Loading branch information
dgarske authored Dec 22, 2023
2 parents 594addf + e1d5c48 commit 91b01f4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
path: wolfssl
- name: brew
run: |
brew install automake libtool md5sha1sum mosquitto
brew install automake libtool mosquitto coreutils
echo "/usr/local/sbin/" >> $GITHUB_PATH
echo "/usr/local/opt/mosquitto/sbin/" >> $GITHUB_PATH
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

cmake_minimum_required(VERSION 3.16)

project(wolfMQTT VERSION 1.17.1 LANGUAGES C)
project(wolfMQTT VERSION 1.18.0 LANGUAGES C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions.cmake)
Expand Down
12 changes: 11 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
## Release Notes
### v1.18.0 (12/22/2023)
Release 1.18.0 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance

* Add curl easy socket backend. by @philljj in #380
* WOLFMQTT_EXAMPLE_CERT allowing static or extern cert assignment by @gojimmypi in #354
* Tiny readme cleanup. by @philljj in #381
* Fix high coverity issues by @embhorn in #379
* Add broker check to scripts by @embhorn in #385
* Cmake build fixes by @embhorn in #384

### v1.17.1 (11/29/2023)
Release 1.17.1 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
Expand All @@ -12,7 +23,6 @@ https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assur
* Fix Wild read in MqttProps_Free by @embhorn in #377
* Fix fuzzer issues in MqttDecode_Props by @embhorn in #378


### v1.17.0 (11/2/2023)
Release 1.17.0 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# All right reserved.

AC_COPYRIGHT([Copyright (C) 2014-2023 wolfSSL Inc.])
AC_INIT([wolfmqtt],[1.17.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
AC_INIT([wolfmqtt],[1.18.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])

AC_PREREQ([2.63])
AC_CONFIG_AUX_DIR([build-aux])
Expand All @@ -24,7 +24,7 @@ AC_ARG_PROGRAM
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/config.h])

WOLFMQTT_LIBRARY_VERSION=16:1:0
WOLFMQTT_LIBRARY_VERSION=17:0:0
# | | |
# +------+ | +---+
# | | |
Expand Down
4 changes: 2 additions & 2 deletions wolfmqtt/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
extern "C" {
#endif

#define LIBWOLFMQTT_VERSION_STRING "1.17.1"
#define LIBWOLFMQTT_VERSION_HEX 0x01017001
#define LIBWOLFMQTT_VERSION_STRING "1.18.0"
#define LIBWOLFMQTT_VERSION_HEX 0x01018000

#ifdef __cplusplus
}
Expand Down

0 comments on commit 91b01f4

Please sign in to comment.