chore: kickoff release

Author: sebaland

.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2.1
 orbs:
   macos: circleci/macos@2.3.3
   ruby: circleci/ruby@2.0.0
-
+  aws-cli: circleci/aws-cli@3.1.4
 
 default-executor: &default-executor
   macos:
@@ -14,7 +14,6 @@ default-executor: &default-executor
   environment:
     FL_OUTPUT_DIR: output
 
-
 jobs:
   build-test-ios:
     <<: *default-executor
@@ -39,15 +38,39 @@ 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
 
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "5a:23:0e:1d:98:0c:04:dc:73:06:5f:c3:19:72:e2:93"
+            - "1d:f2:37:1e:7e:38:02:e0:76:2d:6a:a8:47:2e:85:09"
       - checkout
       - ruby/install-deps
+      - aws-cli/setup:
+          role-arn: $AWS_OIDC_ROLE_ARN
+          role-session-name: "${CIRCLE_WORKFLOW_JOB_ID}.release"
+          session-duration: '900'
       - run:
           name: Publish new version to cocoapods trunk
           command: bundle exec fastlane ios release
@@ -58,7 +81,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "5a:23:0e:1d:98:0c:04:dc:73:06:5f:c3:19:72:e2:93"
+            - "1d:f2:37:1e:7e:38:02:e0:76:2d:6a:a8:47:2e:85:09"
       - checkout
       - ruby/install-deps
       - run:
@@ -71,13 +94,19 @@ 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:
           filters:
             branches:

Gemfile.lock

@@ -11,7 +11,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7.2)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -83,7 +83,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     declarative (0.0.20)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
@@ -229,7 +229,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    minitest (5.18.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -300,7 +300,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

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

@@ -1,3 +1,5 @@
+require 'json'
+
 PODSPEC_PATH = "AmplifyUtilsNotifications.podspec"
 CHANGELOG_PATH = "CHANGELOG.md"
 
@@ -103,6 +105,15 @@ platform :ios do
 
     desc "Publish new version to cocoapod trunck"
     private_lane :publish_to_cocoapod_trunk do
+        # Define `COCOAPODS_TRUNK_TOKEN` env var for trunk authentication
+        # https://github.com/CocoaPods/cocoapods-trunk/commit/9e6ec1c1faf96fa837dc2ed70b5f54006b181ed6
+        secret = sh(
+            command: 'aws secretsmanager get-secret-value --secret-id ${COCOAPODS_SECRET_ARN}',
+            log: false
+        )
+
+        ENV['COCOAPODS_TRUNK_TOKEN'] = JSON.parse(secret)["SecretString"]
+
         pod_push(
             use_bundle_exec: true,
             allow_warnings: true,
@@ -143,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