diff --git a/.gitignore b/.gitignore index e0308969e2..3996cea114 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ xcuserdata/ *.ipa *.dSYM.zip *.dSYM +*.xcarchive ## SwiftPM /.build diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 90a006f8f5..baa17433e3 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8143,7 +8143,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.6; - KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; + KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 14.6; MARKETING_VERSION = 25.03.2; MTL_ENABLE_DEBUG_INFO = NO; @@ -8220,7 +8220,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.6; - KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; + KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 14.6; MARKETING_VERSION = 25.03.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; diff --git a/ElementX/SupportingFiles/ElementX.entitlements b/ElementX/SupportingFiles/ElementX.entitlements index e5b7f45988..267cb02704 100644 --- a/ElementX/SupportingFiles/ElementX.entitlements +++ b/ElementX/SupportingFiles/ElementX.entitlements @@ -28,7 +28,7 @@ keychain-access-groups - $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER) + $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml index 550104cb20..9121360f47 100644 --- a/ElementX/SupportingFiles/target.yml +++ b/ElementX/SupportingFiles/target.yml @@ -43,7 +43,7 @@ targets: platform: iOS info: - path: ../SupportingFiles/Info.plist + path: Info.plist properties: UILaunchScreen: UIColorName: colors/background-color @@ -106,6 +106,28 @@ targets: LSItemContentTypes: $(PILLS_UT_TYPE_IDENTIFIER) LSSupportsOpeningDocumentsInPlace: false + entitlements: + path: ElementX.entitlements + properties: + aps-environment: development + com.apple.developer.associated-domains: + - applinks:element.io + - applinks:app.element.io + - applinks:staging.element.io + - applinks:develop.element.io + - applinks:mobile.element.io + - applinks:call.element.io + - applinks:call.element.dev + - applinks:matrix.to + - webcredentials:*.element.io + com.apple.developer.usernotifications.communication: true + com.apple.security.app-sandbox: true + com.apple.security.application-groups: + - $(APP_GROUP_IDENTIFIER) + com.apple.security.network.client: true + keychain-access-groups: + - $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + settings: base: PRODUCT_NAME: $(APP_NAME) @@ -114,7 +136,6 @@ targets: CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) - CODE_SIGN_ENTITLEMENTS: ElementX/SupportingFiles/ElementX.entitlements SWIFT_OBJC_BRIDGING_HEADER: ElementX/SupportingFiles/ElementX-Bridging-Header.h SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h PILLS_UT_TYPE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).pills @@ -185,8 +206,6 @@ targets: dependencies: - target: NSE - target: ShareExtension - # not used yet - # - target: NCE - package: MatrixRustSDK embed: true - package: Compound diff --git a/Enterprise b/Enterprise index 731c7a7e34..86e0ea2f41 160000 --- a/Enterprise +++ b/Enterprise @@ -1 +1 @@ -Subproject commit 731c7a7e34cd4005a2991d9b94a788d54bc7d3eb +Subproject commit 86e0ea2f41df809d85ef3b51d8259760e0a4ee2c diff --git a/NCE/Sources/NotificationViewController.swift b/NCE/Sources/NotificationViewController.swift deleted file mode 100644 index 04819d315a..0000000000 --- a/NCE/Sources/NotificationViewController.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright 2023, 2024 New Vector Ltd. -// -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial -// Please see LICENSE files in the repository root for full details. -// - -import UIKit -import UserNotifications -import UserNotificationsUI - -class NotificationViewController: UIViewController, UNNotificationContentExtension { - override func viewDidLoad() { - super.viewDidLoad() - // Do any required interface initialization here. - } - - func didReceive(_ notification: UNNotification) { - // Handle the received push notification - } -} diff --git a/NCE/SupportingFiles/Info.plist b/NCE/SupportingFiles/Info.plist deleted file mode 100644 index 05efb15c8d..0000000000 --- a/NCE/SupportingFiles/Info.plist +++ /dev/null @@ -1,44 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - $(PRODUCT_NAME) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - XPC! - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSExtension - - NSExtensionAttributes - - UNNotificationExtensionCategory - myNotificationCategory - UNNotificationExtensionInitialContentSizeRatio - 1 - - NSExtensionPointIdentifier - com.apple.usernotifications.content-extension - NSExtensionPrincipalClass - NCE.NotificationViewController - - appGroupIdentifier - $(APP_GROUP_IDENTIFIER) - baseBundleIdentifier - $(BASE_BUNDLE_IDENTIFIER) - keychainAccessGroupIdentifier - $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) - - diff --git a/NCE/SupportingFiles/target.yml b/NCE/SupportingFiles/target.yml deleted file mode 100644 index 64a9d32ad2..0000000000 --- a/NCE/SupportingFiles/target.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: NCE - -schemes: - NCE: - analyze: - config: Debug - archive: - config: Release - build: - targets: - NCE: - - running - - testing - - profiling - - analyzing - - archiving - profile: - config: Release - run: - askForAppToLaunch: true - config: Debug - debugEnabled: false - disableMainThreadChecker: false - launchAutomaticallySubstyle: 2 - test: - config: Debug - disableMainThreadChecker: false - -targets: - NCE: - type: app-extension - platform: iOS - - dependencies: - - package: MatrixRustSDK - - info: - path: ../SupportingFiles/Info.plist - properties: - CFBundleDisplayName: $(PRODUCT_NAME) - CFBundleShortVersionString: $(MARKETING_VERSION) - CFBundleVersion: $(CURRENT_PROJECT_VERSION) - appGroupIdentifier: $(APP_GROUP_IDENTIFIER) - baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) - keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) - NSExtension: - NSExtensionPointIdentifier: com.apple.usernotifications.content-extension - NSExtensionPrincipalClass: NCE.NotificationViewController - NSExtensionAttributes: - UNNotificationExtensionCategory: myNotificationCategory - UNNotificationExtensionInitialContentSizeRatio: 1 - - settings: - base: - PRODUCT_NAME: NCE - PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nce - MARKETING_VERSION: $(MARKETING_VERSION) - CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) - DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) - SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h - debug: - release: - - sources: - - path: ../Sources - - path: ../SupportingFiles diff --git a/NSE/SupportingFiles/NSE.entitlements b/NSE/SupportingFiles/NSE.entitlements index b0c64e349e..f6053bd2c6 100644 --- a/NSE/SupportingFiles/NSE.entitlements +++ b/NSE/SupportingFiles/NSE.entitlements @@ -10,7 +10,7 @@ keychain-access-groups - $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER) + $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) diff --git a/NSE/SupportingFiles/target.yml b/NSE/SupportingFiles/target.yml index dea122a13e..f9bfd21fbc 100644 --- a/NSE/SupportingFiles/target.yml +++ b/NSE/SupportingFiles/target.yml @@ -43,7 +43,7 @@ targets: - package: Version info: - path: ../SupportingFiles/Info.plist + path: Info.plist properties: CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) CFBundleShortVersionString: $(MARKETING_VERSION) @@ -56,6 +56,15 @@ targets: NSExtensionPointIdentifier: com.apple.usernotifications.service NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension + entitlements: + path: NSE.entitlements + properties: + com.apple.developer.usernotifications.filtering: true + com.apple.security.application-groups: + - $(APP_GROUP_IDENTIFIER) + keychain-access-groups: + - $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + settings: base: PRODUCT_NAME: NSE @@ -64,7 +73,6 @@ targets: MARKETING_VERSION: $(MARKETING_VERSION) CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) - CODE_SIGN_ENTITLEMENTS: NSE/SupportingFiles/NSE.entitlements SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h OTHER_SWIFT_FLAGS: - "-DIS_NSE" diff --git a/ShareExtension/SupportingFiles/target.yml b/ShareExtension/SupportingFiles/target.yml index cca24f0522..df6bbb96d9 100644 --- a/ShareExtension/SupportingFiles/target.yml +++ b/ShareExtension/SupportingFiles/target.yml @@ -37,7 +37,7 @@ targets: - package: Compound info: - path: ../SupportingFiles/Info.plist + path: Info.plist properties: CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) CFBundleShortVersionString: $(MARKETING_VERSION) @@ -60,6 +60,12 @@ targets: NSExtensionActivationSupportsText: true NSExtensionActivationSupportsWebURLWithMaxCount: 1 + entitlements: + path: ShareExtension.entitlements + properties: + com.apple.security.application-groups: + - $(APP_GROUP_IDENTIFIER) + settings: base: PRODUCT_NAME: ShareExtension @@ -68,7 +74,6 @@ targets: MARKETING_VERSION: $(MARKETING_VERSION) CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) - CODE_SIGN_ENTITLEMENTS: ShareExtension/SupportingFiles/ShareExtension.entitlements sources: - path: ../Sources diff --git a/project.yml b/project.yml index 2de7d5aefa..900905960c 100644 --- a/project.yml +++ b/project.yml @@ -40,7 +40,7 @@ settings: ENABLE_BITCODE: false APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER) APP_NAME: ElementX - KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)" + KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)" MARKETING_VERSION: 25.03.2 CURRENT_PROJECT_VERSION: 1 SUPPORTS_MACCATALYST: false @@ -54,7 +54,6 @@ include: - path: IntegrationTests/SupportingFiles/target.yml - path: NSE/SupportingFiles/target.yml - path: ShareExtension/SupportingFiles/target.yml -# - path: NCE/SupportingFiles/target.yml (not used yet) # - path: MyAppVariant/override.yml packages: