Merge pull request #167 from IBM/development

Version 3.0.0 Build 104

Author: jvalentik

Images/Popup/datepicker_1.png

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>96</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
@@ -32,7 +32,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 IBM Inc. All rights reserved.</string>
+	<string>Copyright © 2021 IBM. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

Images/Popup/datepicker_2.png

@@ -6,8 +6,6 @@
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -19,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>96</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
@@ -34,7 +32,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 IBM Inc. All rights reserved.</string>
+	<string>Copyright © 2021 IBM. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

Notification Agent Alerts/Info.plist

@@ -16,10 +16,10 @@ class NACTriggersTests: XCTestCase {
                           ["toBeRemoved", "-type", "banner", "-title", "This is a title"],
                           ["toBeRemoved", "-type", "alert", "-title", "This is a title"],
                           ["toBeRemoved", "-type", "popup", "-title", "This is a title", "-silent", "-subtitle", "This is a subtitle"]]
-    let processerUseCases = [URL(string: "macatibm:shownotification?type=popup&title=This%20is%20a%20title")!,
-                             URL(string: "macatibm:shownotification?type=banner&title=This%20is%20a%20title")!,
-                             URL(string: "macatibm:shownotification?type=alert&title=This%20is%20a%20title")!,
-                             URL(string: "macatibm:shownotification?type=alert&title=title&silent&subtitle=This%20is%20a%20subtitle")!]
+    let processerUseCases = [URL(string: "ibmnotifier:shownotification?type=popup&title=This%20is%20a%20title")!,
+                             URL(string: "ibmnotifier:shownotification?type=banner&title=This%20is%20a%20title")!,
+                             URL(string: "ibmnotifier:shownotification?type=alert&title=This%20is%20a%20title")!,
+                             URL(string: "ibmnotifier:shownotification?type=alert&title=title&silent&subtitle=This%20is%20a%20subtitle")!]
 
     override func setUpWithError() throws {
         worker.startObservation()

Notification Agent Banners/Info.plist

@@ -13,32 +13,26 @@ import os.log
 /// A simple class based on Apple os.log that handle normal and verbose logs.
 public final class NALogger {
 
+    // MARK: - Static Variables
+    
     static let shared = NALogger()
 
+    // MARK: - Methods
+
     func log(_ type: OSLogType, _ message: StaticString, _ args: [String] = []) {
-        if #available(OSX 11.0, *) {
-            Logger().log(level: type,
-                         "\(String(format: message.description.replacingOccurrences(of: "{public}", with: ""), arguments: args), privacy: .public)")
-        } else {
-            os_log(type, message, args)
-        }
+        Logger().log(level: type,
+                     "\(String(format: message.description.replacingOccurrences(of: "{public}", with: ""), arguments: args), privacy: .public)")
         if Context.main.sharedSettings.isVerboseModeEnabled || type == .error {
             self.verbose(type, message, args)
         }
     }
-    
     func log(_ message: StaticString, _ args: [String] = []) {
-        if #available(OSX 11.0, *) {
-            Logger().log(level: .default,
-                         "\(String(format: message.description.replacingOccurrences(of: "{public}", with: ""), arguments: args), privacy: .public)")
-        } else {
-            os_log(message, args)
-        }
+        Logger().log(level: .default,
+                     "\(String(format: message.description.replacingOccurrences(of: "{public}", with: ""), arguments: args), privacy: .public)")
         if Context.main.sharedSettings.isVerboseModeEnabled {
             self.verbose(.default, message, args)
         }
     }
-    
     func deprecationLog(since version: AppVersion, deprecatedArgument: String) {
         if version.isFinalDeprecatedVersion() {
             self.log(.error, "The following argument has been deprecated: %{public}@. Please update your workflow.", [deprecatedArgument])
@@ -47,12 +41,13 @@ public final class NALogger {
         }
     }
 
+    // MARK: - Private Methods
+    
     private func verbose(_ type: OSLogType, _ message: StaticString, _ args: [String] = []) {
         let message = type == .error ?
             message.description.replacingOccurrences(of: "{public}", with: "").red() :
             message.description.replacingOccurrences(of: "{public}", with: "").yellow()
 
         print(String(format: message, arguments: args))
     }
-    
 }

Notification Agent Core Tests/NACTriggersTests.swift

@@ -11,7 +11,7 @@ import Foundation
 
 extension EFCLController {
 
-    // MARK: - Internal methods
+    // MARK: - Internal Methods
 
     /// Exit the app with the related reason code.
     /// - Parameter reason: reason why the application should exit.
@@ -50,7 +50,7 @@ extension EFCLController {
         }
     }
 
-    // MARK: - Private methods
+    // MARK: - Private Methods
 
     /// Check if the passed arguments are configuration.
     /// - Parameter arguments: the app's launch arguments.

Notification Agent Core/Controllers/HelpBuilder.swift

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>96</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

Notification Agent Core/Controllers/NALogger.swift

@@ -30,7 +30,7 @@ class NAOTriggersTests: XCTestCase {
                         ]
                     ]
                 ]
-            ],
+            ] as [String : Any],
             [
                 "title": "This is a title",
                 "subtitle": "This is a subtitle",