From 00c375b1b5f3f3bfcb1c2a8ffc94185e7cc10fd8 Mon Sep 17 00:00:00 2001 From: Charlie Scheer Date: Wed, 22 May 2024 10:54:11 -0600 Subject: [PATCH 1/5] Updated signing to use manual certificate --- Simplenote.xcodeproj/project.pbxproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj index 126a2a967..c7668758e 100644 --- a/Simplenote.xcodeproj/project.pbxproj +++ b/Simplenote.xcodeproj/project.pbxproj @@ -3146,10 +3146,12 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ZL97FBBQH7; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -3170,6 +3172,8 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.SimplenoteIntents; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Simplenote Mac - Intents - Development"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; From 714f216f557312a16900cd53c093548558f9dcc5 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Wed, 22 May 2024 11:47:46 -0700 Subject: [PATCH 2/5] Add `com.automattic.SimplenoteMac.IntentsExtension` to Fastfile --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e9a9e7cb7..540be44db 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -14,7 +14,7 @@ INTERNAL_SCHEME = 'Simplenote' APP_STORE_SCHEME = 'Simplenote-AppStore' BUILD_FOLDER = 'build' APP_STORE_BUNDLE_IDENTIFIER = 'com.automattic.SimplenoteMac' -APP_STORE_BUNDLE_IDENTIFIER_INTENTS = "#{APP_STORE_BUNDLE_IDENTIFIER}.Intents".freeze +APP_STORE_BUNDLE_IDENTIFIER_INTENTS = "#{APP_STORE_BUNDLE_IDENTIFIER}.IntentsExtension".freeze VERSION_FILE_PATH = File.join(PROJECT_FOLDER, 'config', 'Version.Public.xcconfig') DEFAULT_BRANCH = 'trunk' GITHUB_REPO = 'Automattic/simplenote-macos' From e52b784b12cad30256bc6ef8145d59ab124f4c04 Mon Sep 17 00:00:00 2001 From: Charlie Scheer Date: Wed, 22 May 2024 14:11:25 -0600 Subject: [PATCH 3/5] Fixed provisioning profiles for intents extension --- Simplenote.xcodeproj/project.pbxproj | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj index c7668758e..e755268d6 100644 --- a/Simplenote.xcodeproj/project.pbxproj +++ b/Simplenote.xcodeproj/project.pbxproj @@ -3147,11 +3147,13 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PZYM8XX95Q; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -3170,11 +3172,12 @@ MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.SimplenoteIntents; + PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.IntentsExtension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Simplenote Mac - Intents - Development"; - SDKROOT = iphoneos; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Simplenote Mac Development Intents"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "Simplenote Mac Development Intents"; + SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -3226,7 +3229,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.SimplenoteIntents; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; + SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_INSTALL_OBJC_HEADER = NO; From 1e02da4e28e0e940f32eb24ba8f0078177c0c085 Mon Sep 17 00:00:00 2001 From: Charlie Scheer Date: Wed, 22 May 2024 14:11:37 -0600 Subject: [PATCH 4/5] Fixed linting errors in intent handler --- SimplenoteIntents/IntentHandler.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift index 66ac05d1d..a794b5f6e 100644 --- a/SimplenoteIntents/IntentHandler.swift +++ b/SimplenoteIntents/IntentHandler.swift @@ -9,12 +9,12 @@ import Intents class IntentHandler: INExtension { - + override func handler(for intent: INIntent) -> Any { // This is the default implementation. If you want different objects to handle different intents, // you can override this and return the handler you want for that particular intent. - + return self } - + } From 23ab8e8e7c9a4c04be65ef6f030f311e7db09439 Mon Sep 17 00:00:00 2001 From: Charlie Scheer Date: Thu, 23 May 2024 09:49:52 -0600 Subject: [PATCH 5/5] Updated release certificates for intents extension to use correct team --- Simplenote.xcodeproj/project.pbxproj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj index e755268d6..350d9ff70 100644 --- a/Simplenote.xcodeproj/project.pbxproj +++ b/Simplenote.xcodeproj/project.pbxproj @@ -3204,10 +3204,12 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ZL97FBBQH7; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PZYM8XX95Q; ENABLE_NS_ASSERTIONS = NO; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -3227,8 +3229,10 @@ MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.SimplenoteIntents; + PRODUCT_BUNDLE_IDENTIFIER = com.automattic.SimplenoteMac.IntentsExtension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "Simplenote Mac Development Intents"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES;