From a47563ae2e2b18dc374c8a61b02b76f22f211e85 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 9 Feb 2021 19:29:17 +0100 Subject: [PATCH] XcodeGen: Move yml files into their sub folder --- Riot/Application.yml | 127 ++++++++++++++++++ .../NotificationServiceExtension.yml | 6 +- .../ShareExtension.yml | 6 +- {Targets => RiotTests}/ApplicationTests.yml | 6 +- {Targets => SiriIntents}/SiriIntents.yml | 6 +- Targets/Application.yml | 127 ------------------ project.yml | 10 +- 7 files changed, 144 insertions(+), 144 deletions(-) create mode 100644 Riot/Application.yml rename {Targets => RiotNSE}/NotificationServiceExtension.yml (94%) rename {Targets => RiotShareExtension}/ShareExtension.yml (91%) rename {Targets => RiotTests}/ApplicationTests.yml (90%) rename {Targets => SiriIntents}/SiriIntents.yml (88%) delete mode 100644 Targets/Application.yml diff --git a/Riot/Application.yml b/Riot/Application.yml new file mode 100644 index 000000000..a17389cf9 --- /dev/null +++ b/Riot/Application.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: SupportingFiles/App-Debug.xcconfig + Release: SupportingFiles/App-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 \ No newline at end of file diff --git a/Targets/NotificationServiceExtension.yml b/RiotNSE/NotificationServiceExtension.yml similarity index 94% rename from Targets/NotificationServiceExtension.yml rename to RiotNSE/NotificationServiceExtension.yml index 82d661520..a5dd014a3 100644 --- a/Targets/NotificationServiceExtension.yml +++ b/RiotNSE/NotificationServiceExtension.yml @@ -32,8 +32,8 @@ targets: type: app-extension configFiles: - Debug: ../RiotNSE/NSE-Debug.xcconfig - Release: ../RiotNSE/NSE-Release.xcconfig + Debug: NSE-Debug.xcconfig + Release: NSE-Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks @@ -42,7 +42,7 @@ targets: shell: /bin/sh sources: - - path: ../RiotNSE + - path: . - path: ../Riot/Managers/Settings/RiotSettings.swift - path: ../Config/BuildSettings.swift - path: ../Riot/Utils/DataProtectionHelper.swift diff --git a/Targets/ShareExtension.yml b/RiotShareExtension/ShareExtension.yml similarity index 91% rename from Targets/ShareExtension.yml rename to RiotShareExtension/ShareExtension.yml index e42ca41db..4806d8ac6 100644 --- a/Targets/ShareExtension.yml +++ b/RiotShareExtension/ShareExtension.yml @@ -32,8 +32,8 @@ targets: type: app-extension configFiles: - Debug: ../RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig - Release: ../RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig + Debug: SupportingFiles/ShareExtension-Debug.xcconfig + Release: SupportingFiles/ShareExtension-Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks @@ -42,7 +42,7 @@ targets: shell: /bin/sh sources: - - path: ../RiotShareExtension + - path: . - path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m - path: ../Riot/Categories/Bundle.swift - path: ../Riot/Managers/Theme/Themes/DefaultTheme.swift diff --git a/Targets/ApplicationTests.yml b/RiotTests/ApplicationTests.yml similarity index 90% rename from Targets/ApplicationTests.yml rename to RiotTests/ApplicationTests.yml index 259385708..bb456c5c1 100644 --- a/Targets/ApplicationTests.yml +++ b/RiotTests/ApplicationTests.yml @@ -37,11 +37,11 @@ targets: base: BUNDLE_LOADER: $(TEST_HOST) 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: @@ -55,4 +55,4 @@ targets: script: echo "Skipping, nothing to be embedded." shell: /bin/sh - sources: [../RiotTests] \ No newline at end of file + sources: . diff --git a/Targets/SiriIntents.yml b/SiriIntents/SiriIntents.yml similarity index 88% rename from Targets/SiriIntents.yml rename to SiriIntents/SiriIntents.yml index 343b6a60a..ade3d2a94 100644 --- a/Targets/SiriIntents.yml +++ b/SiriIntents/SiriIntents.yml @@ -35,8 +35,8 @@ targets: - sdk: Intents.framework configFiles: - Debug: ../SiriIntents/SiriIntents-Debug.xcconfig - Release: ../SiriIntents/SiriIntents-Release.xcconfig + Debug: SiriIntents-Debug.xcconfig + Release: SiriIntents-Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks @@ -45,7 +45,7 @@ targets: shell: /bin/sh sources: - - path: ../SiriIntents + - path: . - path: ../Riot/Generated/InfoPlist.swift - path: ../Riot/Categories/Bundle.swift - path: ../Config/CommonConfiguration.swift diff --git a/Targets/Application.yml b/Targets/Application.yml deleted file mode 100644 index 2bdb9b1b6..000000000 --- a/Targets/Application.yml +++ /dev/null @@ -1,127 +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 - - 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 - # Once a language has enough translations (>80%), it must be declared here - - 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 \ No newline at end of file diff --git a/project.yml b/project.yml index e620183be..c7beb963d 100644 --- a/project.yml +++ b/project.yml @@ -25,8 +25,8 @@ options: 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 \ No newline at end of file + - path: Riot/Application.yml + - path: RiotTests/ApplicationTests.yml + - path: RiotShareExtension/ShareExtension.yml + - path: SiriIntents/SiriIntents.yml + - path: RiotNSE/NotificationServiceExtension.yml \ No newline at end of file