diff --git a/TchapX/development/SupportingFiles/NSE/Info.plist b/TchapX-NSE/development/SupportingFiles/Info.plist similarity index 100% rename from TchapX/development/SupportingFiles/NSE/Info.plist rename to TchapX-NSE/development/SupportingFiles/Info.plist diff --git a/TchapX/development/SupportingFiles/NSE/NSE.entitlements b/TchapX-NSE/development/SupportingFiles/NSE.entitlements similarity index 100% rename from TchapX/development/SupportingFiles/NSE/NSE.entitlements rename to TchapX-NSE/development/SupportingFiles/NSE.entitlements diff --git a/TchapX-NSE/development/SupportingFiles/PrivacyInfo.xcprivacy b/TchapX-NSE/development/SupportingFiles/PrivacyInfo.xcprivacy new file mode 100644 index 0000000000..04e9182243 --- /dev/null +++ b/TchapX-NSE/development/SupportingFiles/PrivacyInfo.xcprivacy @@ -0,0 +1,33 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + 7D9E.1 + + + + + diff --git a/TchapX-NSE/development/SupportingFiles/target.yml b/TchapX-NSE/development/SupportingFiles/target.yml new file mode 100644 index 0000000000..03c6299214 --- /dev/null +++ b/TchapX-NSE/development/SupportingFiles/target.yml @@ -0,0 +1,123 @@ +name: TchapX-NSE-Development + +schemes: + TchapX-NSE-Development: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-NSE-Development: + - 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: + TchapX-NSE-Development: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: KeychainAccess + - package: Kingfisher + - package: Collections + - package: Compound + - package: DeviceKit + - package: DTCoreText + - package: LRUCache + - package: Version + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.usernotifications.service + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension + + settings: + base: + PRODUCTION_APP_NAME: TchapX-NSE Development + BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.dev + BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.dev + APP_NAME: TchapX-NSE-Development + APP_DISPLAY_NAME: TchapX-NSE Development + + PRODUCT_NAME: TchapX-NSE-Development + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + CODE_SIGN_ENTITLEMENTS: TchapX-NSE/development/SupportingFiles/NSE.entitlements + SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h + OTHER_SWIFT_FLAGS: + - "-DIS_NSE -DIS_ENVIRONMENT_DEVELOPMENT" + + sources: + - path: ../../../NSE/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/Generated/Assets.swift + - path: ../../../ElementX/Sources/Generated/Strings.swift + - path: ../../../ElementX/Sources/Other/Avatars.swift + - path: ../../../ElementX/Sources/Other/Extensions/AttributedString.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift + - path: ../../../ElementX/Sources/Other/Extensions/Date.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/ImageCache.swift + - path: ../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/String.swift + - path: ../../../ElementX/Sources/Other/Extensions/Task.swift + - path: ../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/Extensions/UTType.swift + - path: ../../../ElementX/Sources/Other/HTMLParsing + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/MatrixEntityRegex.swift + - path: ../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift + - path: ../../../ElementX/Sources/Other/UserAgentBuilder.swift + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/Other/TestablePreview.swift + - path: ../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift + - path: ../../../ElementX/Sources/Other/Pills/PillConstants.swift + - path: ../../../ElementX/Sources/Other/CurrentValuePublisher.swift + - path: ../../../ElementX/Sources/Other/NetworkMonitor + - path: ../../../ElementX/Sources/Services/Keychain/KeychainController.swift + - path: ../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift + - path: ../../../ElementX/Sources/Services/Media/Provider + - path: ../../../ElementX/Sources/Services/Notification/NotificationConstants.swift + - path: ../../../ElementX/Sources/Services/Notification/Proxy + - path: ../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift + - path: ../../../ElementX/Sources/Services/UserSession/RestorationToken.swift + - path: ../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift + - path: ../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/AppHooks/AppHooks.swift + - path: ../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift + - path: ../../../TchapX/main/Sources/Generated/TchapAssets.swift + - path: ../../../TchapX/main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/TchapX/production/SupportingFiles/NSE/Info.plist b/TchapX-NSE/production/SupportingFiles/Info.plist similarity index 100% rename from TchapX/production/SupportingFiles/NSE/Info.plist rename to TchapX-NSE/production/SupportingFiles/Info.plist diff --git a/TchapX/production/SupportingFiles/NSE/NSE.entitlements b/TchapX-NSE/production/SupportingFiles/NSE.entitlements similarity index 100% rename from TchapX/production/SupportingFiles/NSE/NSE.entitlements rename to TchapX-NSE/production/SupportingFiles/NSE.entitlements diff --git a/TchapX-NSE/production/SupportingFiles/PrivacyInfo.xcprivacy b/TchapX-NSE/production/SupportingFiles/PrivacyInfo.xcprivacy new file mode 100644 index 0000000000..04e9182243 --- /dev/null +++ b/TchapX-NSE/production/SupportingFiles/PrivacyInfo.xcprivacy @@ -0,0 +1,33 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + 7D9E.1 + + + + + diff --git a/TchapX-NSE/production/SupportingFiles/target.yml b/TchapX-NSE/production/SupportingFiles/target.yml new file mode 100644 index 0000000000..8453e85fae --- /dev/null +++ b/TchapX-NSE/production/SupportingFiles/target.yml @@ -0,0 +1,123 @@ +name: TchapX-NSE-Production + +schemes: + TchapX-NSE-Production: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-NSE-Production: + - 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: + TchapX-NSE-Production: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: KeychainAccess + - package: Kingfisher + - package: Collections + - package: Compound + - package: DeviceKit + - package: DTCoreText + - package: LRUCache + - package: Version + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.usernotifications.service + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension + + settings: + base: + PRODUCTION_APP_NAME: TchapX-NSE Production + BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx + BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx + APP_NAME: TchapX-NSE-Production + APP_DISPLAY_NAME: TchapX-NSE + + PRODUCT_NAME: TchapX-NSE-Production + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + CODE_SIGN_ENTITLEMENTS: TchapX-NSE/production/SupportingFiles/NSE.entitlements + SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h + OTHER_SWIFT_FLAGS: + - "-DIS_NSE -DIS_ENVIRONMENT_PRODUCTION" + + sources: + - path: ../../../NSE/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/Generated/Assets.swift + - path: ../../../ElementX/Sources/Generated/Strings.swift + - path: ../../../ElementX/Sources/Other/Avatars.swift + - path: ../../../ElementX/Sources/Other/Extensions/AttributedString.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift + - path: ../../../ElementX/Sources/Other/Extensions/Date.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/ImageCache.swift + - path: ../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/String.swift + - path: ../../../ElementX/Sources/Other/Extensions/Task.swift + - path: ../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/Extensions/UTType.swift + - path: ../../../ElementX/Sources/Other/HTMLParsing + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/MatrixEntityRegex.swift + - path: ../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift + - path: ../../../ElementX/Sources/Other/UserAgentBuilder.swift + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/Other/TestablePreview.swift + - path: ../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift + - path: ../../../ElementX/Sources/Other/Pills/PillConstants.swift + - path: ../../../ElementX/Sources/Other/CurrentValuePublisher.swift + - path: ../../../ElementX/Sources/Other/NetworkMonitor + - path: ../../../ElementX/Sources/Services/Keychain/KeychainController.swift + - path: ../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift + - path: ../../../ElementX/Sources/Services/Media/Provider + - path: ../../../ElementX/Sources/Services/Notification/NotificationConstants.swift + - path: ../../../ElementX/Sources/Services/Notification/Proxy + - path: ../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift + - path: ../../../ElementX/Sources/Services/UserSession/RestorationToken.swift + - path: ../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift + - path: ../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/AppHooks/AppHooks.swift + - path: ../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift + - path: ../../../TchapX/main/Sources/Generated/TchapAssets.swift + - path: ../../../TchapX/main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/TchapX/staging/SupportingFiles/NSE/Info.plist b/TchapX-NSE/staging/SupportingFiles/Info.plist similarity index 100% rename from TchapX/staging/SupportingFiles/NSE/Info.plist rename to TchapX-NSE/staging/SupportingFiles/Info.plist diff --git a/TchapX/staging/SupportingFiles/NSE/NSE.entitlements b/TchapX-NSE/staging/SupportingFiles/NSE.entitlements similarity index 100% rename from TchapX/staging/SupportingFiles/NSE/NSE.entitlements rename to TchapX-NSE/staging/SupportingFiles/NSE.entitlements diff --git a/TchapX-NSE/staging/SupportingFiles/PrivacyInfo.xcprivacy b/TchapX-NSE/staging/SupportingFiles/PrivacyInfo.xcprivacy new file mode 100644 index 0000000000..04e9182243 --- /dev/null +++ b/TchapX-NSE/staging/SupportingFiles/PrivacyInfo.xcprivacy @@ -0,0 +1,33 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + 1C8F.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + 7D9E.1 + + + + + diff --git a/TchapX-NSE/staging/SupportingFiles/target.yml b/TchapX-NSE/staging/SupportingFiles/target.yml new file mode 100644 index 0000000000..0cff2de792 --- /dev/null +++ b/TchapX-NSE/staging/SupportingFiles/target.yml @@ -0,0 +1,123 @@ +name: TchapX-NSE-Staging + +schemes: + TchapX-NSE-Staging: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-NSE-Staging: + - 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: + TchapX-NSE-Staging: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: KeychainAccess + - package: Kingfisher + - package: Collections + - package: Compound + - package: DeviceKit + - package: DTCoreText + - package: LRUCache + - package: Version + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.usernotifications.service + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension + + settings: + base: + PRODUCTION_APP_NAME: TchapX-NSE Staging + BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.staging + BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.staging + APP_NAME: TchapX-NSE-Staging + APP_DISPLAY_NAME: TchapX-NSE Staging + + PRODUCT_NAME: TchapX-NSE-Staging + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + CODE_SIGN_ENTITLEMENTS: TchapX-NSE/staging/SupportingFiles/NSE.entitlements + SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h + OTHER_SWIFT_FLAGS: + - "-DIS_NSE -DIS_ENVIRONMENT_STAGING" + + sources: + - path: ../../../NSE/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/Generated/Assets.swift + - path: ../../../ElementX/Sources/Generated/Strings.swift + - path: ../../../ElementX/Sources/Other/Avatars.swift + - path: ../../../ElementX/Sources/Other/Extensions/AttributedString.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift + - path: ../../../ElementX/Sources/Other/Extensions/Date.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/ImageCache.swift + - path: ../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/String.swift + - path: ../../../ElementX/Sources/Other/Extensions/Task.swift + - path: ../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/Extensions/UTType.swift + - path: ../../../ElementX/Sources/Other/HTMLParsing + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/MatrixEntityRegex.swift + - path: ../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift + - path: ../../../ElementX/Sources/Other/UserAgentBuilder.swift + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/Other/TestablePreview.swift + - path: ../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift + - path: ../../../ElementX/Sources/Other/Pills/PillConstants.swift + - path: ../../../ElementX/Sources/Other/CurrentValuePublisher.swift + - path: ../../../ElementX/Sources/Other/NetworkMonitor + - path: ../../../ElementX/Sources/Services/Keychain/KeychainController.swift + - path: ../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift + - path: ../../../ElementX/Sources/Services/Media/Provider + - path: ../../../ElementX/Sources/Services/Notification/NotificationConstants.swift + - path: ../../../ElementX/Sources/Services/Notification/Proxy + - path: ../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift + - path: ../../../ElementX/Sources/Services/UserSession/RestorationToken.swift + - path: ../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift + - path: ../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/AppHooks/AppHooks.swift + - path: ../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift + - path: ../../../TchapX/main/Sources/Generated/TchapAssets.swift + - path: ../../../TchapX/main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/TchapX-ShareExtension/development/SupportingFiles/Info.plist b/TchapX-ShareExtension/development/SupportingFiles/Info.plist new file mode 100644 index 0000000000..d8ad392ed8 --- /dev/null +++ b/TchapX-ShareExtension/development/SupportingFiles/Info.plist @@ -0,0 +1,59 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(PRODUCT_DISPLAY_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 + + IntentsSupported + + INSendMessageIntent + + NSExtensionActivationRule + + NSExtensionActivationSupportsFileWithMaxCount + 1 + NSExtensionActivationSupportsImageWithMaxCount + 1 + NSExtensionActivationSupportsMovieWithMaxCount + 1 + NSExtensionActivationSupportsText + + NSExtensionActivationSupportsWebURLWithMaxCount + 1 + + + NSExtensionPointIdentifier + com.apple.share-services + NSExtensionPrincipalClass + $(PRODUCT_MODULE_NAME).ShareExtensionViewController + + appGroupIdentifier + $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier + $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier + $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName + $(PRODUCTION_APP_NAME) + + diff --git a/TchapX-ShareExtension/development/SupportingFiles/ShareExtension.entitlements b/TchapX-ShareExtension/development/SupportingFiles/ShareExtension.entitlements new file mode 100644 index 0000000000..d9849a816d --- /dev/null +++ b/TchapX-ShareExtension/development/SupportingFiles/ShareExtension.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + $(APP_GROUP_IDENTIFIER) + + + diff --git a/TchapX-ShareExtension/development/SupportingFiles/target.yml b/TchapX-ShareExtension/development/SupportingFiles/target.yml new file mode 100644 index 0000000000..369ee91eef --- /dev/null +++ b/TchapX-ShareExtension/development/SupportingFiles/target.yml @@ -0,0 +1,87 @@ +name: TchapX-ShareExtension-Development + +schemes: + TchapX-ShareExtension-Development: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-ShareExtension-Development: + - 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: + TchapX-ShareExtension-Development: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: Collections + - package: Compound + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.share-services + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).ShareExtensionViewController + NSExtensionAttributes: + IntentsSupported: [ + INSendMessageIntent, + ] + NSExtensionActivationRule: + NSExtensionActivationSupportsFileWithMaxCount: 1 + NSExtensionActivationSupportsImageWithMaxCount: 1 + NSExtensionActivationSupportsMovieWithMaxCount: 1 + NSExtensionActivationSupportsText: true + NSExtensionActivationSupportsWebURLWithMaxCount: 1 + + settings: + base: + PRODUCT_NAME: TchapX-ShareExtension-Development + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.shareextension + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) + CODE_SIGN_ENTITLEMENTS: ShareExtension/SupportingFiles/ShareExtension.entitlements + + sources: + - path: ../../../ShareExtension/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/ShareExtension + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSItemProvider.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/UIView.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift diff --git a/TchapX-ShareExtension/production/SupportingFiles/Info.plist b/TchapX-ShareExtension/production/SupportingFiles/Info.plist new file mode 100644 index 0000000000..d8ad392ed8 --- /dev/null +++ b/TchapX-ShareExtension/production/SupportingFiles/Info.plist @@ -0,0 +1,59 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(PRODUCT_DISPLAY_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 + + IntentsSupported + + INSendMessageIntent + + NSExtensionActivationRule + + NSExtensionActivationSupportsFileWithMaxCount + 1 + NSExtensionActivationSupportsImageWithMaxCount + 1 + NSExtensionActivationSupportsMovieWithMaxCount + 1 + NSExtensionActivationSupportsText + + NSExtensionActivationSupportsWebURLWithMaxCount + 1 + + + NSExtensionPointIdentifier + com.apple.share-services + NSExtensionPrincipalClass + $(PRODUCT_MODULE_NAME).ShareExtensionViewController + + appGroupIdentifier + $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier + $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier + $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName + $(PRODUCTION_APP_NAME) + + diff --git a/TchapX-ShareExtension/production/SupportingFiles/ShareExtension.entitlements b/TchapX-ShareExtension/production/SupportingFiles/ShareExtension.entitlements new file mode 100644 index 0000000000..d9849a816d --- /dev/null +++ b/TchapX-ShareExtension/production/SupportingFiles/ShareExtension.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + $(APP_GROUP_IDENTIFIER) + + + diff --git a/TchapX-ShareExtension/production/SupportingFiles/target.yml b/TchapX-ShareExtension/production/SupportingFiles/target.yml new file mode 100644 index 0000000000..f5cbf0de11 --- /dev/null +++ b/TchapX-ShareExtension/production/SupportingFiles/target.yml @@ -0,0 +1,87 @@ +name: TchapX-ShareExtension-Production + +schemes: + TchapX-ShareExtension-Production: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-ShareExtension-Production: + - 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: + TchapX-ShareExtension-Production: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: Collections + - package: Compound + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.share-services + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).ShareExtensionViewController + NSExtensionAttributes: + IntentsSupported: [ + INSendMessageIntent, + ] + NSExtensionActivationRule: + NSExtensionActivationSupportsFileWithMaxCount: 1 + NSExtensionActivationSupportsImageWithMaxCount: 1 + NSExtensionActivationSupportsMovieWithMaxCount: 1 + NSExtensionActivationSupportsText: true + NSExtensionActivationSupportsWebURLWithMaxCount: 1 + + settings: + base: + PRODUCT_NAME: TchapX-ShareExtension-Production + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.shareextension + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) + CODE_SIGN_ENTITLEMENTS: ShareExtension/SupportingFiles/ShareExtension.entitlements + + sources: + - path: ../../../ShareExtension/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/ShareExtension + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSItemProvider.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/UIView.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift diff --git a/TchapX-ShareExtension/staging/SupportingFiles/Info.plist b/TchapX-ShareExtension/staging/SupportingFiles/Info.plist new file mode 100644 index 0000000000..d8ad392ed8 --- /dev/null +++ b/TchapX-ShareExtension/staging/SupportingFiles/Info.plist @@ -0,0 +1,59 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + $(PRODUCT_DISPLAY_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 + + IntentsSupported + + INSendMessageIntent + + NSExtensionActivationRule + + NSExtensionActivationSupportsFileWithMaxCount + 1 + NSExtensionActivationSupportsImageWithMaxCount + 1 + NSExtensionActivationSupportsMovieWithMaxCount + 1 + NSExtensionActivationSupportsText + + NSExtensionActivationSupportsWebURLWithMaxCount + 1 + + + NSExtensionPointIdentifier + com.apple.share-services + NSExtensionPrincipalClass + $(PRODUCT_MODULE_NAME).ShareExtensionViewController + + appGroupIdentifier + $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier + $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier + $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName + $(PRODUCTION_APP_NAME) + + diff --git a/TchapX-ShareExtension/staging/SupportingFiles/ShareExtension.entitlements b/TchapX-ShareExtension/staging/SupportingFiles/ShareExtension.entitlements new file mode 100644 index 0000000000..d9849a816d --- /dev/null +++ b/TchapX-ShareExtension/staging/SupportingFiles/ShareExtension.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + $(APP_GROUP_IDENTIFIER) + + + diff --git a/TchapX-ShareExtension/staging/SupportingFiles/target.yml b/TchapX-ShareExtension/staging/SupportingFiles/target.yml new file mode 100644 index 0000000000..467729ebfb --- /dev/null +++ b/TchapX-ShareExtension/staging/SupportingFiles/target.yml @@ -0,0 +1,87 @@ +name: TchapX-ShareExtension-Staging + +schemes: + TchapX-ShareExtension-Staging: + analyze: + config: Debug + archive: + config: Release + build: + targets: + TchapX-ShareExtension-Staging: + - 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: + TchapX-ShareExtension-Staging: + type: app-extension + platform: iOS + + dependencies: + - package: MatrixRustSDK + - package: Collections + - package: Compound + + info: + path: Info.plist + properties: + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) + appGroupIdentifier: $(APP_GROUP_IDENTIFIER) + baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) + keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) + productionAppName: $(PRODUCTION_APP_NAME) + NSExtension: + NSExtensionPointIdentifier: com.apple.share-services + NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).ShareExtensionViewController + NSExtensionAttributes: + IntentsSupported: [ + INSendMessageIntent, + ] + NSExtensionActivationRule: + NSExtensionActivationSupportsFileWithMaxCount: 1 + NSExtensionActivationSupportsImageWithMaxCount: 1 + NSExtensionActivationSupportsMovieWithMaxCount: 1 + NSExtensionActivationSupportsText: true + NSExtensionActivationSupportsWebURLWithMaxCount: 1 + + settings: + base: + PRODUCT_NAME: TchapX-ShareExtension-Staging + PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) + PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.shareextension + MARKETING_VERSION: $(MARKETING_VERSION) + CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) + DEVELOPMENT_TEAM: $(DEVELOPMENT_TEAM) + CODE_SIGN_ENTITLEMENTS: ShareExtension/SupportingFiles/ShareExtension.entitlements + + sources: + - path: ../../../ShareExtension/Sources + - path: ../SupportingFiles + - path: ../../../ElementX/Sources/ShareExtension + - path: ../../../ElementX/Sources/Application/AppSettings.swift + - path: ../../../ElementX/Sources/Other/Extensions/Bundle.swift + - path: ../../../ElementX/Sources/Other/Extensions/FileManager.swift + - path: ../../../ElementX/Sources/Other/Extensions/NSItemProvider.swift + - path: ../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift + - path: ../../../ElementX/Sources/Other/Extensions/UIView.swift + - path: ../../../ElementX/Sources/Other/Extensions/URL.swift + - path: ../../../ElementX/Sources/Other/InfoPlistReader.swift + - path: ../../../ElementX/Sources/Other/Logging + - path: ../../../ElementX/Sources/Other/UserPreference.swift + - path: ../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift diff --git a/TchapX/SupportingFiles/target-development.yml b/TchapX/SupportingFiles/target-development.yml index 48b02dce63..4b0da82d42 100644 --- a/TchapX/SupportingFiles/target-development.yml +++ b/TchapX/SupportingFiles/target-development.yml @@ -179,7 +179,7 @@ targets: fi dependencies: - - target: NSE-Development + - target: TchapX-NSE-Development # not used yet # - target: NCE - package: MatrixRustSDK diff --git a/TchapX/SupportingFiles/target-production.yml b/TchapX/SupportingFiles/target-production.yml index d794aede8b..31dc264d2f 100644 --- a/TchapX/SupportingFiles/target-production.yml +++ b/TchapX/SupportingFiles/target-production.yml @@ -179,7 +179,7 @@ targets: fi dependencies: - - target: NSE-Production + - target: TchapX-NSE-Production # not used yet # - target: NCE - package: MatrixRustSDK diff --git a/TchapX/SupportingFiles/target-staging.yml b/TchapX/SupportingFiles/target-staging.yml index 71ae13868b..cdc955cf28 100644 --- a/TchapX/SupportingFiles/target-staging.yml +++ b/TchapX/SupportingFiles/target-staging.yml @@ -179,7 +179,7 @@ targets: fi dependencies: - - target: NSE-Staging + - target: TchapX-NSE-Staging # not used yet # - target: NCE - package: MatrixRustSDK diff --git a/TchapX/development/SupportingFiles/NSE/target.yml b/TchapX/development/SupportingFiles/NSE/target.yml deleted file mode 100644 index 0144733838..0000000000 --- a/TchapX/development/SupportingFiles/NSE/target.yml +++ /dev/null @@ -1,123 +0,0 @@ -name: NSE-Development - -schemes: - NSE-Development: - analyze: - config: Debug - archive: - config: Release - build: - targets: - NSE-Development: - - 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: - NSE-Development: - type: app-extension - platform: iOS - - dependencies: - - package: MatrixRustSDK - - package: KeychainAccess - - package: Kingfisher - - package: Collections - - package: Compound - - package: DeviceKit - - package: DTCoreText - - package: LRUCache - - package: Version - - info: - path: Info.plist - properties: - CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) - CFBundleShortVersionString: $(MARKETING_VERSION) - CFBundleVersion: $(CURRENT_PROJECT_VERSION) - appGroupIdentifier: $(APP_GROUP_IDENTIFIER) - baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) - keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) - productionAppName: $(PRODUCTION_APP_NAME) - NSExtension: - NSExtensionPointIdentifier: com.apple.usernotifications.service - NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension - - settings: - base: - PRODUCTION_APP_NAME: TchapX-NSE Development - BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.dev - BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.dev - APP_NAME: TchapX-NSE-Development - APP_DISPLAY_NAME: TchapX-NSE Development - - PRODUCT_NAME: TchapX-NSE-Development - PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) - PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse - MARKETING_VERSION: $(MARKETING_VERSION) - CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) - CODE_SIGN_ENTITLEMENTS: TchapX/development/SupportingFiles/NSE/NSE.entitlements - SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h - OTHER_SWIFT_FLAGS: - - "-DIS_NSE -DIS_ENVIRONMENT_DEVELOPMENT" - - sources: - - path: ../../../../NSE/Sources - - path: ../../../../ElementX/Sources/Generated/Assets.swift - - path: ../../../../ElementX/Sources/Generated/Strings.swift - - path: ../../../../ElementX/Sources/Other/Avatars.swift - - path: ../../../../ElementX/Sources/Other/Extensions/AttributedString.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Bundle.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Date.swift - - path: ../../../../ElementX/Sources/Other/Extensions/FileManager.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ImageCache.swift - - path: ../../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift - - path: ../../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift - - path: ../../../../ElementX/Sources/Other/Extensions/String.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Task.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift - - path: ../../../../ElementX/Sources/Other/Extensions/URL.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UTType.swift - - path: ../../../../ElementX/Sources/Other/HTMLParsing - - path: ../../../../ElementX/Sources/Other/InfoPlistReader.swift - - path: ../../../../ElementX/Sources/Other/Logging - - path: ../../../../ElementX/Sources/Other/MatrixEntityRegex.swift - - path: ../../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift - - path: ../../../../ElementX/Sources/Other/UserAgentBuilder.swift - - path: ../../../../ElementX/Sources/Other/UserPreference.swift - - path: ../../../../ElementX/Sources/Other/TestablePreview.swift - - path: ../../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift - - path: ../../../../ElementX/Sources/Other/Pills/PillConstants.swift - - path: ../../../../ElementX/Sources/Other/CurrentValuePublisher.swift - - path: ../../../../ElementX/Sources/Other/NetworkMonitor - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainController.swift - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift - - path: ../../../../ElementX/Sources/Services/Media/Provider - - path: ../../../../ElementX/Sources/Services/Notification/NotificationConstants.swift - - path: ../../../../ElementX/Sources/Services/Notification/Proxy - - path: ../../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift - - path: ../../../../ElementX/Sources/Services/UserSession/RestorationToken.swift - - path: ../../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift - - path: ../../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift - - path: ../../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift - - path: ../../../../ElementX/Sources/Application/AppSettings.swift - - path: ../../../../ElementX/Sources/AppHooks/AppHooks.swift - - path: ../../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift - - path: ../PrivacyInfo.xcprivacy - - path: ../../../main/Sources/Generated/TchapAssets.swift - - path: ../../../main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/TchapX/main/Sources/Generated/TchapAssets.swift b/TchapX/main/Sources/Generated/TchapAssets.swift index fdc5d22e14..016b5164a5 100644 --- a/TchapX/main/Sources/Generated/TchapAssets.swift +++ b/TchapX/main/Sources/Generated/TchapAssets.swift @@ -2,14 +2,14 @@ // Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen #if os(macOS) -import AppKit + import AppKit #elseif os(iOS) -import UIKit + import UIKit #elseif os(tvOS) || os(watchOS) -import UIKit + import UIKit #endif #if canImport(SwiftUI) -import SwiftUI + import SwiftUI #endif // Deprecated typealiases @@ -19,21 +19,20 @@ import SwiftUI // MARK: - Asset Catalogs // swiftlint:disable identifier_name line_length nesting type_body_length type_name -enum TchapAssets { } - +internal enum TchapAssets { +} // swiftlint:enable identifier_name line_length nesting type_body_length type_name // MARK: - Implementation Details // swiftlint:disable convenience_type private final class BundleToken { - static let bundle: Bundle = { - #if SWIFT_PACKAGE - return Bundle.module - #else - return Bundle(for: BundleToken.self) - #endif - }() + static let bundle: Bundle = { + #if SWIFT_PACKAGE + return Bundle.module + #else + return Bundle(for: BundleToken.self) + #endif + }() } - // swiftlint:enable convenience_type diff --git a/TchapX/main/Sources/Generated/TchapStrings+Untranslated.swift b/TchapX/main/Sources/Generated/TchapStrings+Untranslated.swift index e8ce0a700c..d4bb6ab5bb 100644 --- a/TchapX/main/Sources/Generated/TchapStrings+Untranslated.swift +++ b/TchapX/main/Sources/Generated/TchapStrings+Untranslated.swift @@ -9,20 +9,20 @@ import Foundation // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces -enum TchapUntranslatedL10n { } - +internal enum TchapUntranslatedL10n { +} // swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces // MARK: - Implementation Details extension TchapUntranslatedL10n { - static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { - // No need to check languages, we always default to en for untranslated strings - guard let bundle = Bundle.lprojBundle(for: "en") else { return key } - let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "") - return String(format: format, locale: Locale(identifier: "en"), arguments: args) - } + static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { + // No need to check languages, we always default to en for untranslated strings + guard let bundle = Bundle.lprojBundle(for: "en") else { return key } + let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "") + return String(format: format, locale: Locale(identifier: "en"), arguments: args) + } } // swiftlint:enable all diff --git a/TchapX/main/Sources/Generated/TchapStrings.swift b/TchapX/main/Sources/Generated/TchapStrings.swift index c2aaedec7b..e7acda9157 100644 --- a/TchapX/main/Sources/Generated/TchapStrings.swift +++ b/TchapX/main/Sources/Generated/TchapStrings.swift @@ -9,33 +9,33 @@ import Foundation // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces -enum TchapL10n { } - +internal enum TchapL10n { +} // swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length // swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces // MARK: - Implementation Details extension TchapL10n { - static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { - // Use preferredLocalizations to get a language that is in the bundle and the user's preferred list of languages. - let languages = Bundle.overrideLocalizations ?? Bundle.app.preferredLocalizations - - for language in languages { - if let translation = trIn(language, table, key, args) { - return translation - } - } - return Bundle.app.developmentLocalization.flatMap { trIn($0, table, key, args) } ?? key - } + static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String { + // Use preferredLocalizations to get a language that is in the bundle and the user's preferred list of languages. + let languages = Bundle.overrideLocalizations ?? Bundle.app.preferredLocalizations - private static func trIn(_ language: String, _ table: String, _ key: String, _ args: CVarArg...) -> String? { - guard let bundle = Bundle.lprojBundle(for: language) else { return nil } - let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "") - let translation = String(format: format, locale: Locale(identifier: language), arguments: args) - guard translation != key else { return nil } + for language in languages { + if let translation = trIn(language, table, key, args) { return translation + } } + return Bundle.app.developmentLocalization.flatMap { trIn($0, table, key, args) } ?? key + } + + private static func trIn(_ language: String, _ table: String, _ key: String, _ args: CVarArg...) -> String? { + guard let bundle = Bundle.lprojBundle(for: language) else { return nil } + let format = NSLocalizedString(key, tableName: table, bundle: bundle, comment: "") + let translation = String(format: format, locale: Locale(identifier: language), arguments: args) + guard translation != key else { return nil } + return translation + } } // swiftlint:enable all diff --git a/TchapX/production/SupportingFiles/NSE/target.yml b/TchapX/production/SupportingFiles/NSE/target.yml deleted file mode 100644 index d822999aa2..0000000000 --- a/TchapX/production/SupportingFiles/NSE/target.yml +++ /dev/null @@ -1,123 +0,0 @@ -name: NSE-Production - -schemes: - NSE-Production: - analyze: - config: Debug - archive: - config: Release - build: - targets: - NSE-Production: - - 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: - NSE-Production: - type: app-extension - platform: iOS - - dependencies: - - package: MatrixRustSDK - - package: KeychainAccess - - package: Kingfisher - - package: Collections - - package: Compound - - package: DeviceKit - - package: DTCoreText - - package: LRUCache - - package: Version - - info: - path: Info.plist - properties: - CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) - CFBundleShortVersionString: $(MARKETING_VERSION) - CFBundleVersion: $(CURRENT_PROJECT_VERSION) - appGroupIdentifier: $(APP_GROUP_IDENTIFIER) - baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) - keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) - productionAppName: $(PRODUCTION_APP_NAME) - NSExtension: - NSExtensionPointIdentifier: com.apple.usernotifications.service - NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension - - settings: - base: - PRODUCTION_APP_NAME: TchapX-NSE Production - BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx - BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx - APP_NAME: TchapX-NSE-Production - APP_DISPLAY_NAME: TchapX-NSE - - PRODUCT_NAME: TchapX-NSE-Production - PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) - PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse - MARKETING_VERSION: $(MARKETING_VERSION) - CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) - CODE_SIGN_ENTITLEMENTS: TchapX/production/SupportingFiles/NSE/NSE.entitlements - SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h - OTHER_SWIFT_FLAGS: - - "-DIS_NSE -DIS_ENVIRONMENT_PRODUCTION" - - sources: - - path: ../../../../NSE/Sources - - path: ../../../../ElementX/Sources/Generated/Assets.swift - - path: ../../../../ElementX/Sources/Generated/Strings.swift - - path: ../../../../ElementX/Sources/Other/Avatars.swift - - path: ../../../../ElementX/Sources/Other/Extensions/AttributedString.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Bundle.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Date.swift - - path: ../../../../ElementX/Sources/Other/Extensions/FileManager.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ImageCache.swift - - path: ../../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift - - path: ../../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift - - path: ../../../../ElementX/Sources/Other/Extensions/String.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Task.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift - - path: ../../../../ElementX/Sources/Other/Extensions/URL.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UTType.swift - - path: ../../../../ElementX/Sources/Other/HTMLParsing - - path: ../../../../ElementX/Sources/Other/InfoPlistReader.swift - - path: ../../../../ElementX/Sources/Other/Logging - - path: ../../../../ElementX/Sources/Other/MatrixEntityRegex.swift - - path: ../../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift - - path: ../../../../ElementX/Sources/Other/UserAgentBuilder.swift - - path: ../../../../ElementX/Sources/Other/UserPreference.swift - - path: ../../../../ElementX/Sources/Other/TestablePreview.swift - - path: ../../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift - - path: ../../../../ElementX/Sources/Other/Pills/PillConstants.swift - - path: ../../../../ElementX/Sources/Other/CurrentValuePublisher.swift - - path: ../../../../ElementX/Sources/Other/NetworkMonitor - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainController.swift - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift - - path: ../../../../ElementX/Sources/Services/Media/Provider - - path: ../../../../ElementX/Sources/Services/Notification/NotificationConstants.swift - - path: ../../../../ElementX/Sources/Services/Notification/Proxy - - path: ../../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift - - path: ../../../../ElementX/Sources/Services/UserSession/RestorationToken.swift - - path: ../../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift - - path: ../../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift - - path: ../../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift - - path: ../../../../ElementX/Sources/Application/AppSettings.swift - - path: ../../../../ElementX/Sources/AppHooks/AppHooks.swift - - path: ../../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift - - path: ../PrivacyInfo.xcprivacy - - path: ../../../main/Sources/Generated/TchapAssets.swift - - path: ../../../main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/TchapX/staging/SupportingFiles/NSE/target.yml b/TchapX/staging/SupportingFiles/NSE/target.yml deleted file mode 100644 index a4a937a852..0000000000 --- a/TchapX/staging/SupportingFiles/NSE/target.yml +++ /dev/null @@ -1,123 +0,0 @@ -name: NSE-Staging - -schemes: - NSE-Staging: - analyze: - config: Debug - archive: - config: Release - build: - targets: - NSE-Staging: - - 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: - NSE-Staging: - type: app-extension - platform: iOS - - dependencies: - - package: MatrixRustSDK - - package: KeychainAccess - - package: Kingfisher - - package: Collections - - package: Compound - - package: DeviceKit - - package: DTCoreText - - package: LRUCache - - package: Version - - info: - path: Info.plist - properties: - CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) - CFBundleShortVersionString: $(MARKETING_VERSION) - CFBundleVersion: $(CURRENT_PROJECT_VERSION) - appGroupIdentifier: $(APP_GROUP_IDENTIFIER) - baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER) - keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER) - productionAppName: $(PRODUCTION_APP_NAME) - NSExtension: - NSExtensionPointIdentifier: com.apple.usernotifications.service - NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).NotificationServiceExtension - - settings: - base: - PRODUCTION_APP_NAME: TchapX-NSE Staging - BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.staging - BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.staging - APP_NAME: TchapX-NSE-Staging - APP_DISPLAY_NAME: TchapX-NSE Staging - - PRODUCT_NAME: TchapX-NSE-Staging - PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME) - PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse - MARKETING_VERSION: $(MARKETING_VERSION) - CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) - CODE_SIGN_ENTITLEMENTS: TchapX/staging/SupportingFiles/NSE/NSE.entitlements - SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h - OTHER_SWIFT_FLAGS: - - "-DIS_NSE -DIS_ENVIRONMENT_STAGING" - - sources: - - path: ../../../../NSE/Sources - - path: ../../../../ElementX/Sources/Generated/Assets.swift - - path: ../../../../ElementX/Sources/Generated/Strings.swift - - path: ../../../../ElementX/Sources/Other/Avatars.swift - - path: ../../../../ElementX/Sources/Other/Extensions/AttributedString.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Bundle.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ClientBuilder.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Date.swift - - path: ../../../../ElementX/Sources/Other/Extensions/FileManager.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ImageCache.swift - - path: ../../../../ElementX/Sources/Other/Extensions/LayoutDirection.swift - - path: ../../../../ElementX/Sources/Other/Extensions/NSRegularExpresion.swift - - path: ../../../../ElementX/Sources/Other/Extensions/ProcessInfo.swift - - path: ../../../../ElementX/Sources/Other/Extensions/String.swift - - path: ../../../../ElementX/Sources/Other/Extensions/Task.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UNNotificationContent.swift - - path: ../../../../ElementX/Sources/Other/Extensions/URL.swift - - path: ../../../../ElementX/Sources/Other/Extensions/UTType.swift - - path: ../../../../ElementX/Sources/Other/HTMLParsing - - path: ../../../../ElementX/Sources/Other/InfoPlistReader.swift - - path: ../../../../ElementX/Sources/Other/Logging - - path: ../../../../ElementX/Sources/Other/MatrixEntityRegex.swift - - path: ../../../../ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift - - path: ../../../../ElementX/Sources/Other/UserAgentBuilder.swift - - path: ../../../../ElementX/Sources/Other/UserPreference.swift - - path: ../../../../ElementX/Sources/Other/TestablePreview.swift - - path: ../../../../ElementX/Sources/Other/Pills/PlainMentionBuilder.swift - - path: ../../../../ElementX/Sources/Other/Pills/PillConstants.swift - - path: ../../../../ElementX/Sources/Other/CurrentValuePublisher.swift - - path: ../../../../ElementX/Sources/Other/NetworkMonitor - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainController.swift - - path: ../../../../ElementX/Sources/Services/Keychain/KeychainControllerProtocol.swift - - path: ../../../../ElementX/Sources/Services/Media/Provider - - path: ../../../../ElementX/Sources/Services/Notification/NotificationConstants.swift - - path: ../../../../ElementX/Sources/Services/Notification/Proxy - - path: ../../../../ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift - - path: ../../../../ElementX/Sources/Services/UserSession/RestorationToken.swift - - path: ../../../../ElementX/Sources/Services/UserSession/SessionDirectories.swift - - path: ../../../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift - - path: ../../../../ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift - - path: ../../../../ElementX/Sources/Application/AppSettings.swift - - path: ../../../../ElementX/Sources/AppHooks/AppHooks.swift - - path: ../../../../ElementX/Sources/AppHooks/Hooks/ClientBuilderHook.swift - - path: ../PrivacyInfo.xcprivacy - - path: ../../../main/Sources/Generated/TchapAssets.swift - - path: ../../../main/Sources/Generated/TchapStrings.swift \ No newline at end of file diff --git a/project-tchap-x.yml b/project-tchap-x.yml index 4fb15fac5a..9706a53d5d 100644 --- a/project-tchap-x.yml +++ b/project-tchap-x.yml @@ -30,9 +30,12 @@ settings: include: - path: project.yml - path: TchapX/SupportingFiles/target-production.yml -- path: TchapX/production/SupportingFiles/NSE/target.yml - path: TchapX/SupportingFiles/target-staging.yml -- path: TchapX/staging/SupportingFiles/NSE/target.yml - path: TchapX/SupportingFiles/target-development.yml -- path: TchapX/development/SupportingFiles/NSE/target.yml +- path: TchapX-NSE/production/SupportingFiles/target.yml +- path: TchapX-NSE/staging/SupportingFiles/target.yml +- path: TchapX-NSE/development/SupportingFiles/target.yml +- path: TchapX-ShareExtension/production/SupportingFiles/target.yml +- path: TchapX-ShareExtension/staging/SupportingFiles/target.yml +- path: TchapX-ShareExtension/development/SupportingFiles/target.yml - path: TchapX/SupportingFiles/target-unitTests.yml