Merge pull request #4017 from vector-im/element_3812_2

Xcodegen optimisations

Config/AppIdentifiers.xcconfig

@@ -0,0 +1,43 @@
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+// App identity
+BUNDLE_DISPLAY_NAME = Element
+BASE_BUNDLE_IDENTIFIER = im.vector.app
+APPLICATION_GROUP_IDENTIFIER = group.im.vector
+
+// Version
+MARKETING_VERSION = 1.1.3
+CURRENT_PROJECT_VERSION =  1.1.3
+
+
+// Team
+DEVELOPMENT_TEAM = 7J4U792NQT
+
+
+// Provisioning profiles
+RIOT_PROVISIONING_PROFILE_SPECIFIER = Vector App Store
+RIOT_PROVISIONING_PROFILE = f65e7447-b8a3-46cc-8fba-fa60e55e2511
+
+NSE_PROVISIONING_PROFILE_SPECIFIER = "Vector NSE: App Store"
+NSE_PROVISIONING_PROFILE = 31dc9316-e029-47fd-81f5-778db07d76a2
+
+SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
+SHARE_EXTENSION_PROVISIONING_PROFILE =  1a3be143-50c7-4ae2-834e-00596a053141
+
+SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
+SIRI_INTENTS_PROVISIONING_PROFILE = 18a66f93-ffe1-4008-b343-58350cc65023

Config/Project-Debug.xcconfig

@@ -0,0 +1,39 @@
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This file defines project settings for Debug.
+// Targets (App, extensions) xcconfig files automatically include it for Debug build.
+
+#include "Project.xcconfig"
+#include "Project-Warnings.xcconfig"
+
+ONLY_ACTIVE_ARCH = YES
+COPY_PHASE_STRIP = NO
+ENABLE_TESTABILITY = YES
+MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE
+
+SWIFT_OPTIMIZATION_LEVEL = -Onone
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG
+
+GCC_OPTIMIZATION_LEVEL = 0
+GCC_DYNAMIC_NO_PIC = NO
+GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited)
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+
+
+// Code signing: Use the development team for all targets
+CODE_SIGN_IDENTITY = iPhone Developer
+CODE_SIGN_STYLE = Automatic

Config/Project-Release.xcconfig

@@ -0,0 +1,33 @@
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This file defines project settings for Release.
+// Targets (App, extensions) xcconfig files automatically include it for Release build.
+
+#include "Project.xcconfig"
+#include "Project-Warnings.xcconfig"
+
+COPY_PHASE_STRIP = YES
+ENABLE_NS_ASSERTIONS = NO
+MTL_ENABLE_DEBUG_INFO = NO
+VALIDATE_PRODUCT = YES
+
+SWIFT_COMPILATION_MODE = wholemodule
+
+
+// Code signing: Manual
+CODE_SIGN_IDENTITY = iPhone Distribution
+CODE_SIGN_STYLE = Manual

Config/Project-Warnings.xcconfig

@@ -0,0 +1,48 @@
+
+// 
+// Copyright 2021 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This file defines warning declarations for the base project.
+// Targets (App, extensions) xcconfig files automatically include it.
+
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES
+CLANG_WARN_BOOL_CONVERSION = YES
+CLANG_WARN_COMMA = YES
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
+CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
+CLANG_WARN_DOCUMENTATION_COMMENTS = YES
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_ENUM_CONVERSION = YES
+CLANG_WARN_INFINITE_RECURSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
+CLANG_WARN_OBJC_LITERAL_CONVERSION = YES
+CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
+CLANG_WARN_RANGE_LOOP_ANALYSIS = YES
+CLANG_WARN_STRICT_PROTOTYPES = YES
+CLANG_WARN_SUSPICIOUS_MOVE = YES
+CLANG_WARN_UNREACHABLE_CODE = YES
+CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE
+
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_VARIABLE = YES

Config/Project.xcconfig

@@ -17,13 +17,32 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-BUNDLE_DISPLAY_NAME = Element
 
-APPLICATION_GROUP_IDENTIFIER = group.im.vector
-
-BASE_BUNDLE_IDENTIFIER = im.vector.app
+// This file defines base project settings.
+// Targets (App, extensions) xcconfig files automatically include it.
 
+// Application constants
 KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared
 
-//Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated
+// Build settings
+IPHONEOS_DEPLOYMENT_TARGET = 11.0
+SDKROOT = iphoneos
+TARGETED_DEVICE_FAMILY = 1,2
+SWIFT_VERSION = 5.3.1
+ENABLE_BITCODE = NO
+
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
+ALWAYS_SEARCH_USER_PATHS = NO
+DEFINES_MODULE = YES
+ENABLE_STRICT_OBJC_MSGSEND = YES
+GCC_NO_COMMON_BLOCKS = YES
+
+// Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated
 EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
+
+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
+CLANG_ANALYZER_NONNULL = YES
+CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE
+
+CLANG_ENABLE_MODULES = YES
+CLANG_ENABLE_OBJC_ARC = YES

Podfile

@@ -111,6 +111,9 @@ post_install do |installer|
       if target.name.include? 'ReadMoreTextView'
         config.build_settings['SWIFT_VERSION'] = '5.2'
       end
+
+      # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods 
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
     end
   end
 end

Riot/Common.xcconfig

@@ -17,6 +17,15 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "Config/AppIdentifiers.xcconfig"
 
+PRODUCT_NAME = Riot
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
+
+INFOPLIST_FILE = Riot/SupportingFiles/Info.plist
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
+
+CODE_SIGN_ENTITLEMENTS = Riot/SupportingFiles/Riot.entitlements
+
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks

Riot/Debug.xcconfig

@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "App-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.debug.xcconfig"

Riot/Release.xcconfig

@@ -17,5 +17,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "App-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-Riot/Pods-RiotPods-Riot.release.xcconfig"
+
+PROVISIONING_PROFILE = $(RIOT_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(RIOT_PROVISIONING_PROFILE_SPECIFIER)

Riot/target.yml

@@ -0,0 +1,127 @@
+name: Riot
+
+schemes:
+  Riot:
+    analyze:
+      config: Debug
+    archive:
+      config: Release
+    build:
+      targets:
+        Riot:
+        - running
+        - testing
+        - profiling
+        - analyzing
+        - archiving
+    profile:
+      config: Release
+    run:
+      config: Debug
+      disableMainThreadChecker: true
+    test:
+      config: Debug
+      disableMainThreadChecker: true
+      targets:
+      - RiotTests
+
+targets:
+  Riot:
+    type: application
+    platform: iOS
+
+    dependencies:
+    - target: RiotShareExtension
+    - target: SiriIntents
+    - target: RiotNSE
+
+    configFiles:
+      Debug: Debug.xcconfig
+      Release: Release.xcconfig
+
+    preBuildScripts:
+    - name: ⚠️ SwiftLint
+      runOnlyWhenInstalling: false
+      shell: /bin/sh
+      script: "${PODS_ROOT}/SwiftLint/swiftlint\n"
+    - name: 🛠 SwiftGen
+      runOnlyWhenInstalling: false
+      shell: /bin/sh
+      script: "${PODS_ROOT}/SwiftGen/bin/swiftgen config run --config Tools/SwiftGen/swiftgen-config.yml\n"
+
+    sources:
+    - path: ../Tools
+      excludes:
+        - "Logs"
+        - "Release"
+        - "Templates/*.sh"
+    - path: ../Config
+      excludes:
+        - "AppConfig.swift"
+    - path: .
+      excludes:
+        - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
+        - "Modules/KeyBackup/Recover/Loading"
+        - "Modules/KeyBackup/Setup/RecoveryKey"
+        - "**/*.strings" # Exclude all strings files
+
+    # Add separately localizable files
+    # Once a language has enough translations (>80%), it must be declared here
+    - path: Assets/en.lproj/InfoPlist.strings
+    - path: Assets/en.lproj/Localizable.strings
+    - path: Assets/en.lproj/Vector.strings
+    - path: Assets/fr.lproj/InfoPlist.strings
+    - path: Assets/fr.lproj/Localizable.strings
+    - path: Assets/fr.lproj/Vector.strings
+    - path: Assets/de.lproj/InfoPlist.strings
+    - path: Assets/de.lproj/Localizable.strings
+    - path: Assets/de.lproj/Vector.strings
+    - path: Assets/sq.lproj/InfoPlist.strings
+    - path: Assets/sq.lproj/Localizable.strings
+    - path: Assets/sq.lproj/Vector.strings
+    - path: Assets/vi.lproj/InfoPlist.strings
+    - path: Assets/vi.lproj/Localizable.strings
+    - path: Assets/vi.lproj/Vector.strings
+    - path: Assets/eu.lproj/InfoPlist.strings
+    - path: Assets/eu.lproj/Localizable.strings
+    - path: Assets/eu.lproj/Vector.strings
+    - path: Assets/bg.lproj/InfoPlist.strings
+    - path: Assets/bg.lproj/Localizable.strings
+    - path: Assets/bg.lproj/Vector.strings
+    - path: Assets/nl.lproj/InfoPlist.strings
+    - path: Assets/nl.lproj/Localizable.strings
+    - path: Assets/nl.lproj/Vector.strings
+    - path: Assets/ca.lproj/InfoPlist.strings
+    - path: Assets/ca.lproj/Localizable.strings
+    - path: Assets/ca.lproj/Vector.strings
+    - path: Assets/zh_Hans.lproj/InfoPlist.strings
+    - path: Assets/zh_Hans.lproj/Localizable.strings
+    - path: Assets/zh_Hans.lproj/Vector.strings
+    - path: Assets/ru.lproj/InfoPlist.strings
+    - path: Assets/ru.lproj/Localizable.strings
+    - path: Assets/ru.lproj/Vector.strings
+    - path: Assets/zh_Hant.lproj/InfoPlist.strings
+    - path: Assets/zh_Hant.lproj/Localizable.strings
+    - path: Assets/zh_Hant.lproj/Vector.strings
+    - path: Assets/es.lproj/InfoPlist.strings
+    - path: Assets/es.lproj/Localizable.strings
+    - path: Assets/es.lproj/Vector.strings
+    - path: Assets/ja.lproj/InfoPlist.strings
+    - path: Assets/ja.lproj/Localizable.strings
+    - path: Assets/ja.lproj/Vector.strings
+    - path: Assets/hu.lproj/InfoPlist.strings
+    - path: Assets/hu.lproj/Localizable.strings
+    - path: Assets/hu.lproj/Vector.strings
+    - path: Assets/pl.lproj/InfoPlist.strings
+    - path: Assets/pl.lproj/Localizable.strings
+    - path: Assets/pl.lproj/Vector.strings
+    - path: Assets/cy.lproj/InfoPlist.strings
+    - path: Assets/cy.lproj/Localizable.strings
+    - path: Assets/cy.lproj/Vector.strings
+    - path: Assets/it.lproj/InfoPlist.strings
+    - path: Assets/it.lproj/Localizable.strings
+    - path: Assets/it.lproj/Vector.strings
+    - path: Assets/et.lproj/InfoPlist.strings
+    - path: Assets/et.lproj/Localizable.strings
+    - path: Assets/et.lproj/Vector.strings
+    - path: Assets/is.lproj/Vector.strings

RiotNSE/Common.xcconfig

@@ -17,6 +17,13 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "Config/AppIdentifiers.xcconfig"
 
+PRODUCT_NAME = RiotNSE
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse
+
+INFOPLIST_FILE = RiotNSE/Info.plist
+
+CODE_SIGN_ENTITLEMENTS = RiotNSE/RiotNSE.entitlements
+
+SKIP_INSTALL = YES

RiotNSE/Debug.xcconfig

@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "NSE-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.debug.xcconfig"

RiotNSE/Release.xcconfig

@@ -17,5 +17,10 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "NSE-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotNSE/Pods-RiotPods-RiotNSE.release.xcconfig"
+
+PROVISIONING_PROFILE = $(NSE_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(NSE_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP = NO

RiotNSE/target.yml

@@ -0,0 +1,58 @@
+name: RiotNSE
+
+schemes:
+  RiotNSE:
+    analyze:
+      config: Debug
+    archive:
+      config: Release
+    build:
+      targets:
+        RiotNSE:
+        - running
+        - testing
+        - profiling
+        - analyzing
+        - archiving
+    profile:
+      config: Release
+    run:
+      askForAppToLaunch: true
+      config: Debug
+      debugEnabled: false
+      disableMainThreadChecker: true
+      launchAutomaticallySubstyle: 2
+    test:
+      config: Debug
+      disableMainThreadChecker: true
+
+targets:
+  RiotNSE:
+    platform: iOS
+    type: app-extension
+
+    configFiles:
+      Debug: Debug.xcconfig
+      Release: Release.xcconfig
+
+    sources: 
+    - path: .
+    - path: ../Riot/Managers/Settings/RiotSettings.swift
+    - path: ../Config/BuildSettings.swift
+    - path: ../Riot/Utils/DataProtectionHelper.swift
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Riot/Managers/PushNotification/PushNotificationStore.swift
+    - path: ../Riot/Modules/SetPinCode/PinCodePreferences.swift
+    - path: ../Riot/Generated/InfoPlist.swift
+    - path: ../Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
+    - path: ../Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
+    - path: ../Riot/Categories/UNUserNotificationCenter.swift
+    - path: ../Riot/Managers/KeyValueStorage/KeyValueStore.swift
+    - path: ../Riot/Categories/Bundle.swift
+    - path: ../Riot/Generated/Strings.swift
+    - path: ../Riot/Generated/Images.swift
+    - path: ../Riot/Managers/KeyValueStorage/KeychainStore.swift
+    - path: ../Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
+    - path: ../Config/Configurable.swift
+    - path: ../Riot/Utils/Constants.swift
+    - path: ../Riot/Utils/Memory.swift

RiotShareExtension/Common.xcconfig

@@ -17,6 +17,18 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "Config/AppIdentifiers.xcconfig"
 
+PRODUCT_NAME = RiotShareExtension
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension
+
+INFOPLIST_FILE = RiotShareExtension/SupportingFiles/Info.plist
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
+
+CODE_SIGN_ENTITLEMENTS = RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
+        
+APPLICATION_EXTENSION_API_ONLY = YES
+SKIP_INSTALL = YES
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotShareExtension-Bridging-Header.h
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) IS_SHARE_EXTENSION=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks

RiotShareExtension/Debug.xcconfig

@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "ShareExtension-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.debug.xcconfig"

RiotShareExtension/Release.xcconfig

@@ -17,5 +17,10 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "ShareExtension-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-RiotShareExtension/Pods-RiotPods-RiotShareExtension.release.xcconfig"
+
+PROVISIONING_PROFILE = $(SHARE_EXTENSION_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP = NO

RiotShareExtension/target.yml

@@ -0,0 +1,66 @@
+name: RiotShareExtension
+
+schemes:
+  RiotShareExtension:
+    analyze:
+      config: Debug
+    archive:
+      config: Release
+    build:
+      targets:
+        RiotShareExtension:
+        - running
+        - testing
+        - profiling
+        - analyzing
+        - archiving
+    profile:
+      config: Release
+    run:
+      askForAppToLaunch: true
+      config: Debug
+      debugEnabled: false
+      disableMainThreadChecker: true
+      launchAutomaticallySubstyle: 2
+    test:
+      config: Debug
+      disableMainThreadChecker: true
+
+targets:
+  RiotShareExtension:
+    platform: iOS
+    type: app-extension
+
+    configFiles:
+      Debug: Debug.xcconfig
+      Release: Release.xcconfig
+
+    sources:
+    - path: .
+    - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
+    - path: ../Riot/Categories/Bundle.swift
+    - path: ../Riot/Managers/Theme/Themes/DefaultTheme.swift
+    - path: ../Riot/Managers/Theme/ThemeService.m
+    - path: ../Riot/Utils/AvatarGenerator.m
+    - path: ../Riot/Generated/InfoPlist.swift
+    - path: ../Config/BuildSettings.swift
+    - path: ../Riot/Categories/Character.swift
+    - path: ../Riot/Managers/Theme/Themes/BlackTheme.swift
+    - path: ../Riot/Categories/MXRoom+Riot.m
+    - path: ../Config/Configurable.swift
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Riot/Utils/UserNameColorGenerator.swift
+    - path: ../Riot/Categories/MXRoomSummary+Riot.m
+    - path: ../Riot/Managers/Theme/Theme.swift
+    - path: ../Riot/Managers/Settings/RiotSettings.swift
+    - path: ../Riot/Categories/UIColor.swift
+    - path: ../Riot/Managers/Theme/Themes/DarkTheme.swift
+    - path: ../Riot/Categories/UISearchBar.swift
+    - path: ../Riot/Categories/String.swift
+    - path: ../Riot/Modules/Common/Recents/CellData/RecentCellData.m
+    - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.xib
+      buildPhase: resources
+    - path: ../Riot/Assets/en.lproj/Vector.strings
+      buildPhase: resources
+    - path: ../Riot/Assets/SharedImages.xcassets
+      buildPhase: resources

RiotTests/target.yml

@@ -34,32 +34,19 @@ targets:
     - target: Riot
 
     settings:
-      groups:
-        - appDefault
       base:
-        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: $(inherited)
         BUNDLE_LOADER: $(TEST_HOST)
-        CLANG_ENABLE_MODULES: YES
-        CODE_SIGN_STYLE: Manual
         FRAMEWORK_SEARCH_PATHS: $(SDKROOT)/Developer/Library/Frameworks $(inherited)
-        INFOPLIST_FILE: RiotTests/Info.plist
+        INFOPLIST_FILE: Info.plist
         LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks
         PRODUCT_BUNDLE_IDENTIFIER: org.matrix.$(PRODUCT_NAME:rfc1034identifier)
         PRODUCT_NAME: RiotTests
-        SWIFT_OBJC_BRIDGING_HEADER: RiotTests/RiotTests-Bridging-Header.h
+        SWIFT_OBJC_BRIDGING_HEADER: RiotTests-Bridging-Header.h
         TEST_HOST: $(BUILT_PRODUCTS_DIR)/Riot.app/Riot
       configs:
         Debug:
-          GCC_PREPROCESSOR_DEFINITIONS: DEBUG=1 $(inherited)
-          SWIFT_OPTIMIZATION_LEVEL: -Onone
         Release:
           PROVISIONING_PROFILE: $(RIOT_PROVISIONING_PROFILE)
           PROVISIONING_PROFILE_SPECIFIER: $(RIOT_PROVISIONING_PROFILE_SPECIFIER)
 
-    postbuildScripts:
-    - name: Embed Precompiled Frameworks
-      runOnlyWhenInstalling: false
-      script: echo "Skipping, nothing to be embedded."
-      shell: /bin/sh
-
-    sources: [../RiotTests]
+    sources: .

SiriIntents/Common.xcconfig

@@ -17,6 +17,14 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "Config/Common.xcconfig"
+#include "Config/AppIdentifiers.xcconfig"
 
+PRODUCT_NAME=  SiriIntents
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).SiriIntents
+
+INFOPLIST_FILE = SiriIntents/Info.plist
+
+CODE_SIGN_ENTITLEMENTS = SiriIntents/SiriIntents.entitlements
+
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks    
+SKIP_INSTALL = YES

SiriIntents/Debug.xcconfig

@@ -17,5 +17,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "SiriIntents-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.debug.xcconfig"

SiriIntents/Release.xcconfig

@@ -17,5 +17,10 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-#include "SiriIntents-Common.xcconfig"
+#include "Common.xcconfig"
 #include "Pods/Target Support Files/Pods-RiotPods-SiriIntents/Pods-RiotPods-SiriIntents.release.xcconfig"
+
+PROVISIONING_PROFILE = $(SIRI_INTENTS_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER)
+
+COPY_PHASE_STRIP = NO

SiriIntents/target.yml

@@ -0,0 +1,48 @@
+name: SiriIntents
+
+schemes:
+  SiriIntents:
+    analyze:
+      config: Debug
+    archive:
+      config: Release
+    build:
+      targets:
+        SiriIntents:
+        - running
+        - testing
+        - profiling
+        - analyzing
+        - archiving
+    profile:
+      config: Release
+    run:
+      askForAppToLaunch: true
+      config: Debug
+      debugEnabled: false
+      disableMainThreadChecker: true
+      launchAutomaticallySubstyle: 2
+    test:
+      config: Debug
+      disableMainThreadChecker: true
+
+targets:
+  SiriIntents:
+    platform: iOS
+    type: app-extension
+
+    dependencies:
+    - sdk: Intents.framework
+
+    configFiles:
+      Debug: Debug.xcconfig
+      Release: Release.xcconfig
+
+    sources:
+    - path: .
+    - path: ../Riot/Generated/InfoPlist.swift
+    - path: ../Riot/Categories/Bundle.swift
+    - path: ../Config/CommonConfiguration.swift
+    - path: ../Config/BuildSettings.swift
+    - path: ../Config/Configurable.swift
+    - path: ../Riot/Managers/Settings/RiotSettings.swift

Targets/Application.yml

@@ -1,163 +0,0 @@
-name: Riot
-
-schemes:
-  Riot:
-    analyze:
-      config: Debug
-    archive:
-      config: Release
-    build:
-      targets:
-        Riot:
-        - running
-        - testing
-        - profiling
-        - analyzing
-        - archiving
-    profile:
-      config: Release
-    run:
-      config: Debug
-      disableMainThreadChecker: true
-    test:
-      config: Debug
-      disableMainThreadChecker: true
-      targets:
-      - RiotTests
-
-targets:
-  Riot:
-    type: application
-    platform: iOS
-
-    dependencies:
-    - target: RiotShareExtension
-    - target: SiriIntents
-    - target: RiotNSE
-
-    configFiles:
-      Debug: ../Riot/SupportingFiles/App-Debug.xcconfig
-      Release: ../Riot/SupportingFiles/App-Release.xcconfig
-      
-    settings:
-      groups:
-        - appDefault
-      base:
-        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: $(inherited)
-        ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        CLANG_ENABLE_MODULES: YES
-        CODE_SIGN_ENTITLEMENTS: Riot/SupportingFiles/Riot.entitlements
-        ENABLE_BITCODE: NO
-        FRAMEWORK_SEARCH_PATHS: $(inherited)
-        GCC_PREPROCESSOR_DEFINITIONS: $(inherited)
-        HEADER_SEARCH_PATHS: $(inherited)
-        INFOPLIST_FILE: Riot/SupportingFiles/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks
-        LIBRARY_SEARCH_PATHS: $(inherited)
-        OTHER_CFLAGS: $(inherited)
-        OTHER_LDFLAGS: $(inherited)
-        OTHER_SWIFT_FLAGS: $(inherited)
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER)
-        PRODUCT_NAME: Riot
-        SWIFT_OBJC_BRIDGING_HEADER: $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/Riot-Bridging-Header.h
-        TARGETED_DEVICE_FAMILY: 1,2
-        USER_HEADER_SEARCH_PATHS: $(inherited)
-
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          PROVISIONING_PROFILE_SPECIFIER: 
-          SWIFT_OPTIMIZATION_LEVEL: -Onone
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          PROVISIONING_PROFILE: $(RIOT_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(RIOT_PROVISIONING_PROFILE_SPECIFIER)
-
-    preBuildScripts:
-    - name: ⚠️ SwiftLint
-      runOnlyWhenInstalling: false
-      shell: /bin/sh
-      script: "${PODS_ROOT}/SwiftLint/swiftlint\n"
-    - name: 🛠 SwiftGen
-      runOnlyWhenInstalling: false
-      shell: /bin/sh
-      script: "${PODS_ROOT}/SwiftGen/bin/swiftgen config run --config Tools/SwiftGen/swiftgen-config.yml\n"
-
-    sources:
-    - path: ../Tools
-      excludes:
-        - "Logs"
-        - "Release"
-        - "Templates/*.sh"
-    - path: ../Config
-      excludes:
-        - "AppConfig.swift"
-    - path: ../Riot
-      excludes:
-        - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
-        - "Modules/KeyBackup/Recover/Loading"
-        - "Modules/KeyBackup/Setup/RecoveryKey"
-        - "**/*.strings" # Exclude all strings files
-
-    # Add separately localizable files
-    - path: ../Riot/Assets/en.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/en.lproj/Localizable.strings
-    - path: ../Riot/Assets/en.lproj/Vector.strings
-    - path: ../Riot/Assets/fr.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/fr.lproj/Localizable.strings
-    - path: ../Riot/Assets/fr.lproj/Vector.strings
-    - path: ../Riot/Assets/de.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/de.lproj/Localizable.strings
-    - path: ../Riot/Assets/de.lproj/Vector.strings
-    - path: ../Riot/Assets/sq.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/sq.lproj/Localizable.strings
-    - path: ../Riot/Assets/sq.lproj/Vector.strings
-    - path: ../Riot/Assets/vi.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/vi.lproj/Localizable.strings
-    - path: ../Riot/Assets/vi.lproj/Vector.strings
-    - path: ../Riot/Assets/eu.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/eu.lproj/Localizable.strings
-    - path: ../Riot/Assets/eu.lproj/Vector.strings
-    - path: ../Riot/Assets/bg.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/bg.lproj/Localizable.strings
-    - path: ../Riot/Assets/bg.lproj/Vector.strings
-    - path: ../Riot/Assets/nl.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/nl.lproj/Localizable.strings
-    - path: ../Riot/Assets/nl.lproj/Vector.strings
-    - path: ../Riot/Assets/ca.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/ca.lproj/Localizable.strings
-    - path: ../Riot/Assets/ca.lproj/Vector.strings
-    - path: ../Riot/Assets/zh_Hans.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/zh_Hans.lproj/Localizable.strings
-    - path: ../Riot/Assets/zh_Hans.lproj/Vector.strings
-    - path: ../Riot/Assets/ru.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/ru.lproj/Localizable.strings
-    - path: ../Riot/Assets/ru.lproj/Vector.strings
-    - path: ../Riot/Assets/zh_Hant.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/zh_Hant.lproj/Localizable.strings
-    - path: ../Riot/Assets/zh_Hant.lproj/Vector.strings
-    - path: ../Riot/Assets/es.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/es.lproj/Localizable.strings
-    - path: ../Riot/Assets/es.lproj/Vector.strings
-    - path: ../Riot/Assets/ja.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/ja.lproj/Localizable.strings
-    - path: ../Riot/Assets/ja.lproj/Vector.strings
-    - path: ../Riot/Assets/hu.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/hu.lproj/Localizable.strings
-    - path: ../Riot/Assets/hu.lproj/Vector.strings
-    - path: ../Riot/Assets/pl.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/pl.lproj/Localizable.strings
-    - path: ../Riot/Assets/pl.lproj/Vector.strings
-    - path: ../Riot/Assets/cy.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/cy.lproj/Localizable.strings
-    - path: ../Riot/Assets/cy.lproj/Vector.strings
-    - path: ../Riot/Assets/it.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/it.lproj/Localizable.strings
-    - path: ../Riot/Assets/it.lproj/Vector.strings
-    - path: ../Riot/Assets/et.lproj/InfoPlist.strings
-    - path: ../Riot/Assets/et.lproj/Localizable.strings
-    - path: ../Riot/Assets/et.lproj/Vector.strings
-    - path: ../Riot/Assets/is.lproj/Vector.strings

Targets/NotificationServiceExtension.yml

@@ -1,101 +0,0 @@
-name: RiotNSE
-
-schemes:
-  RiotNSE:
-    analyze:
-      config: Debug
-    archive:
-      config: Release
-    build:
-      targets:
-        RiotNSE:
-        - running
-        - testing
-        - profiling
-        - analyzing
-        - archiving
-    profile:
-      config: Release
-    run:
-      askForAppToLaunch: true
-      config: Debug
-      debugEnabled: false
-      disableMainThreadChecker: true
-      launchAutomaticallySubstyle: 2
-    test:
-      config: Debug
-      disableMainThreadChecker: true
-
-targets:
-  RiotNSE:
-    platform: iOS
-    type: app-extension
-
-    configFiles:
-      Debug: ../RiotNSE/NSE-Debug.xcconfig
-      Release: ../RiotNSE/NSE-Release.xcconfig
-
-    settings:
-      groups:
-        - appDefault
-      base:
-        CLANG_ANALYZER_NONNULL: YES
-        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: YES_AGGRESSIVE
-        CLANG_CXX_LANGUAGE_STANDARD: gnu++14
-        CLANG_ENABLE_OBJC_WEAK: YES
-        CLANG_WARN_DOCUMENTATION_COMMENTS: YES
-        CLANG_WARN_UNGUARDED_AVAILABILITY: YES_AGGRESSIVE
-        CODE_SIGN_ENTITLEMENTS: RiotNSE/RiotNSE.entitlements
-        ENABLE_BITCODE: NO
-        GCC_C_LANGUAGE_STANDARD: gnu11
-        INFOPLIST_FILE: RiotNSE/Info.plist
-        MTL_FAST_MATH: YES
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).nse
-        PRODUCT_NAME: RiotNSE
-        SKIP_INSTALL: YES
-        TARGETED_DEVICE_FAMILY: 1,2
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          DEBUG_INFORMATION_FORMAT: dwarf
-          MTL_ENABLE_DEBUG_INFO: INCLUDE_SOURCE
-          PROVISIONING_PROFILE_SPECIFIER: ""
-          SWIFT_ACTIVE_COMPILATION_CONDITIONS: DEBUG
-          SWIFT_OPTIMIZATION_LEVEL: -Onone
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
-          PROVISIONING_PROFILE: $(NSE_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(NSE_PROVISIONING_PROFILE_SPECIFIER)
-          SWIFT_OPTIMIZATION_LEVEL: -O
-  
-    postbuildScripts:
-    - name: Embed Precompiled Frameworks
-      runOnlyWhenInstalling: false
-      script: echo "Skipping, nothing to be embedded."
-      shell: /bin/sh
-
-    sources: 
-    - path: ../RiotNSE
-    - path: ../Riot/Managers/Settings/RiotSettings.swift
-    - path: ../Config/BuildSettings.swift
-    - path: ../Riot/Utils/DataProtectionHelper.swift
-    - path: ../Config/CommonConfiguration.swift
-    - path: ../Riot/Managers/PushNotification/PushNotificationStore.swift
-    - path: ../Riot/Modules/SetPinCode/PinCodePreferences.swift
-    - path: ../Riot/Generated/InfoPlist.swift
-    - path: ../Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
-    - path: ../Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
-    - path: ../Riot/Categories/UNUserNotificationCenter.swift
-    - path: ../Riot/Managers/KeyValueStorage/KeyValueStore.swift
-    - path: ../Riot/Categories/Bundle.swift
-    - path: ../Riot/Generated/Strings.swift
-    - path: ../Riot/Generated/Images.swift
-    - path: ../Riot/Managers/KeyValueStorage/KeychainStore.swift
-    - path: ../Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
-    - path: ../Config/Configurable.swift
-    - path: ../Riot/Utils/Constants.swift
-    - path: ../Riot/Utils/Memory.swift

Targets/ShareExtension.yml

@@ -1,112 +0,0 @@
-name: RiotShareExtension
-
-schemes:
-  RiotShareExtension:
-    analyze:
-      config: Debug
-    archive:
-      config: Release
-    build:
-      targets:
-        RiotShareExtension:
-        - running
-        - testing
-        - profiling
-        - analyzing
-        - archiving
-    profile:
-      config: Release
-    run:
-      askForAppToLaunch: true
-      config: Debug
-      debugEnabled: false
-      disableMainThreadChecker: true
-      launchAutomaticallySubstyle: 2
-    test:
-      config: Debug
-      disableMainThreadChecker: true
-
-targets:
-  RiotShareExtension:
-    platform: iOS
-    type: app-extension
-
-    configFiles:
-      Debug: ../RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig
-      Release: ../RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig
-
-    settings:
-      groups:
-        - appDefault
-      base:
-        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: $(inherited)
-        APPLICATION_EXTENSION_API_ONLY: YES
-        ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        CLANG_ANALYZER_NONNULL: YES
-        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: YES_AGGRESSIVE
-        CLANG_WARN_DOCUMENTATION_COMMENTS: YES
-        CODE_SIGN_ENTITLEMENTS: RiotShareExtension/SupportingFiles/RiotShareExtension.entitlements
-        ENABLE_BITCODE: NO
-        FRAMEWORK_SEARCH_PATHS: $(inherited)
-        GCC_PREPROCESSOR_DEFINITIONS: $(inherited) IS_SHARE_EXTENSION=1
-        HEADER_SEARCH_PATHS: $(inherited)
-        INFOPLIST_FILE: RiotShareExtension/SupportingFiles/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-        LIBRARY_SEARCH_PATHS: $(inherited)
-        OTHER_CFLAGS: $(inherited)
-        OTHER_LDFLAGS: $(inherited)
-        OTHER_SWIFT_FLAGS: $(inherited)
-        PRODUCT_NAME: RiotShareExtension
-        SKIP_INSTALL: YES
-        SWIFT_OBJC_BRIDGING_HEADER: $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotShareExtension-Bridging-Header.h
-        USER_HEADER_SEARCH_PATHS: $(inherited)
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).shareExtension
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          DEBUG_INFORMATION_FORMAT: dwarf
-          PROVISIONING_PROFILE_SPECIFIER: ""
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
-          PROVISIONING_PROFILE: $(SHARE_EXTENSION_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
-
-    postbuildScripts:
-    - name: Embed Precompiled Frameworks
-      runOnlyWhenInstalling: false
-      script: echo "Skipping, nothing to be embedded."
-      shell: /bin/sh
-
-    sources:
-    - path: ../RiotShareExtension
-    - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
-    - path: ../Riot/Categories/Bundle.swift
-    - path: ../Riot/Managers/Theme/Themes/DefaultTheme.swift
-    - path: ../Riot/Managers/Theme/ThemeService.m
-    - path: ../Riot/Utils/AvatarGenerator.m
-    - path: ../Riot/Generated/InfoPlist.swift
-    - path: ../Config/BuildSettings.swift
-    - path: ../Riot/Categories/Character.swift
-    - path: ../Riot/Managers/Theme/Themes/BlackTheme.swift
-    - path: ../Riot/Categories/MXRoom+Riot.m
-    - path: ../Config/Configurable.swift
-    - path: ../Config/CommonConfiguration.swift
-    - path: ../Riot/Utils/UserNameColorGenerator.swift
-    - path: ../Riot/Categories/MXRoomSummary+Riot.m
-    - path: ../Riot/Managers/Theme/Theme.swift
-    - path: ../Riot/Managers/Settings/RiotSettings.swift
-    - path: ../Riot/Categories/UIColor.swift
-    - path: ../Riot/Managers/Theme/Themes/DarkTheme.swift
-    - path: ../Riot/Categories/UISearchBar.swift
-    - path: ../Riot/Categories/String.swift
-    - path: ../Riot/Modules/Common/Recents/CellData/RecentCellData.m
-    - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.xib
-      buildPhase: resources
-    - path: ../Riot/Assets/en.lproj/Vector.strings
-      buildPhase: resources
-    - path: ../Riot/Assets/SharedImages.xcassets
-      buildPhase: resources

Targets/SiriIntents.yml

@@ -1,91 +0,0 @@
-name: SiriIntents
-
-schemes:
-  SiriIntents:
-    analyze:
-      config: Debug
-    archive:
-      config: Release
-    build:
-      targets:
-        SiriIntents:
-        - running
-        - testing
-        - profiling
-        - analyzing
-        - archiving
-    profile:
-      config: Release
-    run:
-      askForAppToLaunch: true
-      config: Debug
-      debugEnabled: false
-      disableMainThreadChecker: true
-      launchAutomaticallySubstyle: 2
-    test:
-      config: Debug
-      disableMainThreadChecker: true
-
-targets:
-  SiriIntents:
-    platform: iOS
-    type: app-extension
-
-    dependencies:
-    - sdk: Intents.framework
-
-    configFiles:
-      Debug: ../SiriIntents/SiriIntents-Debug.xcconfig
-      Release: ../SiriIntents/SiriIntents-Release.xcconfig
-
-    settings:
-      groups:
-        - appDefault
-      base:
-        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: $(inherited)
-        CLANG_ANALYZER_NONNULL: YES
-        CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION: YES_AGGRESSIVE
-        CLANG_WARN_DOCUMENTATION_COMMENTS: YES
-        CODE_SIGN_ENTITLEMENTS: SiriIntents/SiriIntents.entitlements
-        ENABLE_BITCODE: NO
-        FRAMEWORK_SEARCH_PATHS: $(inherited)
-        GCC_PREPROCESSOR_DEFINITIONS: $(inherited)
-        HEADER_SEARCH_PATHS: $(inherited)
-        INFOPLIST_FILE: SiriIntents/Info.plist
-        LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-        LIBRARY_SEARCH_PATHS: $(inherited)
-        OTHER_CFLAGS: $(inherited)
-        OTHER_LDFLAGS: $(inherited)
-        OTHER_SWIFT_FLAGS: $(inherited)
-        PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).SiriIntents
-        PRODUCT_NAME: SiriIntents
-        SKIP_INSTALL: YES
-        USER_HEADER_SEARCH_PATHS: $(inherited)
-      configs:
-        Debug:
-          CODE_SIGN_IDENTITY: iPhone Developer
-          CODE_SIGN_STYLE: Automatic
-          DEBUG_INFORMATION_FORMAT: dwarf
-          PROVISIONING_PROFILE_SPECIFIER: ""
-        Release:
-          CODE_SIGN_IDENTITY: iPhone Distribution
-          CODE_SIGN_STYLE: Manual
-          COPY_PHASE_STRIP: NO
-          DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
-          PROVISIONING_PROFILE: $(SIRI_INTENTS_PROVISIONING_PROFILE)
-          PROVISIONING_PROFILE_SPECIFIER: $(SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER)
-
-    postbuildScripts:
-    - name: Embed Precompiled Frameworks
-      runOnlyWhenInstalling: false
-      script: echo "Skipping, nothing to be embedded."
-      shell: /bin/sh
-
-    sources:
-    - path: ../SiriIntents
-    - path: ../Riot/Generated/InfoPlist.swift
-    - path: ../Riot/Categories/Bundle.swift
-    - path: ../Config/CommonConfiguration.swift
-    - path: ../Config/BuildSettings.swift
-    - path: ../Config/Configurable.swift
-    - path: ../Riot/Managers/Settings/RiotSettings.swift

project.yml

@@ -1,94 +1,21 @@
+name: Riot
 attributes:
   ORGANIZATIONNAME: matrix.org
+
 configs:
   Debug: debug
   Release: release
-name: Riot
-settingGroups:
-  appDefault:
-    CURRENT_PROJECT_VERSION: 20200826151407
-    SWIFT_VERSION: 5.3.1
-    BUNDLE_DISPLAY_NAME: Element
-    APPLICATION_GROUP_IDENTIFIER: group.im.vector
-    BASE_BUNDLE_IDENTIFIER: im.vector.app
-    KEYCHAIN_ACCESS_GROUP: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared
-    LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-    DEVELOPMENT_TEAM: 7J4U792NQT
 
-    RIOT_PROVISIONING_PROFILE: f65e7447-b8a3-46cc-8fba-fa60e55e2511
-    RIOT_PROVISIONING_PROFILE_SPECIFIER: Vector App Store
-    NSE_PROVISIONING_PROFILE: 31dc9316-e029-47fd-81f5-778db07d76a2
-    NSE_PROVISIONING_PROFILE_SPECIFIER: "Vector NSE: App Store"
-    SHARE_EXTENSION_PROVISIONING_PROFILE: 1a3be143-50c7-4ae2-834e-00596a053141
-    SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER: "Vector Share Extension: App Store"
-    SIRI_INTENTS_PROVISIONING_PROFILE: 18a66f93-ffe1-4008-b343-58350cc65023
-    SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER: "Vector Siri Intents: App Store"
 fileGroups:
     - README.md
     - CHANGES.rst
     - AUTHORS.rst
     - Podfile
-settings:
-  base:
-    IPHONEOS_DEPLOYMENT_TARGET: 11.0
-    MARKETING_VERSION: 1.1.3
-    CURRENT_PROJECT_VERSION: 1.1.3
-    SDKROOT: iphoneos
-    TARGETED_DEVICE_FAMILY: 1,2
-    ALWAYS_SEARCH_USER_PATHS: NO
-    CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: YES
-    CLANG_CXX_LANGUAGE_STANDARD: gnu++0x
-    CLANG_CXX_LIBRARY: libc++
-    CLANG_ENABLE_MODULES: YES
-    CLANG_ENABLE_OBJC_ARC: YES
-    CLANG_WARN__DUPLICATE_METHOD_MATCH: YES
-    CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING: YES
-    CLANG_WARN_BOOL_CONVERSION: YES
-    CLANG_WARN_COMMA: YES
-    CLANG_WARN_CONSTANT_CONVERSION: YES
-    CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS: YES
-    CLANG_WARN_DIRECT_OBJC_ISA_USAGE: YES_ERROR
-    CLANG_WARN_EMPTY_BODY: YES
-    CLANG_WARN_ENUM_CONVERSION: YES
-    CLANG_WARN_INFINITE_RECURSION: YES
-    CLANG_WARN_INT_CONVERSION: YES
-    CLANG_WARN_NON_LITERAL_NULL_CONVERSION: YES
-    CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF: YES
-    CLANG_WARN_OBJC_LITERAL_CONVERSION: YES
-    CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR
-    CLANG_WARN_RANGE_LOOP_ANALYSIS: YES
-    CLANG_WARN_STRICT_PROTOTYPES: YES
-    CLANG_WARN_SUSPICIOUS_MOVE: YES
-    CLANG_WARN_UNREACHABLE_CODE: YES
-    DEFINES_MODULE: YES
-    ENABLE_STRICT_OBJC_MSGSEND: YES
-    GCC_C_LANGUAGE_STANDARD: gnu99
-    GCC_NO_COMMON_BLOCKS: YES
-    GCC_WARN_64_TO_32_BIT_CONVERSION: YES
-    GCC_WARN_ABOUT_RETURN_TYPE: YES_ERROR
-    GCC_WARN_UNDECLARED_SELECTOR: YES
-    GCC_WARN_UNINITIALIZED_AUTOS: YES_AGGRESSIVE
-    GCC_WARN_UNUSED_FUNCTION: YES
-    GCC_WARN_UNUSED_VARIABLE: YES
-  debug:
-    CODE_SIGN_IDENTITY: iPhone Developer
-    CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer
-    COPY_PHASE_STRIP: NO
-    ENABLE_TESTABILITY: YES
-    GCC_DYNAMIC_NO_PIC: NO
-    GCC_OPTIMIZATION_LEVEL: 0
-    GCC_PREPROCESSOR_DEFINITIONS: DEBUG=1 $(inherited)
-    GCC_SYMBOLS_PRIVATE_EXTERN: NO
-    MTL_ENABLE_DEBUG_INFO: YES
-    ONLY_ACTIVE_ARCH: YES
-  release:
-    CODE_SIGN_IDENTITY: iPhone Distribution
-    CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Distribution
-    COPY_PHASE_STRIP: YES
-    ENABLE_NS_ASSERTIONS: NO
-    MTL_ENABLE_DEBUG_INFO: NO
-    SWIFT_COMPILATION_MODE: wholemodule
-    VALIDATE_PRODUCT: YES
+
+configFiles:
+  Debug: Config/Project-Debug.xcconfig
+  Release: Config/Project-Release.xcconfig
+
 options:
   defaultConfig: Release
   groupSortPosition: bottom
@@ -96,9 +23,10 @@ options:
   createIntermediateGroups: true
   useBaseInternationalization: true
   postGenCommand: sh Tools/XcodeGen/postGenCommand.sh
+
 include:
-  - path: Targets/Application.yml
-  - path: Targets/ApplicationTests.yml
-  - path: Targets/ShareExtension.yml
-  - path: Targets/SiriIntents.yml
-  - path: Targets/NotificationServiceExtension.yml
+  - path: Riot/target.yml
+  - path: RiotTests/target.yml
+  - path: RiotShareExtension/target.yml
+  - path: SiriIntents/target.yml
+  - path: RiotNSE/target.yml