From f49b025569275d57ec4c477f81f397af98dc9a57 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 11 Feb 2021 09:06:38 +0100 Subject: [PATCH] XcodeGen: Use same names for yml and xcconfig files in every target --- .../App-Common.xcconfig => Common.xcconfig} | 0 .../App-Debug.xcconfig => Debug.xcconfig} | 2 +- .../App-Release.xcconfig => Release.xcconfig} | 2 +- Riot/{Application.yml => target.yml} | 4 ++-- RiotNSE/{NSE-Common.xcconfig => Common.xcconfig} | 0 RiotNSE/{NSE-Debug.xcconfig => Debug.xcconfig} | 2 +- RiotNSE/{NSE-Release.xcconfig => Release.xcconfig} | 2 +- .../{NotificationServiceExtension.yml => target.yml} | 4 ++-- .../ShareExtension-Common.xcconfig => Common.xcconfig} | 0 .../ShareExtension-Debug.xcconfig => Debug.xcconfig} | 2 +- ...hareExtension-Release.xcconfig => Release.xcconfig} | 2 +- RiotShareExtension/{ShareExtension.yml => target.yml} | 4 ++-- RiotTests/{ApplicationTests.yml => target.yml} | 0 .../{SiriIntents-Common.xcconfig => Common.xcconfig} | 0 .../{SiriIntents-Debug.xcconfig => Debug.xcconfig} | 2 +- .../{SiriIntents-Release.xcconfig => Release.xcconfig} | 2 +- SiriIntents/{SiriIntents.yml => target.yml} | 4 ++-- project.yml | 10 +++++----- 18 files changed, 21 insertions(+), 21 deletions(-) rename Riot/{SupportingFiles/App-Common.xcconfig => Common.xcconfig} (100%) rename Riot/{SupportingFiles/App-Debug.xcconfig => Debug.xcconfig} (96%) rename Riot/{SupportingFiles/App-Release.xcconfig => Release.xcconfig} (96%) rename Riot/{Application.yml => target.yml} (97%) rename RiotNSE/{NSE-Common.xcconfig => Common.xcconfig} (100%) rename RiotNSE/{NSE-Debug.xcconfig => Debug.xcconfig} (96%) rename RiotNSE/{NSE-Release.xcconfig => Release.xcconfig} (96%) rename RiotNSE/{NotificationServiceExtension.yml => target.yml} (96%) rename RiotShareExtension/{SupportingFiles/ShareExtension-Common.xcconfig => Common.xcconfig} (100%) rename RiotShareExtension/{SupportingFiles/ShareExtension-Debug.xcconfig => Debug.xcconfig} (95%) rename RiotShareExtension/{SupportingFiles/ShareExtension-Release.xcconfig => Release.xcconfig} (96%) rename RiotShareExtension/{ShareExtension.yml => target.yml} (94%) rename RiotTests/{ApplicationTests.yml => target.yml} (100%) rename SiriIntents/{SiriIntents-Common.xcconfig => Common.xcconfig} (100%) rename SiriIntents/{SiriIntents-Debug.xcconfig => Debug.xcconfig} (95%) rename SiriIntents/{SiriIntents-Release.xcconfig => Release.xcconfig} (96%) rename SiriIntents/{SiriIntents.yml => target.yml} (93%) diff --git a/Riot/SupportingFiles/App-Common.xcconfig b/Riot/Common.xcconfig similarity index 100% rename from Riot/SupportingFiles/App-Common.xcconfig rename to Riot/Common.xcconfig diff --git a/Riot/SupportingFiles/App-Debug.xcconfig b/Riot/Debug.xcconfig similarity index 96% rename from Riot/SupportingFiles/App-Debug.xcconfig rename to Riot/Debug.xcconfig index 59aa4f856..247b53040 100644 --- a/Riot/SupportingFiles/App-Debug.xcconfig +++ b/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" diff --git a/Riot/SupportingFiles/App-Release.xcconfig b/Riot/Release.xcconfig similarity index 96% rename from Riot/SupportingFiles/App-Release.xcconfig rename to Riot/Release.xcconfig index d6e460093..530cdc1f4 100644 --- a/Riot/SupportingFiles/App-Release.xcconfig +++ b/Riot/Release.xcconfig @@ -17,7 +17,7 @@ // 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) diff --git a/Riot/Application.yml b/Riot/target.yml similarity index 97% rename from Riot/Application.yml rename to Riot/target.yml index a17389cf9..14ba689f3 100644 --- a/Riot/Application.yml +++ b/Riot/target.yml @@ -36,8 +36,8 @@ targets: - target: RiotNSE configFiles: - Debug: SupportingFiles/App-Debug.xcconfig - Release: SupportingFiles/App-Release.xcconfig + Debug: Debug.xcconfig + Release: Release.xcconfig preBuildScripts: - name: ⚠️ SwiftLint diff --git a/RiotNSE/NSE-Common.xcconfig b/RiotNSE/Common.xcconfig similarity index 100% rename from RiotNSE/NSE-Common.xcconfig rename to RiotNSE/Common.xcconfig diff --git a/RiotNSE/NSE-Debug.xcconfig b/RiotNSE/Debug.xcconfig similarity index 96% rename from RiotNSE/NSE-Debug.xcconfig rename to RiotNSE/Debug.xcconfig index ed107513c..14c7cfc66 100644 --- a/RiotNSE/NSE-Debug.xcconfig +++ b/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" diff --git a/RiotNSE/NSE-Release.xcconfig b/RiotNSE/Release.xcconfig similarity index 96% rename from RiotNSE/NSE-Release.xcconfig rename to RiotNSE/Release.xcconfig index 4034dd2fe..c91ad51e1 100644 --- a/RiotNSE/NSE-Release.xcconfig +++ b/RiotNSE/Release.xcconfig @@ -17,7 +17,7 @@ // 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) diff --git a/RiotNSE/NotificationServiceExtension.yml b/RiotNSE/target.yml similarity index 96% rename from RiotNSE/NotificationServiceExtension.yml rename to RiotNSE/target.yml index a5dd014a3..4e3c80a19 100644 --- a/RiotNSE/NotificationServiceExtension.yml +++ b/RiotNSE/target.yml @@ -32,8 +32,8 @@ targets: type: app-extension configFiles: - Debug: NSE-Debug.xcconfig - Release: NSE-Release.xcconfig + Debug: Debug.xcconfig + Release: Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig b/RiotShareExtension/Common.xcconfig similarity index 100% rename from RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig rename to RiotShareExtension/Common.xcconfig diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig b/RiotShareExtension/Debug.xcconfig similarity index 95% rename from RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig rename to RiotShareExtension/Debug.xcconfig index 9a6a0132c..4a040e84e 100644 --- a/RiotShareExtension/SupportingFiles/ShareExtension-Debug.xcconfig +++ b/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" diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig b/RiotShareExtension/Release.xcconfig similarity index 96% rename from RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig rename to RiotShareExtension/Release.xcconfig index 8b820f9f4..272f9f37b 100644 --- a/RiotShareExtension/SupportingFiles/ShareExtension-Release.xcconfig +++ b/RiotShareExtension/Release.xcconfig @@ -17,7 +17,7 @@ // 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) diff --git a/RiotShareExtension/ShareExtension.yml b/RiotShareExtension/target.yml similarity index 94% rename from RiotShareExtension/ShareExtension.yml rename to RiotShareExtension/target.yml index 4806d8ac6..89cbd224f 100644 --- a/RiotShareExtension/ShareExtension.yml +++ b/RiotShareExtension/target.yml @@ -32,8 +32,8 @@ targets: type: app-extension configFiles: - Debug: SupportingFiles/ShareExtension-Debug.xcconfig - Release: SupportingFiles/ShareExtension-Release.xcconfig + Debug: Debug.xcconfig + Release: Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks diff --git a/RiotTests/ApplicationTests.yml b/RiotTests/target.yml similarity index 100% rename from RiotTests/ApplicationTests.yml rename to RiotTests/target.yml diff --git a/SiriIntents/SiriIntents-Common.xcconfig b/SiriIntents/Common.xcconfig similarity index 100% rename from SiriIntents/SiriIntents-Common.xcconfig rename to SiriIntents/Common.xcconfig diff --git a/SiriIntents/SiriIntents-Debug.xcconfig b/SiriIntents/Debug.xcconfig similarity index 95% rename from SiriIntents/SiriIntents-Debug.xcconfig rename to SiriIntents/Debug.xcconfig index d0c6ee7b2..b57cb9502 100644 --- a/SiriIntents/SiriIntents-Debug.xcconfig +++ b/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" diff --git a/SiriIntents/SiriIntents-Release.xcconfig b/SiriIntents/Release.xcconfig similarity index 96% rename from SiriIntents/SiriIntents-Release.xcconfig rename to SiriIntents/Release.xcconfig index ab0ee4edf..c0a6c2ffc 100644 --- a/SiriIntents/SiriIntents-Release.xcconfig +++ b/SiriIntents/Release.xcconfig @@ -17,7 +17,7 @@ // 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) diff --git a/SiriIntents/SiriIntents.yml b/SiriIntents/target.yml similarity index 93% rename from SiriIntents/SiriIntents.yml rename to SiriIntents/target.yml index ade3d2a94..c2b455b3b 100644 --- a/SiriIntents/SiriIntents.yml +++ b/SiriIntents/target.yml @@ -35,8 +35,8 @@ targets: - sdk: Intents.framework configFiles: - Debug: SiriIntents-Debug.xcconfig - Release: SiriIntents-Release.xcconfig + Debug: Debug.xcconfig + Release: Release.xcconfig postbuildScripts: - name: Embed Precompiled Frameworks diff --git a/project.yml b/project.yml index 2e86c07d4..4795a133b 100644 --- a/project.yml +++ b/project.yml @@ -25,8 +25,8 @@ options: postGenCommand: sh Tools/XcodeGen/postGenCommand.sh include: - - 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 + - path: Riot/target.yml + - path: RiotTests/target.yml + - path: RiotShareExtension/target.yml + - path: SiriIntents/target.yml + - path: RiotNSE/target.yml \ No newline at end of file