From 2bc55ddabb648ae4f5eadac250642c2c7217a90f Mon Sep 17 00:00:00 2001 From: lukestahl Date: Sat, 20 Jan 2024 20:31:17 +0100 Subject: [PATCH] fix production build --- .../digitalbreak.xcodeproj/project.pbxproj | 296 +++++++++--------- apps/expo/targets/intents/DigitalBreak.swift | 12 +- .../target-plugin/src/withXcodeChanges.ts | 12 +- 3 files changed, 154 insertions(+), 166 deletions(-) diff --git a/apps/expo/ios/digitalbreak.xcodeproj/project.pbxproj b/apps/expo/ios/digitalbreak.xcodeproj/project.pbxproj index b5dc63e..dbb1fd6 100644 --- a/apps/expo/ios/digitalbreak.xcodeproj/project.pbxproj +++ b/apps/expo/ios/digitalbreak.xcodeproj/project.pbxproj @@ -7,75 +7,60 @@ objects = { /* Begin PBXBuildFile section */ - 028BF8C2E84C4B35AFD42517 /* default-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6E6B1D963FF4D6DB2D0BC87 /* default-Icon-60x60@2x.png */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 2048BB379AC04E2DA378F630 /* dark-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D4EAA837A1041FEB6F787F9 /* dark-Icon-60x60@2x.png */; }; + 1A6A24DD292B426993203022 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A76B760D3E49CB916624BD /* noop-file.swift */; }; + 2F01CBDDAAD84979926FDC5A /* AppIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87D8CAA30267422FBA98E0FE /* AppIntents.framework */; }; 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; }; - 70BFBFCC53D840D580243F88 /* DigitalBreak.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D310BA52EA043A0A2C485B9 /* DigitalBreak.swift */; }; - 7490DEE7E829424DA526D6D0 /* light-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 74E1587DDA4242CFA9DF81E1 /* light-Icon-60x60@2x.png */; }; - 8C8EF3FC9F68421D9B4A8226 /* default-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 87785A919DF84051A9ACBE20 /* default-Icon-60x60@3x.png */; }; - 905F2B37867542E8B4C3424C /* dark-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3816BB2871E547068A3E4479 /* dark-Icon-60x60@3x.png */; }; + 553E92229F2B42698C802F3A /* light-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 38D97FB002BD4B64906E74AD /* light-Icon-60x60@2x.png */; }; + 688260C896774EE6A7B11CDF /* light-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D35F4890D3B4CCD8E017746 /* light-Icon-60x60@3x.png */; }; + 7AE0C69B76914835B422942C /* dark-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CF83EEC6E1641ABAF29F97B /* dark-Icon-60x60@3x.png */; }; 96905EF65AED1B983A6B3ABC /* libPods-DigitalBreak.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-DigitalBreak.a */; }; - 9AFE3E1BF57F47BF9B79497A /* intents.appex in Embed ExtensionKit Extensions */ = {isa = PBXBuildFile; fileRef = 1C419F97FBBC4707ABD32764 /* intents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - A589A46834AA4CB08DC6702F /* AppIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6D093186638441792F941C3 /* AppIntents.framework */; }; + 9AD9DDB45E7943B2B9AA9DE0 /* DigitalBreak.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC1485575E941D5BAC37351 /* DigitalBreak.swift */; }; + A955ADA549C14B7290DEC800 /* OpenAppIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FAE41E014624BDE9CEAD0D9 /* OpenAppIntent.swift */; }; B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; - D3AA6B099CAF456CBDE1CE0A /* light-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 440491A824024E65ADEAD618 /* light-Icon-60x60@3x.png */; }; - D4B729BE8A574A4E955666F3 /* OpenAppIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9AE5BA3E964034803146F6 /* OpenAppIntent.swift */; }; - E4D97F39B7814828B6049CD7 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 839FEEECF8D24837BDCEA07C /* noop-file.swift */; }; + CD3318E8CB6D4706B0D707BA /* default-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D91C206697934C82A686CD95 /* default-Icon-60x60@2x.png */; }; + EEB83BD0480C4E9DAF8D3211 /* dark-Icon-60x60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FDC95E27D7D413782B579C8 /* dark-Icon-60x60@2x.png */; }; + FD37B615C5AE41DE9BAD9EF4 /* default-Icon-60x60@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DB4100AF1AD249D69CD921E2 /* default-Icon-60x60@3x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 2A97EEA711EC481F81934290 /* PBXContainerItemProxy */ = { + D3791C515DBF47BD95E522C5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; - remoteGlobalIDString = 5593744A6C1348C29DBD6DFF; + remoteGlobalIDString = 91803960A5744435B8C4A9D2; remoteInfo = intents; }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 7A9FA9B1E2C64F67A71F98CC /* Embed ExtensionKit Extensions */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "$(EXTENSIONS_FOLDER_PATH)"; - dstSubfolderSpec = 13; - files = ( - 9AFE3E1BF57F47BF9B79497A /* intents.appex in Embed ExtensionKit Extensions */, - ); - name = "Embed ExtensionKit Extensions"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ + 0C438284A1C34B3DA761CE69 /* intents.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.extensionkit-extension"; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = "wrapper.app-extension"; name = intents.appex; path = intents.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* DigitalBreak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = wrapper.application; name = DigitalBreak.app; path = DigitalBreak.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = DigitalBreak/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = DigitalBreak/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = DigitalBreak/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = Info.plist; path = DigitalBreak/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = DigitalBreak/main.m; sourceTree = ""; }; - 1C419F97FBBC4707ABD32764 /* intents.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.extensionkit-extension"; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = "wrapper.app-extension"; name = intents.appex; path = intents.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D310BA52EA043A0A2C485B9 /* DigitalBreak.swift */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = DigitalBreak.swift; path = DigitalBreak.swift; sourceTree = ""; }; - 3816BB2871E547068A3E4479 /* dark-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "dark-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/dark-Icon-60x60@3x.png"; sourceTree = ""; }; - 3D4EAA837A1041FEB6F787F9 /* dark-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "dark-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/dark-Icon-60x60@2x.png"; sourceTree = ""; }; - 440491A824024E65ADEAD618 /* light-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "light-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/light-Icon-60x60@3x.png"; sourceTree = ""; }; + 1FAE41E014624BDE9CEAD0D9 /* OpenAppIntent.swift */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = OpenAppIntent.swift; path = OpenAppIntent.swift; sourceTree = ""; }; + 1FDC95E27D7D413782B579C8 /* dark-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "dark-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/dark-Icon-60x60@2x.png"; sourceTree = ""; }; + 36221462784643C59B11D78A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = ""; }; + 38D97FB002BD4B64906E74AD /* light-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "light-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/light-Icon-60x60@2x.png"; sourceTree = ""; }; 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-DigitalBreak.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = archive.ar; name = "libPods-DigitalBreak.a"; path = "libPods-DigitalBreak.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6C2E3173556A471DD304B334 /* Pods-DigitalBreak.debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DigitalBreak.debug.xcconfig"; path = "Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak.debug.xcconfig"; sourceTree = ""; }; - 6ED81775937D49EFB0FB5E85 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = ""; }; - 74E1587DDA4242CFA9DF81E1 /* light-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "light-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/light-Icon-60x60@2x.png"; sourceTree = ""; }; + 6CF83EEC6E1641ABAF29F97B /* dark-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "dark-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/dark-Icon-60x60@3x.png"; sourceTree = ""; }; 7A4D352CD337FB3A3BF06240 /* Pods-DigitalBreak.release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DigitalBreak.release.xcconfig"; path = "Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak.release.xcconfig"; sourceTree = ""; }; - 7A9AE5BA3E964034803146F6 /* OpenAppIntent.swift */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = OpenAppIntent.swift; path = OpenAppIntent.swift; sourceTree = ""; }; - 839FEEECF8D24837BDCEA07C /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "DigitalBreak/noop-file.swift"; sourceTree = ""; }; - 87785A919DF84051A9ACBE20 /* default-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "default-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/default-Icon-60x60@3x.png"; sourceTree = ""; }; + 87D8CAA30267422FBA98E0FE /* AppIntents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; fileEncoding = 4; includeInIndex = undefined; lastKnownFileType = wrapper.framework; name = AppIntents.framework; path = System/Library/Frameworks/AppIntents.framework; sourceTree = SDKROOT; }; + 9D35F4890D3B4CCD8E017746 /* light-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "light-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/light-Icon-60x60@3x.png"; sourceTree = ""; }; + 9FC1485575E941D5BAC37351 /* DigitalBreak.swift */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = DigitalBreak.swift; path = DigitalBreak.swift; sourceTree = ""; }; AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = DigitalBreak/SplashScreen.storyboard; sourceTree = ""; }; - B6D093186638441792F941C3 /* AppIntents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; fileEncoding = 4; includeInIndex = undefined; lastKnownFileType = wrapper.framework; name = AppIntents.framework; path = System/Library/Frameworks/AppIntents.framework; sourceTree = SDKROOT; }; - B9C39F246EEF427A8B7AE37A /* DigitalBreak-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "DigitalBreak-Bridging-Header.h"; path = "DigitalBreak/DigitalBreak-Bridging-Header.h"; sourceTree = ""; }; + ACEB866215CF4ECA9D7719B9 /* DigitalBreak-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "DigitalBreak-Bridging-Header.h"; path = "DigitalBreak/DigitalBreak-Bridging-Header.h"; sourceTree = ""; }; BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = Expo.plist; path = Expo.plist; sourceTree = ""; }; - C6E6B1D963FF4D6DB2D0BC87 /* default-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "default-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/default-Icon-60x60@2x.png"; sourceTree = ""; }; + D0A76B760D3E49CB916624BD /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "DigitalBreak/noop-file.swift"; sourceTree = ""; }; + D91C206697934C82A686CD95 /* default-Icon-60x60@2x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "default-Icon-60x60@2x.png"; path = "DigitalBreak/DynamicAppIcons/default-Icon-60x60@2x.png"; sourceTree = ""; }; + DB4100AF1AD249D69CD921E2 /* default-Icon-60x60@3x.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "default-Icon-60x60@3x.png"; path = "DigitalBreak/DynamicAppIcons/default-Icon-60x60@3x.png"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = undefined; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-DigitalBreak/ExpoModulesProvider.swift"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -89,11 +74,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D54C839031AA4FA0B96AC277 /* Frameworks */ = { + 4D51B5452863430CB2210E41 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A589A46834AA4CB08DC6702F /* AppIntents.framework in Frameworks */, + 2F01CBDDAAD84979926FDC5A /* AppIntents.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,9 +95,9 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB71A68108700A75B9A /* main.m */, AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */, - 839FEEECF8D24837BDCEA07C /* noop-file.swift */, - B9C39F246EEF427A8B7AE37A /* DigitalBreak-Bridging-Header.h */, - E18A149C79DE4E888F9D6DCA /* DynamicAppIcons */, + D0A76B760D3E49CB916624BD /* noop-file.swift */, + ACEB866215CF4ECA9D7719B9 /* DigitalBreak-Bridging-Header.h */, + B781A0853AA140EDA80BB08D /* DynamicAppIcons */, ); name = DigitalBreak; sourceTree = ""; @@ -122,15 +107,15 @@ children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-DigitalBreak.a */, - B6D093186638441792F941C3 /* AppIntents.framework */, + 87D8CAA30267422FBA98E0FE /* AppIntents.framework */, ); name = Frameworks; sourceTree = ""; }; - 38FCF0C37C174D279D2D22AC /* expo:targets */ = { + 5A926CEA452D4099A901EA36 /* expo:targets */ = { isa = PBXGroup; children = ( - 950144B25A904555A903CDF5 /* intents */, + D9BBC0D20D3941CFAFBC2EDB /* intents */, ); name = "expo:targets"; sourceTree = ""; @@ -145,7 +130,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 38FCF0C37C174D279D2D22AC /* expo:targets */, + 5A926CEA452D4099A901EA36 /* expo:targets */, 13B07FAE1A68108700A75B9A /* DigitalBreak */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 83CBBA001A601CBA00E9B192 /* Products */, @@ -162,7 +147,7 @@ isa = PBXGroup; children = ( 13B07F961A680F5B00A75B9A /* DigitalBreak.app */, - 1C419F97FBBC4707ABD32764 /* intents.appex */, + 0C438284A1C34B3DA761CE69 /* intents.appex */, ); name = Products; sourceTree = ""; @@ -175,15 +160,18 @@ name = DigitalBreak; sourceTree = ""; }; - 950144B25A904555A903CDF5 /* intents */ = { + B781A0853AA140EDA80BB08D /* DynamicAppIcons */ = { isa = PBXGroup; children = ( - 2D310BA52EA043A0A2C485B9 /* DigitalBreak.swift */, - 7A9AE5BA3E964034803146F6 /* OpenAppIntent.swift */, - 6ED81775937D49EFB0FB5E85 /* Info.plist */, + D91C206697934C82A686CD95 /* default-Icon-60x60@2x.png */, + DB4100AF1AD249D69CD921E2 /* default-Icon-60x60@3x.png */, + 38D97FB002BD4B64906E74AD /* light-Icon-60x60@2x.png */, + 9D35F4890D3B4CCD8E017746 /* light-Icon-60x60@3x.png */, + 1FDC95E27D7D413782B579C8 /* dark-Icon-60x60@2x.png */, + 6CF83EEC6E1641ABAF29F97B /* dark-Icon-60x60@3x.png */, ); - name = intents; - path = ../targets/intents; + name = DynamicAppIcons; + path = ""; sourceTree = ""; }; BB2F792B24A3F905000567C9 /* Supporting */ = { @@ -212,18 +200,15 @@ name = ExpoModulesProviders; sourceTree = ""; }; - E18A149C79DE4E888F9D6DCA /* DynamicAppIcons */ = { + D9BBC0D20D3941CFAFBC2EDB /* intents */ = { isa = PBXGroup; children = ( - C6E6B1D963FF4D6DB2D0BC87 /* default-Icon-60x60@2x.png */, - 87785A919DF84051A9ACBE20 /* default-Icon-60x60@3x.png */, - 74E1587DDA4242CFA9DF81E1 /* light-Icon-60x60@2x.png */, - 440491A824024E65ADEAD618 /* light-Icon-60x60@3x.png */, - 3D4EAA837A1041FEB6F787F9 /* dark-Icon-60x60@2x.png */, - 3816BB2871E547068A3E4479 /* dark-Icon-60x60@3x.png */, + 9FC1485575E941D5BAC37351 /* DigitalBreak.swift */, + 1FAE41E014624BDE9CEAD0D9 /* OpenAppIntent.swift */, + 36221462784643C59B11D78A /* Info.plist */, ); - name = DynamicAppIcons; - path = ""; + name = intents; + path = ../targets/intents; sourceTree = ""; }; /* End PBXGroup section */ @@ -235,32 +220,31 @@ buildPhases = ( 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, - 41676E8268661A627A8E84FF /* [Expo] Configure project */, + BB5ABD0C7750524BF05119DA /* [Expo] Configure project */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, - 7A9FA9B1E2C64F67A71F98CC /* Embed ExtensionKit Extensions */, - FA2C3A5677C04F02C931F2BA /* [CP] Embed Pods Frameworks */, + 1713FA6E456A197F16452375 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( - 7199C23AC74D4940B7FF805A /* PBXTargetDependency */, + 89098344D7B64B6AB95BF401 /* PBXTargetDependency */, ); name = DigitalBreak; productName = DigitalBreak; productReference = 13B07F961A680F5B00A75B9A /* DigitalBreak.app */; productType = "com.apple.product-type.application"; }; - 5593744A6C1348C29DBD6DFF /* intents */ = { + 91803960A5744435B8C4A9D2 /* intents */ = { isa = PBXNativeTarget; - buildConfigurationList = E4BEEF237443460C8C57F209 /* Build configuration list for PBXNativeTarget "intents" */; + buildConfigurationList = 350D1CEA038C41EE927EFC44 /* Build configuration list for PBXNativeTarget "intents" */; buildPhases = ( - 789074D7272447A1AE339FEC /* Sources */, - D54C839031AA4FA0B96AC277 /* Frameworks */, - 28084F73863B42A489C82D20 /* Resources */, + ACDC2595C3A3429D8F13286C /* Sources */, + 4D51B5452863430CB2210E41 /* Frameworks */, + 66397AF2B57142B4900CBA2B /* Resources */, ); buildRules = ( ); @@ -268,7 +252,7 @@ ); name = intents; productName = intents; - productReference = 1C419F97FBBC4707ABD32764 /* intents.appex */; + productReference = 0C438284A1C34B3DA761CE69 /* intents.appex */; productType = "com.apple.product-type.extensionkit-extension"; }; /* End PBXNativeTarget section */ @@ -282,7 +266,7 @@ 13B07F861A680F5B00A75B9A = { LastSwiftMigration = 1250; }; - 5593744A6C1348C29DBD6DFF = { + 91803960A5744435B8C4A9D2 = { CreatedOnToolsVersion = 14.3; DevelopmentTeam = 3X5J8LXMDM; ProvisioningStyle = Automatic; @@ -303,7 +287,7 @@ projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* DigitalBreak */, - 5593744A6C1348C29DBD6DFF /* intents */, + 91803960A5744435B8C4A9D2 /* intents */, ); }; /* End PBXProject section */ @@ -316,16 +300,16 @@ BB2F792D24A3F905000567C9 /* Expo.plist in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */, - 028BF8C2E84C4B35AFD42517 /* default-Icon-60x60@2x.png in Resources */, - 8C8EF3FC9F68421D9B4A8226 /* default-Icon-60x60@3x.png in Resources */, - 7490DEE7E829424DA526D6D0 /* light-Icon-60x60@2x.png in Resources */, - D3AA6B099CAF456CBDE1CE0A /* light-Icon-60x60@3x.png in Resources */, - 2048BB379AC04E2DA378F630 /* dark-Icon-60x60@2x.png in Resources */, - 905F2B37867542E8B4C3424C /* dark-Icon-60x60@3x.png in Resources */, + CD3318E8CB6D4706B0D707BA /* default-Icon-60x60@2x.png in Resources */, + FD37B615C5AE41DE9BAD9EF4 /* default-Icon-60x60@3x.png in Resources */, + 553E92229F2B42698C802F3A /* light-Icon-60x60@2x.png in Resources */, + 688260C896774EE6A7B11CDF /* light-Icon-60x60@3x.png in Resources */, + EEB83BD0480C4E9DAF8D3211 /* dark-Icon-60x60@2x.png in Resources */, + 7AE0C69B76914835B422942C /* dark-Icon-60x60@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 28084F73863B42A489C82D20 /* Resources */ = { + 66397AF2B57142B4900CBA2B /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -375,24 +359,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 41676E8268661A627A8E84FF /* [Expo] Configure project */ = { + 1713FA6E456A197F16452375 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", ); - name = "[Expo] Configure project"; - outputFileListPaths = ( - ); + name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-DigitalBreak/expo-configure-project.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -418,23 +401,24 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak-resources.sh\"\n"; showEnvVarsInLog = 0; }; - FA2C3A5677C04F02C931F2BA /* [CP] Embed Pods Frameworks */ = { + BB5ABD0C7750524BF05119DA /* [Expo] Configure project */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", ); - name = "[CP] Embed Pods Frameworks"; + name = "[Expo] Configure project"; + outputFileListPaths = ( + ); outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DigitalBreak/Pods-DigitalBreak-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-DigitalBreak/expo-configure-project.sh\"\n"; }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; @@ -465,13 +449,13 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */, - E4D97F39B7814828B6049CD7 /* noop-file.swift in Sources */, - D4B729BE8A574A4E955666F3 /* OpenAppIntent.swift in Sources */, - 70BFBFCC53D840D580243F88 /* DigitalBreak.swift in Sources */, + 1A6A24DD292B426993203022 /* noop-file.swift in Sources */, + A955ADA549C14B7290DEC800 /* OpenAppIntent.swift in Sources */, + 9AD9DDB45E7943B2B9AA9DE0 /* DigitalBreak.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 789074D7272447A1AE339FEC /* Sources */ = { + ACDC2595C3A3429D8F13286C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -481,10 +465,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 7199C23AC74D4940B7FF805A /* PBXTargetDependency */ = { + 89098344D7B64B6AB95BF401 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5593744A6C1348C29DBD6DFF /* intents */; - targetProxy = 2A97EEA711EC481F81934290 /* PBXContainerItemProxy */; + target = 91803960A5744435B8C4A9D2 /* intents */; + targetProxy = D3791C515DBF47BD95E522C5 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -551,50 +535,7 @@ }; name = Release; }; - 15188891581343628DC3DFFF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 3X5J8LXMDM; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = ../targets/intents/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = intents; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = com.lukesthl.digitalbreak.intents; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 7F4449921F47431FABB88FB9 /* Release */ = { + 50299DC9C96E44DA9249EB11 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; @@ -760,6 +701,49 @@ }; name = Release; }; + 92BA41ECF3CA4C4B97447BAB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = 3X5J8LXMDM; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = ../targets/intents/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = intents; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; + PRODUCT_BUNDLE_IDENTIFIER = com.lukesthl.digitalbreak.intents; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -772,20 +756,20 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "DigitalBreak" */ = { + 350D1CEA038C41EE927EFC44 /* Build configuration list for PBXNativeTarget "intents" */ = { isa = XCConfigurationList; buildConfigurations = ( - 83CBBA201A601CBA00E9B192 /* Debug */, - 83CBBA211A601CBA00E9B192 /* Release */, + 92BA41ECF3CA4C4B97447BAB /* Debug */, + 50299DC9C96E44DA9249EB11 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E4BEEF237443460C8C57F209 /* Build configuration list for PBXNativeTarget "intents" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "DigitalBreak" */ = { isa = XCConfigurationList; buildConfigurations = ( - 15188891581343628DC3DFFF /* Debug */, - 7F4449921F47431FABB88FB9 /* Release */, + 83CBBA201A601CBA00E9B192 /* Debug */, + 83CBBA211A601CBA00E9B192 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/apps/expo/targets/intents/DigitalBreak.swift b/apps/expo/targets/intents/DigitalBreak.swift index 9cb5c72..fb9d0c6 100644 --- a/apps/expo/targets/intents/DigitalBreak.swift +++ b/apps/expo/targets/intents/DigitalBreak.swift @@ -187,14 +187,16 @@ struct DigitalBreak: AppIntent { print("Error while fetching apps: \(error)") } print("appintentpayload", appIntentPayload) - print("outoftimerange",outOfTimeRange) - if appIntentPayload != nil && isActive && appIntentPayload?.event == Event.breakStart && outOfTimeRange { + print("outoftimerange", outOfTimeRange) + if appIntentPayload != nil && isActive && appIntentPayload?.event == Event.breakStart + && outOfTimeRange + { return .result( value: true) - }else if (appIntentPayload == nil || outOfTimeRange) { + } else if appIntentPayload == nil || outOfTimeRange || appInfo == nil { appIntentPayload = AppIntentPayload( openedApp: appPrompt!, timestamp: Date().timeIntervalSince1970, event: Event.breakStart) - }else { + } else { appIntentPayload?.event = Event.breakSkip } let (storageDirectory, storageFile) = getStorageDirAndFile(fileName: "appintent.json") @@ -214,7 +216,7 @@ struct DigitalBreak: AppIntent { print("after", appIntentPayload?.event) return .result( value: appIntentPayload?.event != Event.breakSkip -) + ) } func asString(dict: [String: String]) -> String { do { diff --git a/packages/target-plugin/src/withXcodeChanges.ts b/packages/target-plugin/src/withXcodeChanges.ts index dd5d48f..65380cc 100644 --- a/packages/target-plugin/src/withXcodeChanges.ts +++ b/packages/target-plugin/src/withXcodeChanges.ts @@ -1192,7 +1192,7 @@ async function applyXcodeChanges( : props.type === "watch" ? "Embed Watch Content" : props.type === "appintent" - ? "Embed ExtensionKit Extensions" + ? undefined : "Embed Foundation Extensions"; // Could exist from a Share Extension const copyFilesBuildPhase = mainAppTarget.props.buildPhases.find((phase) => { @@ -1205,14 +1205,16 @@ async function applyXcodeChanges( if (copyFilesBuildPhase) { // Assume that this is the first run if there is no matching target that we identified from a previous run. copyFilesBuildPhase.props.files.push(alphaExtensionAppexBf); - } else { + } else if (props.type !== "appintent") { const dstPath = ({ clip: "AppClips", watch: "Watch" } as any)[props.type]; if (dstPath) { mainAppTarget.createBuildPhase(PBXCopyFilesBuildPhase, { dstPath: - props.type === "appintent" - ? "$(EXTENSIONS_FOLDER_PATH)" - : "$(CONTENTS_FOLDER_PATH)/" + dstPath, + // props.type === "appintent" + // ? + // "$(EXTENSIONS_FOLDER_PATH)" + //: + "$(CONTENTS_FOLDER_PATH)/" + dstPath, dstSubfolderSpec: 16, buildActionMask: 2147483647, files: [alphaExtensionAppexBf],