Skip to content

Commit 166a59c

Browse files
TAKeaniceTAKeanice
committed
revert intents extension back to group
to fix duplicate build task, localizations and shortcuts integration Signed-off-by: Tassilo Karge <tassilo.karge@web.de>
1 parent 22bfdb6 commit 166a59c

2 files changed

Lines changed: 85 additions & 15 deletions

File tree

‎openHAB.xcodeproj/project.pbxproj‎

Lines changed: 85 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
2F21508A2F75C2FC001BA057 /* GetItemStateIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150732F75C2FC001BA057 /* GetItemStateIntentHandler.swift */; };
11+
2F21508B2F75C2FC001BA057 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150752F75C2FC001BA057 /* IntentHandler.swift */; };
12+
2F21508D2F75C2FC001BA057 /* OpenHABIntentHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150812F75C2FC001BA057 /* OpenHABIntentHelper.swift */; };
13+
2F21508E2F75C2FC001BA057 /* SetColorValueIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150832F75C2FC001BA057 /* SetColorValueIntentHandler.swift */; };
14+
2F21508F2F75C2FC001BA057 /* SetContactStateValueIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150842F75C2FC001BA057 /* SetContactStateValueIntentHandler.swift */; };
15+
2F2150902F75C2FC001BA057 /* SetDimmerRollerValueIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150852F75C2FC001BA057 /* SetDimmerRollerValueIntentHandler.swift */; };
16+
2F2150912F75C2FC001BA057 /* SetNumberValueIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150862F75C2FC001BA057 /* SetNumberValueIntentHandler.swift */; };
17+
2F2150922F75C2FC001BA057 /* SetStringValueIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150872F75C2FC001BA057 /* SetStringValueIntentHandler.swift */; };
18+
2F2150932F75C2FC001BA057 /* SetSwitchStateIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150882F75C2FC001BA057 /* SetSwitchStateIntentHandler.swift */; };
19+
2F2150982F75C306001BA057 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 2F2150972F75C306001BA057 /* Intents.intentdefinition */; };
20+
2F2150A22F75C434001BA057 /* Intents.intentdefinition in Resources */ = {isa = PBXBuildFile; fileRef = 2F2150972F75C306001BA057 /* Intents.intentdefinition */; };
1021
2F399AC92F54599400F72A30 /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = 2F399AC82F54599400F72A30 /* Flow */; };
11-
DAC131122DA32F5D00075AE2 /* Intents.intentdefinition in Resources */ = {isa = PBXBuildFile; fileRef = 935D340A257B7DC00020A404 /* Intents.intentdefinition */; };
1222
4D6470DA2561F935007B03FC /* openHABIntents.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4D6470D32561F935007B03FC /* openHABIntents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
1323
6557AF8F2C0241C10094D0C8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6557AF8E2C0241C10094D0C8 /* PrivacyInfo.xcprivacy */; };
1424
6557AF902C0241C10094D0C8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6557AF8E2C0241C10094D0C8 /* PrivacyInfo.xcprivacy */; };
@@ -157,11 +167,32 @@
157167
/* End PBXCopyFilesBuildPhase section */
158168

159169
/* Begin PBXFileReference section */
170+
2F2150732F75C2FC001BA057 /* GetItemStateIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetItemStateIntentHandler.swift; sourceTree = "<group>"; };
171+
2F2150742F75C2FC001BA057 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
172+
2F2150752F75C2FC001BA057 /* IntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentHandler.swift; sourceTree = "<group>"; };
173+
2F2150812F75C2FC001BA057 /* OpenHABIntentHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenHABIntentHelper.swift; sourceTree = "<group>"; };
174+
2F2150822F75C2FC001BA057 /* openHABIntents.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = openHABIntents.entitlements; sourceTree = "<group>"; };
175+
2F2150832F75C2FC001BA057 /* SetColorValueIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetColorValueIntentHandler.swift; sourceTree = "<group>"; };
176+
2F2150842F75C2FC001BA057 /* SetContactStateValueIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetContactStateValueIntentHandler.swift; sourceTree = "<group>"; };
177+
2F2150852F75C2FC001BA057 /* SetDimmerRollerValueIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDimmerRollerValueIntentHandler.swift; sourceTree = "<group>"; };
178+
2F2150862F75C2FC001BA057 /* SetNumberValueIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNumberValueIntentHandler.swift; sourceTree = "<group>"; };
179+
2F2150872F75C2FC001BA057 /* SetStringValueIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetStringValueIntentHandler.swift; sourceTree = "<group>"; };
180+
2F2150882F75C2FC001BA057 /* SetSwitchStateIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetSwitchStateIntentHandler.swift; sourceTree = "<group>"; };
181+
2F2150962F75C306001BA057 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = "<group>"; };
182+
2F2150992F75C325001BA057 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intents.strings; sourceTree = "<group>"; };
183+
2F21509A2F75C327001BA057 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Intents.strings; sourceTree = "<group>"; };
184+
2F21509B2F75C329001BA057 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Intents.strings; sourceTree = "<group>"; };
185+
2F21509C2F75C32B001BA057 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Intents.strings; sourceTree = "<group>"; };
186+
2F21509D2F75C32D001BA057 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Intents.strings; sourceTree = "<group>"; };
187+
2F21509E2F75C32F001BA057 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Intents.strings; sourceTree = "<group>"; };
188+
2F21509F2F75C331001BA057 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Intents.strings; sourceTree = "<group>"; };
189+
2F2150A02F75C333001BA057 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Intents.strings; sourceTree = "<group>"; };
190+
2F2150A12F75C335001BA057 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Intents.strings; sourceTree = "<group>"; };
160191
4D6470D32561F935007B03FC /* openHABIntents.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = openHABIntents.appex; sourceTree = BUILT_PRODUCTS_DIR; };
161-
935D340A257B7DC00020A404 /* Intents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = "Intents.intentdefinition"; path = "openHABIntents/Intents.intentdefinition"; sourceTree = SOURCE_ROOT; };
162192
6557AF8E2C0241C10094D0C8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
163193
6571444E2C1E438700C8A1F3 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
164194
933D7F0422E7015000621A03 /* openHABUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = openHABUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
195+
935D340A257B7DC00020A404 /* Intents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Intents.intentdefinition; path = openHABIntents/Intents.intentdefinition; sourceTree = SOURCE_ROOT; };
165196
DA0775152346705D0086C685 /* openHABWatch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = openHABWatch.app; sourceTree = BUILT_PRODUCTS_DIR; };
166197
DA0DA9E12E0C9B74000C5D0A /* BuildTools */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = BuildTools; sourceTree = "<group>"; };
167198
DA28C361225241DE00AB409C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
@@ -191,13 +222,6 @@
191222
);
192223
target = 6571444D2C1E438700C8A1F3 /* NotificationService */;
193224
};
194-
2FD4E2072F66EF5800EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
195-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
196-
membershipExceptions = (
197-
Info.plist,
198-
);
199-
target = 4D6470D22561F935007B03FC /* openHABIntents */;
200-
};
201225
2FD4E2CA2F66F9A500EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
202226
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
203227
membershipExceptions = (
@@ -259,7 +283,6 @@
259283
2FD4E1E62F66EF4800EBB340 /* NotificationService */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (2FD4E1E82F66EF4800EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = NotificationService; sourceTree = "<group>"; };
260284
2FD4E1EB2F66EF4F00EBB340 /* openHABWatchSwiftUI Watch AppUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "openHABWatchSwiftUI Watch AppUITests"; sourceTree = "<group>"; };
261285
2FD4E1EF2F66EF5500EBB340 /* openHABIntentsTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = openHABIntentsTests; sourceTree = "<group>"; };
262-
2FD4E1FC2F66EF5800EBB340 /* openHABIntents */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (2FD4E2072F66EF5800EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = openHABIntents; sourceTree = "<group>"; };
263286
2FD4E29C2F66F9A500EBB340 /* openHABWatch */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (2FD4E2CA2F66F9A500EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = openHABWatch; sourceTree = "<group>"; };
264287
2FD4E2CD2F66F9F600EBB340 /* openHABUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (2FD4E2CF2F66F9F700EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = openHABUITests; sourceTree = "<group>"; };
265288
2FD4E2E02F66F9FE00EBB340 /* openHABTestsSwift */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (2FD4E2F02F66F9FE00EBB340 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = openHABTestsSwift; sourceTree = "<group>"; };
@@ -369,9 +392,29 @@
369392
/* End PBXFrameworksBuildPhase section */
370393

371394
/* Begin PBXGroup section */
395+
2F2150892F75C2FC001BA057 /* openHABIntents */ = {
396+
isa = PBXGroup;
397+
children = (
398+
2F2150732F75C2FC001BA057 /* GetItemStateIntentHandler.swift */,
399+
2F2150742F75C2FC001BA057 /* Info.plist */,
400+
2F2150752F75C2FC001BA057 /* IntentHandler.swift */,
401+
2F2150972F75C306001BA057 /* Intents.intentdefinition */,
402+
2F2150812F75C2FC001BA057 /* OpenHABIntentHelper.swift */,
403+
2F2150822F75C2FC001BA057 /* openHABIntents.entitlements */,
404+
2F2150832F75C2FC001BA057 /* SetColorValueIntentHandler.swift */,
405+
2F2150842F75C2FC001BA057 /* SetContactStateValueIntentHandler.swift */,
406+
2F2150852F75C2FC001BA057 /* SetDimmerRollerValueIntentHandler.swift */,
407+
2F2150862F75C2FC001BA057 /* SetNumberValueIntentHandler.swift */,
408+
2F2150872F75C2FC001BA057 /* SetStringValueIntentHandler.swift */,
409+
2F2150882F75C2FC001BA057 /* SetSwitchStateIntentHandler.swift */,
410+
);
411+
path = openHABIntents;
412+
sourceTree = "<group>";
413+
};
372414
2FD4E92D2F67571C00EBB340 /* Recovered References */ = {
373415
isa = PBXGroup;
374416
children = (
417+
935D340A257B7DC00020A404 /* Intents.intentdefinition */,
375418
);
376419
name = "Recovered References";
377420
sourceTree = "<group>";
@@ -389,11 +432,11 @@
389432
2FD4E2E02F66F9FE00EBB340 /* openHABTestsSwift */,
390433
2FD4E2CD2F66F9F600EBB340 /* openHABUITests */,
391434
2FD4E29C2F66F9A500EBB340 /* openHABWatch */,
392-
2FD4E1FC2F66EF5800EBB340 /* openHABIntents */,
393435
2FD4E1EF2F66EF5500EBB340 /* openHABIntentsTests */,
394436
2FD4E1EB2F66EF4F00EBB340 /* openHABWatchSwiftUI Watch AppUITests */,
395437
2FD4E1E62F66EF4800EBB340 /* NotificationService */,
396438
DA8B15522F3BB74B007753FD /* openHABWatchTests */,
439+
2F2150892F75C2FC001BA057 /* openHABIntents */,
397440
DFB2622818830A3600D3244D /* Products */,
398441
DFB2622918830A3600D3244D /* Frameworks */,
399442
2FD4E1E22F66EF0200EBB340 /* fastlane */,
@@ -448,9 +491,6 @@
448491
);
449492
dependencies = (
450493
);
451-
fileSystemSynchronizedGroups = (
452-
2FD4E1FC2F66EF5800EBB340 /* openHABIntents */,
453-
);
454494
name = openHABIntents;
455495
packageProductDependencies = (
456496
937E4491270B37FE00A98C26 /* Kingfisher */,
@@ -824,7 +864,7 @@
824864
isa = PBXResourcesBuildPhase;
825865
buildActionMask = 2147483647;
826866
files = (
827-
DAC131122DA32F5D00075AE2 /* Intents.intentdefinition in Resources */,
867+
2F2150A22F75C434001BA057 /* Intents.intentdefinition in Resources */,
828868
6557AF8F2C0241C10094D0C8 /* PrivacyInfo.xcprivacy in Resources */,
829869
DA817E7A234BF39B00C91824 /* CHANGELOG.md in Resources */,
830870
DA4D4DB5233F9ACB00B37E37 /* README.md in Resources */,
@@ -860,6 +900,16 @@
860900
isa = PBXSourcesBuildPhase;
861901
buildActionMask = 2147483647;
862902
files = (
903+
2F21508A2F75C2FC001BA057 /* GetItemStateIntentHandler.swift in Sources */,
904+
2F21508B2F75C2FC001BA057 /* IntentHandler.swift in Sources */,
905+
2F2150982F75C306001BA057 /* Intents.intentdefinition in Sources */,
906+
2F21508D2F75C2FC001BA057 /* OpenHABIntentHelper.swift in Sources */,
907+
2F21508E2F75C2FC001BA057 /* SetColorValueIntentHandler.swift in Sources */,
908+
2F21508F2F75C2FC001BA057 /* SetContactStateValueIntentHandler.swift in Sources */,
909+
2F2150902F75C2FC001BA057 /* SetDimmerRollerValueIntentHandler.swift in Sources */,
910+
2F2150912F75C2FC001BA057 /* SetNumberValueIntentHandler.swift in Sources */,
911+
2F2150922F75C2FC001BA057 /* SetStringValueIntentHandler.swift in Sources */,
912+
2F2150932F75C2FC001BA057 /* SetSwitchStateIntentHandler.swift in Sources */,
863913
);
864914
runOnlyForDeploymentPostprocessing = 0;
865915
};
@@ -964,6 +1014,26 @@
9641014
};
9651015
/* End PBXTargetDependency section */
9661016

1017+
/* Begin PBXVariantGroup section */
1018+
2F2150972F75C306001BA057 /* Intents.intentdefinition */ = {
1019+
isa = PBXVariantGroup;
1020+
children = (
1021+
2F2150962F75C306001BA057 /* Base */,
1022+
2F2150992F75C325001BA057 /* en */,
1023+
2F21509A2F75C327001BA057 /* nl */,
1024+
2F21509B2F75C329001BA057 /* fi */,
1025+
2F21509C2F75C32B001BA057 /* fr */,
1026+
2F21509D2F75C32D001BA057 /* de */,
1027+
2F21509E2F75C32F001BA057 /* it */,
1028+
2F21509F2F75C331001BA057 /* nb */,
1029+
2F2150A02F75C333001BA057 /* ru */,
1030+
2F2150A12F75C335001BA057 /* es */,
1031+
);
1032+
name = Intents.intentdefinition;
1033+
sourceTree = "<group>";
1034+
};
1035+
/* End PBXVariantGroup section */
1036+
9671037
/* Begin XCBuildConfiguration section */
9681038
4D6470DC2561F935007B03FC /* Debug */ = {
9691039
isa = XCBuildConfiguration;

openHABIntents/Intents.intentdefinition renamed to openHABIntents/Base.lproj/Intents.intentdefinition

File renamed without changes.

0 commit comments

Comments
 (0)