Merge branch 'main' of github.com:IBM/mac-ibm-notifications into deve…

…lopment # Conflicts: # Notification Agent.xcodeproj/project.pbxproj
IBM · Sep 25, 2024 · 30fe8b6 · 30fe8b6
2 parents c335099 + 06a59ff
commit 30fe8b6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1,6 +1,6 @@
 # Python version (for python projects only)
 sonar.python.version=3
 # Project Version to be used as Code Definition
-sonar.projectVersion=3.1.0.110
+sonar.projectVersion=3.2.1.127
 # Folders excluded from the scan
 sonar.exclusions=**/Notification Agent Core Tests/**,**/Notification Agent Alert Tests/**,**/Notification Agent Banner Tests/**,**/Notification Agent Popup Tests/**,**/Notification Agent Onboarding Tests/**,**/Notification Agent Popup UI Tests/**,**/Notification Agent Onboarding UI Tests/**,**/Notification Agent Core/Controllers/HelpBuilder.swift**
diff --git a/Notification Agent Core/Controllers/HelpBuilder.swift b/Notification Agent Core/Controllers/HelpBuilder.swift
@@ -440,7 +440,7 @@ public final class HelpBuilder {
     }
 
     static func printAppVersion() {
-        print("IBM Notifier version: \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown") (\(Bundle.main.infoDictionary!["CFBundleVersion"] as? String ?? "Unknown"))\n© Copyright IBM Corp. 2021, 2024".bold())
+        print("IBM Notifier \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown") (\(Bundle.main.infoDictionary!["CFBundleVersion"] as? String ?? "Unknown"))\n© Copyright IBM Corp. 2021, 2024".bold())
     }
 }
 

diff --git a/Notification Agent.xcodeproj/project.pbxproj b/Notification Agent.xcodeproj/project.pbxproj
@@ -3207,7 +3207,6 @@
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 3.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ibm.cio.be.Notification-Agent-Core-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 ![License](https://img.shields.io/badge/license-Apache%202-1984E5)
 
 ![Swift version](https://img.shields.io/badge/swift-5.9.0-1984E5?logo=swift)
-![Xcode version](https://img.shields.io/badge/xcode-15.2-1984E5?logo=xcode)
-![Project version](https://img.shields.io/badge/version-3.1.0-1984E5)
+![Project version](https://img.shields.io/badge/version-3.2.1-1984E5)
 ![macOS](https://img.shields.io/badge/macOS-11+-bright%20green)
 
 [![CI](https://github.com/IBM/mac-ibm-notifications/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/IBM/mac-ibm-notifications/actions/workflows/main.yml)

diff --git a/jwt-generator/requirements.txt b/jwt-generator/requirements.txt
@@ -1,7 +1,7 @@
 astroid==2.12.2
 attrs==21.4.0
 cffi==1.15.1
-cryptography==42.0.4
+cryptography==43.0.1
 iniconfig==1.1.1
 isort==5.10.1
 lazy-object-proxy==1.7.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -440,7 +440,7 @@ public final class HelpBuilder { @@
         }
         static func printAppVersion() {
-            print("IBM Notifier version: \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown") (\(Bundle.main.infoDictionary!["CFBundleVersion"] as? String ?? "Unknown"))\n© Copyright IBM Corp. 2021, 2024".bold())
+            print("IBM Notifier \(Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String ?? "Unknown") (\(Bundle.main.infoDictionary!["CFBundleVersion"] as? String ?? "Unknown"))\n© Copyright IBM Corp. 2021, 2024".bold())
         }
     }
@@ Expand Down @@