Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project updates. #3837

Merged
merged 5 commits into from
Feb 26, 2025
Merged

Project updates. #3837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3015b4
Don't use the AppIdentifierPrefix as it breaks when re-signing.
pixlwave Feb 25, 2025
48d4da9
Generate entitlements using XcodeGen.
pixlwave Feb 26, 2025
fab04a4
Ignore Xcode Archives.
pixlwave Feb 26, 2025
f0d1318
Remove the (unused) NCE.
pixlwave Feb 26, 2025
a286086
Update submodule.
pixlwave Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ xcuserdata/
*.ipa
*.dSYM.zip
*.dSYM
*.xcarchive

## SwiftPM
/.build
Expand Down
4 changes: 2 additions & 2 deletions ElementX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ElementX/SupportingFiles/ElementX.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
27 changes: 23 additions & 4 deletions ElementX/SupportingFiles/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ targets:
platform: iOS

info:
path: ../SupportingFiles/Info.plist
path: Info.plist
properties:
UILaunchScreen:
UIColorName: colors/background-color
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -185,8 +206,6 @@ targets:
dependencies:
- target: NSE
- target: ShareExtension
# not used yet
# - target: NCE
- package: MatrixRustSDK
embed: true
- package: Compound
Expand Down
2 changes: 1 addition & 1 deletion Enterprise
Open in desktop
Submodule Enterprise updated from 731c7a to 86e0ea
21 changes: 0 additions & 21 deletions NCE/Sources/NotificationViewController.swift
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions NCE/SupportingFiles/Info.plist
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions NCE/SupportingFiles/target.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion NSE/SupportingFiles/NSE.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 10 additions & 2 deletions NSE/SupportingFiles/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ targets:
- package: Version

info:
path: ../SupportingFiles/Info.plist
path: Info.plist
properties:
CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME)
CFBundleShortVersionString: $(MARKETING_VERSION)
Expand All @@ -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
Expand All @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions ShareExtension/SupportingFiles/target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ targets:
- package: Compound

info:
path: ../SupportingFiles/Info.plist
path: Info.plist
properties:
CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME)
CFBundleShortVersionString: $(MARKETING_VERSION)
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
Loading