Skip to content

Commit eb74d3f

Browse files
domesticmousedomesticmouse
authored
Desktop Runner refresh (flutter#936)
1 parent b10b46b commit eb74d3f

File tree

17 files changed

+93
-221
lines changed

17 files changed

+93
-221
lines changed

‎experimental/desktop_photo_search/linux/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ cmake_policy(SET CMP0063 NEW)
88

99
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
1010

11+
# Root filesystem for cross-building.
12+
if(FLUTTER_TARGET_PLATFORM_SYSROOT)
13+
set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
14+
set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
15+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
16+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
17+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
18+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
19+
endif()
20+
1121
# Configure build options.
1222
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1323
set(CMAKE_BUILD_TYPE "Debug" CACHE

‎experimental/desktop_photo_search/linux/flutter/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ find_package(PkgConfig REQUIRED)
2424
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
2525
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
2626
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
27-
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
2827

2928
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
3029

@@ -66,7 +65,6 @@ target_link_libraries(flutter INTERFACE
6665
PkgConfig::GTK
6766
PkgConfig::GLIB
6867
PkgConfig::GIO
69-
PkgConfig::BLKID
7068
)
7169
add_dependencies(flutter flutter_assemble)
7270

@@ -80,7 +78,8 @@ add_custom_command(
8078
COMMAND ${CMAKE_COMMAND} -E env
8179
${FLUTTER_TOOL_ENVIRONMENT}
8280
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
83-
linux-x64 ${CMAKE_BUILD_TYPE}
81+
${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
82+
VERBATIM
8483
)
8584
add_custom_target(flutter_assemble DEPENDS
8685
"${FLUTTER_LIBRARY}"

‎experimental/desktop_photo_search/linux/my_application.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,21 @@ static void my_application_activate(GApplication* application) {
2929
// if future cases occur).
3030
gboolean use_header_bar = TRUE;
3131
#ifdef GDK_WINDOWING_X11
32-
GdkScreen *screen = gtk_window_get_screen(window);
32+
GdkScreen* screen = gtk_window_get_screen(window);
3333
if (GDK_IS_X11_SCREEN(screen)) {
34-
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
35-
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
36-
use_header_bar = FALSE;
37-
}
34+
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
35+
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
36+
use_header_bar = FALSE;
37+
}
3838
}
3939
#endif
4040
if (use_header_bar) {
41-
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
41+
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
4242
gtk_widget_show(GTK_WIDGET(header_bar));
4343
gtk_header_bar_set_title(header_bar, "desktop_photo_search");
4444
gtk_header_bar_set_show_close_button(header_bar, TRUE);
4545
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
46-
}
47-
else {
46+
} else {
4847
gtk_window_set_title(window, "desktop_photo_search");
4948
}
5049

@@ -64,7 +63,7 @@ static void my_application_activate(GApplication* application) {
6463
}
6564

6665
// Implements GApplication::local_command_line.
67-
static gboolean my_application_local_command_line(GApplication* application, gchar ***arguments, int *exit_status) {
66+
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
6867
MyApplication* self = MY_APPLICATION(application);
6968
// Strip out the first argument as it is the binary name.
7069
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
@@ -83,7 +82,7 @@ static gboolean my_application_local_command_line(GApplication* application, gch
8382
}
8483

8584
// Implements GObject::dispose.
86-
static void my_application_dispose(GObject *object) {
85+
static void my_application_dispose(GObject* object) {
8786
MyApplication* self = MY_APPLICATION(object);
8887
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
8988
G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
@@ -100,5 +99,6 @@ static void my_application_init(MyApplication* self) {}
10099
MyApplication* my_application_new() {
101100
return MY_APPLICATION(g_object_new(my_application_get_type(),
102101
"application-id", APPLICATION_ID,
102+
"flags", G_APPLICATION_NON_UNIQUE,
103103
nullptr));
104104
}

‎experimental/desktop_photo_search/macos/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
**/Pods/
44

55
# Xcode-related
6+
**/dgph
67
**/xcuserdata/

‎experimental/desktop_photo_search/macos/Flutter/Flutter-Debug.xcconfig

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

‎experimental/desktop_photo_search/macos/Flutter/Flutter-Release.xcconfig

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

‎experimental/desktop_photo_search/macos/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ SPEC CHECKSUMS:
3131

3232
PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
3333

34-
COCOAPODS: 1.10.1
34+
COCOAPODS: 1.11.0

‎experimental/desktop_photo_search/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 46 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2727
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2828
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
29-
CB0B59C99242536310F74F61 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D99F26E68F5EBE039D3C364 /* Pods_Runner.framework */; };
29+
8ABDE709CC9129175CD43B5F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */; };
3030
/* End PBXBuildFile section */
3131

3232
/* Begin PBXContainerItemProxy section */
@@ -53,10 +53,11 @@
5353
/* End PBXCopyFilesBuildPhase section */
5454

5555
/* Begin PBXFileReference section */
56-
084065FB8F5BB7ECA48CB120 /* 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>"; };
56+
046E9402D77CB52F3798A183 /* 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>"; };
57+
21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5758
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
5859
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
59-
33CC10ED2044A3C60003C045 /* Photo Search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Photo Search.app"; sourceTree = BUILT_PRODUCTS_DIR; };
60+
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop_photo_search.app; sourceTree = BUILT_PRODUCTS_DIR; };
6061
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6162
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
6263
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -68,19 +69,18 @@
6869
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
6970
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
7071
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
71-
420F3BBE32D920ACAFF2210B /* 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>"; };
72-
4D99F26E68F5EBE039D3C364 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
72+
60162069BE152E865D1D4DAB /* 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>"; };
7373
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
7474
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
75-
F4698A353FF15CC75800DADA /* 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>"; };
75+
DC7189FCCB4FDF54645192CA /* 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>"; };
7676
/* End PBXFileReference section */
7777

7878
/* Begin PBXFrameworksBuildPhase section */
7979
33CC10EA2044A3C60003C045 /* Frameworks */ = {
8080
isa = PBXFrameworksBuildPhase;
8181
buildActionMask = 2147483647;
8282
files = (
83-
CB0B59C99242536310F74F61 /* Pods_Runner.framework in Frameworks */,
83+
8ABDE709CC9129175CD43B5F /* Pods_Runner.framework in Frameworks */,
8484
);
8585
runOnlyForDeploymentPostprocessing = 0;
8686
};
@@ -105,14 +105,14 @@
105105
33CEB47122A05771004F2AC0 /* Flutter */,
106106
33CC10EE2044A3C60003C045 /* Products */,
107107
D73912EC22F37F3D000D13A0 /* Frameworks */,
108-
6065436645917DCD9817DE2B /* Pods */,
108+
E89324751EAA25FFD85ED79A /* Pods */,
109109
);
110110
sourceTree = "<group>";
111111
};
112112
33CC10EE2044A3C60003C045 /* Products */ = {
113113
isa = PBXGroup;
114114
children = (
115-
33CC10ED2044A3C60003C045 /* Photo Search.app */,
115+
33CC10ED2044A3C60003C045 /* desktop_photo_search.app */,
116116
);
117117
name = Products;
118118
sourceTree = "<group>";
@@ -152,22 +152,23 @@
152152
path = Runner;
153153
sourceTree = "<group>";
154154
};
155-
6065436645917DCD9817DE2B /* Pods */ = {
155+
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
156156
isa = PBXGroup;
157157
children = (
158-
084065FB8F5BB7ECA48CB120 /* Pods-Runner.debug.xcconfig */,
159-
420F3BBE32D920ACAFF2210B /* Pods-Runner.release.xcconfig */,
160-
F4698A353FF15CC75800DADA /* Pods-Runner.profile.xcconfig */,
158+
21AE7B3C5CDD0DA1EAFA8192 /* Pods_Runner.framework */,
161159
);
162-
path = Pods;
160+
name = Frameworks;
163161
sourceTree = "<group>";
164162
};
165-
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
163+
E89324751EAA25FFD85ED79A /* Pods */ = {
166164
isa = PBXGroup;
167165
children = (
168-
4D99F26E68F5EBE039D3C364 /* Pods_Runner.framework */,
166+
60162069BE152E865D1D4DAB /* Pods-Runner.debug.xcconfig */,
167+
DC7189FCCB4FDF54645192CA /* Pods-Runner.release.xcconfig */,
168+
046E9402D77CB52F3798A183 /* Pods-Runner.profile.xcconfig */,
169169
);
170-
name = Frameworks;
170+
name = Pods;
171+
path = Pods;
171172
sourceTree = "<group>";
172173
};
173174
/* End PBXGroup section */
@@ -177,13 +178,13 @@
177178
isa = PBXNativeTarget;
178179
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
179180
buildPhases = (
180-
FB945EB7C12339AAA89ED9F9 /* [CP] Check Pods Manifest.lock */,
181+
2986F46935953F8FA456F0C3 /* [CP] Check Pods Manifest.lock */,
181182
33CC10E92044A3C60003C045 /* Sources */,
182183
33CC10EA2044A3C60003C045 /* Frameworks */,
183184
33CC10EB2044A3C60003C045 /* Resources */,
184185
33CC110E2044A8840003C045 /* Bundle Framework */,
185186
3399D490228B24CF009A79C7 /* ShellScript */,
186-
F1626181C5D8383FCA050B06 /* [CP] Embed Pods Frameworks */,
187+
9F18BB647558AC903DBF34ED /* [CP] Embed Pods Frameworks */,
187188
);
188189
buildRules = (
189190
);
@@ -192,7 +193,7 @@
192193
);
193194
name = Runner;
194195
productName = Runner;
195-
productReference = 33CC10ED2044A3C60003C045 /* Photo Search.app */;
196+
productReference = 33CC10ED2044A3C60003C045 /* desktop_photo_search.app */;
196197
productType = "com.apple.product-type.application";
197198
};
198199
/* End PBXNativeTarget section */
@@ -203,7 +204,7 @@
203204
attributes = {
204205
LastSwiftUpdateCheck = 0920;
205206
LastUpgradeCheck = 0930;
206-
ORGANIZATIONNAME = "The Flutter Authors";
207+
ORGANIZATIONNAME = "";
207208
TargetAttributes = {
208209
33CC10EC2044A3C60003C045 = {
209210
CreatedOnToolsVersion = 9.2;
@@ -222,7 +223,7 @@
222223
};
223224
};
224225
buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */;
225-
compatibilityVersion = "Xcode 8.0";
226+
compatibilityVersion = "Xcode 9.3";
226227
developmentRegion = en;
227228
hasScannedForEncodings = 0;
228229
knownRegions = (
@@ -253,85 +254,80 @@
253254
/* End PBXResourcesBuildPhase section */
254255

255256
/* Begin PBXShellScriptBuildPhase section */
256-
3399D490228B24CF009A79C7 /* ShellScript */ = {
257+
2986F46935953F8FA456F0C3 /* [CP] Check Pods Manifest.lock */ = {
257258
isa = PBXShellScriptBuildPhase;
258259
buildActionMask = 2147483647;
259260
files = (
260261
);
261262
inputFileListPaths = (
262263
);
263264
inputPaths = (
265+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
266+
"${PODS_ROOT}/Manifest.lock",
264267
);
268+
name = "[CP] Check Pods Manifest.lock";
265269
outputFileListPaths = (
266270
);
267271
outputPaths = (
272+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
268273
);
269274
runOnlyForDeploymentPostprocessing = 0;
270275
shellPath = /bin/sh;
271-
shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
276+
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";
277+
showEnvVarsInLog = 0;
272278
};
273-
33CC111E2044C6BF0003C045 /* ShellScript */ = {
279+
3399D490228B24CF009A79C7 /* ShellScript */ = {
274280
isa = PBXShellScriptBuildPhase;
275281
buildActionMask = 2147483647;
276282
files = (
277283
);
278284
inputFileListPaths = (
279-
Flutter/ephemeral/FlutterInputs.xcfilelist,
280285
);
281286
inputPaths = (
282-
Flutter/ephemeral/tripwire,
283287
);
284288
outputFileListPaths = (
285-
Flutter/ephemeral/FlutterOutputs.xcfilelist,
286289
);
287290
outputPaths = (
288291
);
289292
runOnlyForDeploymentPostprocessing = 0;
290293
shellPath = /bin/sh;
291-
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
294+
shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
292295
};
293-
F1626181C5D8383FCA050B06 /* [CP] Embed Pods Frameworks */ = {
296+
33CC111E2044C6BF0003C045 /* ShellScript */ = {
294297
isa = PBXShellScriptBuildPhase;
295298
buildActionMask = 2147483647;
296299
files = (
297300
);
301+
inputFileListPaths = (
302+
Flutter/ephemeral/FlutterInputs.xcfilelist,
303+
);
298304
inputPaths = (
299-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
300-
"${BUILT_PRODUCTS_DIR}/file_selector_macos/file_selector_macos.framework",
301-
"${BUILT_PRODUCTS_DIR}/menubar/menubar.framework",
302-
"${BUILT_PRODUCTS_DIR}/url_launcher_macos/url_launcher_macos.framework",
305+
Flutter/ephemeral/tripwire,
306+
);
307+
outputFileListPaths = (
308+
Flutter/ephemeral/FlutterOutputs.xcfilelist,
303309
);
304-
name = "[CP] Embed Pods Frameworks";
305310
outputPaths = (
306-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_selector_macos.framework",
307-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/menubar.framework",
308-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_macos.framework",
309311
);
310312
runOnlyForDeploymentPostprocessing = 0;
311313
shellPath = /bin/sh;
312-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
313-
showEnvVarsInLog = 0;
314+
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
314315
};
315-
FB945EB7C12339AAA89ED9F9 /* [CP] Check Pods Manifest.lock */ = {
316+
9F18BB647558AC903DBF34ED /* [CP] Embed Pods Frameworks */ = {
316317
isa = PBXShellScriptBuildPhase;
317318
buildActionMask = 2147483647;
318319
files = (
319320
);
320321
inputFileListPaths = (
322+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
321323
);
322-
inputPaths = (
323-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
324-
"${PODS_ROOT}/Manifest.lock",
325-
);
326-
name = "[CP] Check Pods Manifest.lock";
324+
name = "[CP] Embed Pods Frameworks";
327325
outputFileListPaths = (
328-
);
329-
outputPaths = (
330-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
326+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
331327
);
332328
runOnlyForDeploymentPostprocessing = 0;
333329
shellPath = /bin/sh;
334-
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";
330+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
335331
showEnvVarsInLog = 0;
336332
};
337333
/* End PBXShellScriptBuildPhase section */
@@ -425,10 +421,6 @@
425421
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
426422
CODE_SIGN_STYLE = Automatic;
427423
COMBINE_HIDPI_IMAGES = YES;
428-
FRAMEWORK_SEARCH_PATHS = (
429-
"$(inherited)",
430-
"$(PROJECT_DIR)/Flutter/ephemeral",
431-
);
432424
INFOPLIST_FILE = Runner/Info.plist;
433425
LD_RUNPATH_SEARCH_PATHS = (
434426
"$(inherited)",
@@ -555,10 +547,6 @@
555547
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
556548
CODE_SIGN_STYLE = Automatic;
557549
COMBINE_HIDPI_IMAGES = YES;
558-
FRAMEWORK_SEARCH_PATHS = (
559-
"$(inherited)",
560-
"$(PROJECT_DIR)/Flutter/ephemeral",
561-
);
562550
INFOPLIST_FILE = Runner/Info.plist;
563551
LD_RUNPATH_SEARCH_PATHS = (
564552
"$(inherited)",
@@ -579,10 +567,6 @@
579567
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
580568
CODE_SIGN_STYLE = Automatic;
581569
COMBINE_HIDPI_IMAGES = YES;
582-
FRAMEWORK_SEARCH_PATHS = (
583-
"$(inherited)",
584-
"$(PROJECT_DIR)/Flutter/ephemeral",
585-
);
586570
INFOPLIST_FILE = Runner/Info.plist;
587571
LD_RUNPATH_SEARCH_PATHS = (
588572
"$(inherited)",

0 commit comments

Comments
 (0)