Skip to content

Commit 3908eee

Browse files
vbuberenvbuberen
committed
ci(connectivity_plus): fix macOS/iOS example build with Swift Package Manager
1 parent 17f11eb commit 3908eee

3 files changed

Lines changed: 1 addition & 107 deletions

File tree

‎packages/connectivity_plus/connectivity_plus/example/macos/Flutter/Flutter-Debug.xcconfig‎

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

‎packages/connectivity_plus/connectivity_plus/example/macos/Flutter/Flutter-Release.xcconfig‎

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

‎packages/connectivity_plus/connectivity_plus/example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2828
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2929
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
30-
516D2749BEC98FB8007BDD39 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5680711160F3554DA073A4A /* Pods_Runner.framework */; };
31-
A0DE1A8BAD92B1FC97AF3072 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7DE3F356208F8AF32BF63FB /* Pods_RunnerTests.framework */; };
3230
/* End PBXBuildFile section */
3331

3432
/* Begin PBXContainerItemProxy section */
@@ -62,13 +60,11 @@
6260
/* End PBXCopyFilesBuildPhase section */
6361

6462
/* Begin PBXFileReference section */
65-
2DA90B2343051DD978570433 /* 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>"; };
66-
32DD3AA8862D40CEC34F4823 /* 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>"; };
6763
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6864
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6965
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
7066
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
71-
33CC10ED2044A3C60003C045 /* connectivity_plus_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_device_info.app; sourceTree = BUILT_PRODUCTS_DIR; };
67+
33CC10ED2044A3C60003C045 /* example_device_info.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_device_info.app; sourceTree = BUILT_PRODUCTS_DIR; };
7268
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7369
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
7470
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -81,29 +77,21 @@
8177
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8278
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
8379
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
84-
818BD3063832BFCCEB86E2DC /* 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>"; };
85-
849CE1B58CE95AE709338025 /* 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>"; };
8680
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
87-
A5680711160F3554DA073A4A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
88-
A7DE3F356208F8AF32BF63FB /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
89-
BC7DC07E4588932BDF542A1C /* 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>"; };
90-
F074D7F65F9EE14BDF366DEA /* 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>"; };
9181
/* End PBXFileReference section */
9282

9383
/* Begin PBXFrameworksBuildPhase section */
9484
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9585
isa = PBXFrameworksBuildPhase;
9686
buildActionMask = 2147483647;
9787
files = (
98-
A0DE1A8BAD92B1FC97AF3072 /* Pods_RunnerTests.framework in Frameworks */,
9988
);
10089
runOnlyForDeploymentPostprocessing = 0;
10190
};
10291
33CC10EA2044A3C60003C045 /* Frameworks */ = {
10392
isa = PBXFrameworksBuildPhase;
10493
buildActionMask = 2147483647;
10594
files = (
106-
516D2749BEC98FB8007BDD39 /* Pods_Runner.framework in Frameworks */,
10795
);
10896
runOnlyForDeploymentPostprocessing = 0;
10997
};
@@ -136,8 +124,6 @@
136124
33CEB47122A05771004F2AC0 /* Flutter */,
137125
331C80D6294CF71000263BE5 /* RunnerTests */,
138126
33CC10EE2044A3C60003C045 /* Products */,
139-
D73912EC22F37F3D000D13A0 /* Frameworks */,
140-
7C46BB738D7DFC62A80734E0 /* Pods */,
141127
);
142128
sourceTree = "<group>";
143129
};
@@ -185,37 +171,13 @@
185171
path = Runner;
186172
sourceTree = "<group>";
187173
};
188-
7C46BB738D7DFC62A80734E0 /* Pods */ = {
189-
isa = PBXGroup;
190-
children = (
191-
849CE1B58CE95AE709338025 /* Pods-Runner.debug.xcconfig */,
192-
F074D7F65F9EE14BDF366DEA /* Pods-Runner.release.xcconfig */,
193-
32DD3AA8862D40CEC34F4823 /* Pods-Runner.profile.xcconfig */,
194-
BC7DC07E4588932BDF542A1C /* Pods-RunnerTests.debug.xcconfig */,
195-
2DA90B2343051DD978570433 /* Pods-RunnerTests.release.xcconfig */,
196-
818BD3063832BFCCEB86E2DC /* Pods-RunnerTests.profile.xcconfig */,
197-
);
198-
name = Pods;
199-
path = Pods;
200-
sourceTree = "<group>";
201-
};
202-
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
203-
isa = PBXGroup;
204-
children = (
205-
A5680711160F3554DA073A4A /* Pods_Runner.framework */,
206-
A7DE3F356208F8AF32BF63FB /* Pods_RunnerTests.framework */,
207-
);
208-
name = Frameworks;
209-
sourceTree = "<group>";
210-
};
211174
/* End PBXGroup section */
212175

213176
/* Begin PBXNativeTarget section */
214177
331C80D4294CF70F00263BE5 /* RunnerTests */ = {
215178
isa = PBXNativeTarget;
216179
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
217180
buildPhases = (
218-
E6B78D17FAAB2457BAC2FC37 /* [CP] Check Pods Manifest.lock */,
219181
331C80D1294CF70F00263BE5 /* Sources */,
220182
331C80D2294CF70F00263BE5 /* Frameworks */,
221183
331C80D3294CF70F00263BE5 /* Resources */,
@@ -234,13 +196,11 @@
234196
isa = PBXNativeTarget;
235197
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
236198
buildPhases = (
237-
290ED1BDB70728341B0EE329 /* [CP] Check Pods Manifest.lock */,
238199
33CC10E92044A3C60003C045 /* Sources */,
239200
33CC10EA2044A3C60003C045 /* Frameworks */,
240201
33CC10EB2044A3C60003C045 /* Resources */,
241202
33CC110E2044A8840003C045 /* Bundle Framework */,
242203
3399D490228B24CF009A79C7 /* ShellScript */,
243-
9130A189025A19331F12A8D2 /* [CP] Embed Pods Frameworks */,
244204
);
245205
buildRules = (
246206
);
@@ -322,28 +282,6 @@
322282
/* End PBXResourcesBuildPhase section */
323283

324284
/* Begin PBXShellScriptBuildPhase section */
325-
290ED1BDB70728341B0EE329 /* [CP] Check Pods Manifest.lock */ = {
326-
isa = PBXShellScriptBuildPhase;
327-
buildActionMask = 2147483647;
328-
files = (
329-
);
330-
inputFileListPaths = (
331-
);
332-
inputPaths = (
333-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
334-
"${PODS_ROOT}/Manifest.lock",
335-
);
336-
name = "[CP] Check Pods Manifest.lock";
337-
outputFileListPaths = (
338-
);
339-
outputPaths = (
340-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
341-
);
342-
runOnlyForDeploymentPostprocessing = 0;
343-
shellPath = /bin/sh;
344-
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";
345-
showEnvVarsInLog = 0;
346-
};
347285
3399D490228B24CF009A79C7 /* ShellScript */ = {
348286
isa = PBXShellScriptBuildPhase;
349287
alwaysOutOfDate = 1;
@@ -382,45 +320,6 @@
382320
shellPath = /bin/sh;
383321
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
384322
};
385-
9130A189025A19331F12A8D2 /* [CP] Embed Pods Frameworks */ = {
386-
isa = PBXShellScriptBuildPhase;
387-
buildActionMask = 2147483647;
388-
files = (
389-
);
390-
inputFileListPaths = (
391-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
392-
);
393-
name = "[CP] Embed Pods Frameworks";
394-
outputFileListPaths = (
395-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
396-
);
397-
runOnlyForDeploymentPostprocessing = 0;
398-
shellPath = /bin/sh;
399-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
400-
showEnvVarsInLog = 0;
401-
};
402-
E6B78D17FAAB2457BAC2FC37 /* [CP] Check Pods Manifest.lock */ = {
403-
isa = PBXShellScriptBuildPhase;
404-
buildActionMask = 2147483647;
405-
files = (
406-
);
407-
inputFileListPaths = (
408-
);
409-
inputPaths = (
410-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
411-
"${PODS_ROOT}/Manifest.lock",
412-
);
413-
name = "[CP] Check Pods Manifest.lock";
414-
outputFileListPaths = (
415-
);
416-
outputPaths = (
417-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
418-
);
419-
runOnlyForDeploymentPostprocessing = 0;
420-
shellPath = /bin/sh;
421-
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";
422-
showEnvVarsInLog = 0;
423-
};
424323
/* End PBXShellScriptBuildPhase section */
425324

426325
/* Begin PBXSourcesBuildPhase section */
@@ -472,7 +371,6 @@
472371
/* Begin XCBuildConfiguration section */
473372
331C80DB294CF71000263BE5 /* Debug */ = {
474373
isa = XCBuildConfiguration;
475-
baseConfigurationReference = BC7DC07E4588932BDF542A1C /* Pods-RunnerTests.debug.xcconfig */;
476374
buildSettings = {
477375
BUNDLE_LOADER = "$(TEST_HOST)";
478376
CURRENT_PROJECT_VERSION = 1;
@@ -487,7 +385,6 @@
487385
};
488386
331C80DC294CF71000263BE5 /* Release */ = {
489387
isa = XCBuildConfiguration;
490-
baseConfigurationReference = 2DA90B2343051DD978570433 /* Pods-RunnerTests.release.xcconfig */;
491388
buildSettings = {
492389
BUNDLE_LOADER = "$(TEST_HOST)";
493390
CURRENT_PROJECT_VERSION = 1;
@@ -502,7 +399,6 @@
502399
};
503400
331C80DD294CF71000263BE5 /* Profile */ = {
504401
isa = XCBuildConfiguration;
505-
baseConfigurationReference = 818BD3063832BFCCEB86E2DC /* Pods-RunnerTests.profile.xcconfig */;
506402
buildSettings = {
507403
BUNDLE_LOADER = "$(TEST_HOST)";
508404
CURRENT_PROJECT_VERSION = 1;

0 commit comments

Comments
 (0)