Merge branch 'develop' into develop

gururaajar · Dec 13, 2024 · 78ac3b7 · 78ac3b7
2 parents 9a8be06 + 398d924
commit 78ac3b7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/gnome_unit_test.yml b/.github/workflows/gnome_unit_test.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   unit-tests:
     name: Build and run unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Configure cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,14 @@ All notable changes to this RDK Service will be documented in this file.
 
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
+## [0.6.0] - 2024-12-10
+### Added
+- Added specific SSID/frequency scanning
+- Added retry logic in WPS Connect
+- Added Unittest for Connectivity Class
+- Fixed Continuous Connectivity Monitoring when no interface connected
+- Fixed SetIPSettings on GNome backed
+
 ## [0.5.4] - 2024-11-29
 ### Fixed
 - Fixed documentation of NetworkManager

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ find_package(WPEFramework)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 5)
-set(VERSION_PATCH 4)
+set(VERSION_MINOR 6)
+set(VERSION_PATCH 0)
 
 add_compile_definitions(NETWORKMANAGER_MAJOR_VERSION=${VERSION_MAJOR})
 add_compile_definitions(NETWORKMANAGER_MINOR_VERSION=${VERSION_MINOR})

diff --git a/NetworkManager.json b/NetworkManager.json
@@ -9,7 +9,7 @@
         "status": "development",
         "description": "A Unified `NetworkManager` plugin that allows you to manage Ethernet and Wifi interfaces on the device.",
         "sourcelocation": "https://github.com/rdkcentral/networkmanager/blob/main/NetworkManager.json",
-        "version": "0.5.3"
+        "version": "0.6.0"
     },
     "definitions": {
         "success": {

diff --git a/Tests/unit_test/test_NetworkManagerConnectivity.cpp b/Tests/unit_test/test_NetworkManagerConnectivity.cpp
@@ -1,20 +1,5 @@
 #include "NetworkManagerImplementation.h"
 #include "NetworkManagerConnectivity.h"
-
-#include <cstring>
-#include <atomic>
-#include <vector>
-#include <thread>
-#include <chrono>
-#include <map>
-#include <curl/curl.h>
-#include <condition_variable>
-#include <mutex>
-#include <cerrno>
-#include <cstdlib>
-#include <fstream>
-#include <algorithm>
-#include <ctime>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 

diff --git a/docs/NetworkManagerPlugin.md b/docs/NetworkManagerPlugin.md
@@ -2,7 +2,7 @@
 <a name="head.NetworkManager_Plugin"></a>
 # NetworkManager Plugin
 
-**Version: 0.5.4**
+**Version: 0.6.0**
 
 **Status: :white_circle::white_circle::white_circle:**
 
@@ -23,7 +23,7 @@ org.rdk.NetworkManager interface for Thunder framework.
 <a name="head.Scope"></a>
 ## Scope
 
-This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 0.5.4). It includes detailed specification about its methods provided and notifications sent.
+This document describes purpose and functionality of the org.rdk.NetworkManager interface (version 0.6.0). It includes detailed specification about its methods provided and notifications sent.
 
 <a name="head.Case_Sensitivity"></a>
 ## Case Sensitivity