feat: Adding support for tvOS and watchOS (#32)

* feat: add support for watchOS

* bump minimum watchOS support v7

* use WKExtension instead of WKApplication to support versions of Xcode prior to 14.0

* feat: add support for tvOS

* feat: Adding tvOS minimum version

* Adding tvOS and watchOS builds to CI

---------

Co-authored-by: Chris Ameter <29186822+ameter@users.noreply.github.com>

Author: sebaland

.circleci/config.yml

@@ -38,6 +38,26 @@ jobs:
           name: Unit tests
           command: bundle exec fastlane mac tests
 
+  build-test-tvos:
+    <<: *default-executor
+
+    steps:
+      - checkout
+      - ruby/install-deps
+      - run:
+          name: Unit tests
+          command: bundle exec fastlane tvos tests
+
+  build-test-watchos:
+    <<: *default-executor
+
+    steps:
+      - checkout
+      - ruby/install-deps
+      - run:
+          name: Unit tests
+          command: bundle exec fastlane watchos tests
+
   release:
     <<: *default-executor
 
@@ -74,13 +94,17 @@ workflows:
     jobs:
       - build-test-ios
       - build-test-macos
+      - build-test-tvos
+      - build-test-watchos
       - release:
           filters:
             branches:
               only: release
           requires:
             - build-test-ios
             - build-test-macos
+            - build-test-tvos
+            - build-test-watchos
           context: amplify-swift-aws-oidc
 
       - publish-doc:

Package.swift

@@ -5,7 +5,12 @@ import PackageDescription
 
 let package = Package(
     name: "AmplifyUtilsNotifications",
-    platforms: [.iOS(.v13), .macOS(.v10_15)],
+    platforms: [
+        .iOS(.v13),
+        .macOS(.v10_15),
+        .tvOS(.v13),
+        .watchOS(.v7)
+    ],
     products: [
         .library(
             name: "AmplifyUtilsNotifications",

Sources/AmplifyUtilsNotifications/AUNotificationPermissions.swift

@@ -8,7 +8,9 @@
 import Foundation
 import UserNotifications
 
-#if canImport(AppKit)
+#if canImport(WatchKit)
+import WatchKit
+#elseif canImport(AppKit)
 import AppKit
 typealias Application = NSApplication
 #elseif canImport(UIKit)
@@ -57,7 +59,11 @@ public class AUNotificationPermissions {
     /// Register device with APNs
     public static func registerForRemoteNotifications() async {
         await MainActor.run {
+            #if canImport(WatchKit)
+            WKExtension.shared().registerForRemoteNotifications()
+            #else
             Application.shared.registerForRemoteNotifications()
+            #endif
         }
     }
 }

Sources/AmplifyUtilsNotifications/AUNotificationService.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#if !os(tvOS)
+
 import UserNotifications
 import os.log
 
@@ -100,3 +102,5 @@ open class AUNotificationService: UNNotificationServiceExtension {
         }
     }
 }
+
+#endif

Tests/AmplifyUtilsNotificationsTests/AUNotificationServiceTests.swift

@@ -5,6 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#if !os(tvOS)
+
 import XCTest
 @testable import AmplifyUtilsNotifications
 @testable import UserNotifications
@@ -149,3 +151,5 @@ final class AUNotificationServiceTests: XCTestCase {
         waitForExpectations(timeout: 1)
     }
 }
+
+#endif

fastlane/Fastfile

@@ -154,3 +154,41 @@ platform :mac do
         )
     end
 end
+
+platform :tvos do
+    before_all do
+        setup_circle_ci
+    end
+
+    desc "Run all the tests on tvOS"
+    lane :tests do
+        run_tests(
+            clean: true,
+            result_bundle: true,
+            include_simulator_logs: false,
+            scheme: "AmplifyUtilsNotifications",
+            package_path: ".",
+            sdk: "appletvsimulator",
+            destination: "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=latest",
+        )
+    end
+end
+
+platform :watchos do
+    before_all do
+        setup_circle_ci
+    end
+
+    desc "Run all the tests on watchOS"
+    lane :tests do
+        run_tests(
+            clean: true,
+            result_bundle: true,
+            include_simulator_logs: false,
+            scheme: "AmplifyUtilsNotifications",
+            package_path: ".",
+            sdk: "watchsimulator",
+            destination: "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=latest",
+        )
+    end
+end