Project updates. (#3837)

* Don't use the AppIdentifierPrefix as it breaks when re-signing.

* Generate entitlements using XcodeGen.

* Ignore Xcode Archives.

* Remove the (unused) NCE.

* Update submodule.

.gitignore

@@ -8,6 +8,7 @@ xcuserdata/
 *.ipa
 *.dSYM.zip
 *.dSYM
+*.xcarchive
 
 ## SwiftPM
 /.build

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;

ElementX/SupportingFiles/ElementX.entitlements

@@ -28,7 +28,7 @@
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP_IDENTIFIER)</string>
 	</array>
 </dict>
 </plist>

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

NSE/SupportingFiles/NSE.entitlements

@@ -10,7 +10,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)</string>
+		<string>$(KEYCHAIN_ACCESS_GROUP_IDENTIFIER)</string>
 	</array>
 </dict>
 </plist>

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"

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

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: