Skip to content

Commit 931d433

Browse files
gspencergooggspencergoog
committed
MacOS changes
1 parent dc60753 commit 931d433

File tree

8 files changed

+107
-2
lines changed

8 files changed

+107
-2
lines changed

‎pkgs/genui_client/ios/Flutter/Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"

‎pkgs/genui_client/ios/Flutter/Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

‎pkgs/genui_client/lib/src/ui_server.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'dart:isolate';
33

44
import 'package:firebase_ai/firebase_ai.dart';
55
import 'package:firebase_core/firebase_core.dart';
6-
import 'package:flutter/cupertino.dart';
76
import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
87
import 'package:stream_channel/isolate_channel.dart';
98

‎pkgs/genui_client/macos/Flutter/Flutter-Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "ephemeral/Flutter-Generated.xcconfig"

‎pkgs/genui_client/macos/Flutter/Flutter-Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "ephemeral/Flutter-Generated.xcconfig"

‎pkgs/genui_client/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
2D3B5FA1FF1F91A9F2356552 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86709B5E8E4028EED188EBA4 /* Pods_Runner.framework */; };
2425
331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
2526
335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
2627
33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
2728
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2829
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2930
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
3031
43DBEACC40259DE7C35AFDDD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A0D9372B9E4A5636BAEFAF1E /* GoogleService-Info.plist */; };
32+
E61387C0F63922063875A007 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71E73FE02AC92142832356CE /* Pods_RunnerTests.framework */; };
3133
/* End PBXBuildFile section */
3234

3335
/* Begin PBXContainerItemProxy section */
@@ -77,23 +79,33 @@
7779
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
7880
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
7981
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
82+
43A4A3F0709CD8788D6E97AD /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
83+
4C718523CCEFDE2079FACBC3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
84+
71E73FE02AC92142832356CE /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
85+
74C4F4B8BB4EEA592CB72B9B /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
86+
750DB47EB22628DE4434BC45 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
8087
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
88+
86709B5E8E4028EED188EBA4 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8189
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
8290
A0D9372B9E4A5636BAEFAF1E /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
91+
B110CE452896BCE0EAE7B44C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
92+
DADDA03672506EA2BEA1EAAC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
8393
/* End PBXFileReference section */
8494

8595
/* Begin PBXFrameworksBuildPhase section */
8696
331C80D2294CF70F00263BE5 /* Frameworks */ = {
8797
isa = PBXFrameworksBuildPhase;
8898
buildActionMask = 2147483647;
8999
files = (
100+
E61387C0F63922063875A007 /* Pods_RunnerTests.framework in Frameworks */,
90101
);
91102
runOnlyForDeploymentPostprocessing = 0;
92103
};
93104
33CC10EA2044A3C60003C045 /* Frameworks */ = {
94105
isa = PBXFrameworksBuildPhase;
95106
buildActionMask = 2147483647;
96107
files = (
108+
2D3B5FA1FF1F91A9F2356552 /* Pods_Runner.framework in Frameworks */,
97109
);
98110
runOnlyForDeploymentPostprocessing = 0;
99111
};
@@ -128,6 +140,7 @@
128140
33CC10EE2044A3C60003C045 /* Products */,
129141
D73912EC22F37F3D000D13A0 /* Frameworks */,
130142
A0D9372B9E4A5636BAEFAF1E /* GoogleService-Info.plist */,
143+
A8D80B7CEA4E3F7320A61414 /* Pods */,
131144
);
132145
sourceTree = "<group>";
133146
};
@@ -175,9 +188,25 @@
175188
path = Runner;
176189
sourceTree = "<group>";
177190
};
191+
A8D80B7CEA4E3F7320A61414 /* Pods */ = {
192+
isa = PBXGroup;
193+
children = (
194+
4C718523CCEFDE2079FACBC3 /* Pods-Runner.debug.xcconfig */,
195+
74C4F4B8BB4EEA592CB72B9B /* Pods-Runner.release.xcconfig */,
196+
DADDA03672506EA2BEA1EAAC /* Pods-Runner.profile.xcconfig */,
197+
B110CE452896BCE0EAE7B44C /* Pods-RunnerTests.debug.xcconfig */,
198+
43A4A3F0709CD8788D6E97AD /* Pods-RunnerTests.release.xcconfig */,
199+
750DB47EB22628DE4434BC45 /* Pods-RunnerTests.profile.xcconfig */,
200+
);
201+
name = Pods;
202+
path = Pods;
203+
sourceTree = "<group>";
204+
};
178205
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
179206
isa = PBXGroup;
180207
children = (
208+
86709B5E8E4028EED188EBA4 /* Pods_Runner.framework */,
209+
71E73FE02AC92142832356CE /* Pods_RunnerTests.framework */,
181210
);
182211
name = Frameworks;
183212
sourceTree = "<group>";
@@ -189,6 +218,7 @@
189218
isa = PBXNativeTarget;
190219
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
191220
buildPhases = (
221+
C465950D26B760F24C303890 /* [CP] Check Pods Manifest.lock */,
192222
331C80D1294CF70F00263BE5 /* Sources */,
193223
331C80D2294CF70F00263BE5 /* Frameworks */,
194224
331C80D3294CF70F00263BE5 /* Resources */,
@@ -207,11 +237,13 @@
207237
isa = PBXNativeTarget;
208238
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
209239
buildPhases = (
240+
8C42A9F25E6F6108651B61F5 /* [CP] Check Pods Manifest.lock */,
210241
33CC10E92044A3C60003C045 /* Sources */,
211242
33CC10EA2044A3C60003C045 /* Frameworks */,
212243
33CC10EB2044A3C60003C045 /* Resources */,
213244
33CC110E2044A8840003C045 /* Bundle Framework */,
214245
3399D490228B24CF009A79C7 /* ShellScript */,
246+
58752C9DFEF77F84746A1880 /* [CP] Embed Pods Frameworks */,
215247
);
216248
buildRules = (
217249
);
@@ -333,6 +365,67 @@
333365
shellPath = /bin/sh;
334366
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
335367
};
368+
58752C9DFEF77F84746A1880 /* [CP] Embed Pods Frameworks */ = {
369+
isa = PBXShellScriptBuildPhase;
370+
buildActionMask = 2147483647;
371+
files = (
372+
);
373+
inputFileListPaths = (
374+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
375+
);
376+
name = "[CP] Embed Pods Frameworks";
377+
outputFileListPaths = (
378+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
379+
);
380+
runOnlyForDeploymentPostprocessing = 0;
381+
shellPath = /bin/sh;
382+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
383+
showEnvVarsInLog = 0;
384+
};
385+
8C42A9F25E6F6108651B61F5 /* [CP] Check Pods Manifest.lock */ = {
386+
isa = PBXShellScriptBuildPhase;
387+
buildActionMask = 2147483647;
388+
files = (
389+
);
390+
inputFileListPaths = (
391+
);
392+
inputPaths = (
393+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
394+
"${PODS_ROOT}/Manifest.lock",
395+
);
396+
name = "[CP] Check Pods Manifest.lock";
397+
outputFileListPaths = (
398+
);
399+
outputPaths = (
400+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
401+
);
402+
runOnlyForDeploymentPostprocessing = 0;
403+
shellPath = /bin/sh;
404+
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";
405+
showEnvVarsInLog = 0;
406+
};
407+
C465950D26B760F24C303890 /* [CP] Check Pods Manifest.lock */ = {
408+
isa = PBXShellScriptBuildPhase;
409+
buildActionMask = 2147483647;
410+
files = (
411+
);
412+
inputFileListPaths = (
413+
);
414+
inputPaths = (
415+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
416+
"${PODS_ROOT}/Manifest.lock",
417+
);
418+
name = "[CP] Check Pods Manifest.lock";
419+
outputFileListPaths = (
420+
);
421+
outputPaths = (
422+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
423+
);
424+
runOnlyForDeploymentPostprocessing = 0;
425+
shellPath = /bin/sh;
426+
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";
427+
showEnvVarsInLog = 0;
428+
};
336429
/* End PBXShellScriptBuildPhase section */
337430

338431
/* Begin PBXSourcesBuildPhase section */
@@ -384,6 +477,7 @@
384477
/* Begin XCBuildConfiguration section */
385478
331C80DB294CF71000263BE5 /* Debug */ = {
386479
isa = XCBuildConfiguration;
480+
baseConfigurationReference = B110CE452896BCE0EAE7B44C /* Pods-RunnerTests.debug.xcconfig */;
387481
buildSettings = {
388482
BUNDLE_LOADER = "$(TEST_HOST)";
389483
CURRENT_PROJECT_VERSION = 1;
@@ -398,6 +492,7 @@
398492
};
399493
331C80DC294CF71000263BE5 /* Release */ = {
400494
isa = XCBuildConfiguration;
495+
baseConfigurationReference = 43A4A3F0709CD8788D6E97AD /* Pods-RunnerTests.release.xcconfig */;
401496
buildSettings = {
402497
BUNDLE_LOADER = "$(TEST_HOST)";
403498
CURRENT_PROJECT_VERSION = 1;
@@ -412,6 +507,7 @@
412507
};
413508
331C80DD294CF71000263BE5 /* Profile */ = {
414509
isa = XCBuildConfiguration;
510+
baseConfigurationReference = 750DB47EB22628DE4434BC45 /* Pods-RunnerTests.profile.xcconfig */;
415511
buildSettings = {
416512
BUNDLE_LOADER = "$(TEST_HOST)";
417513
CURRENT_PROJECT_VERSION = 1;

‎pkgs/genui_client/macos/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkgs/genui_client/test/main_test.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@ class MockServerConnection implements ServerConnection {
3939
this.serverSpawnerOverride,
4040
});
4141

42+
// ignore: unreachable_from_main
4243
final FirebaseApp firebaseApp;
4344
final SetUiCallback onSetUi;
45+
// ignore: unreachable_from_main
4446
final UpdateUiCallback onUpdateUi;
4547
final ErrorCallback onError;
4648
final StatusUpdateCallback onStatusUpdate;
49+
// ignore: unreachable_from_main
4750
final ServerSpawner? serverSpawnerOverride;
4851

4952
String? lastPrompt;
@@ -192,4 +195,4 @@ void main() {
192195

193196
expect(find.text('Error: Something went wrong'), findsOneWidget);
194197
});
195-
}
198+
}

0 commit comments

Comments
 (0)