Skip to content

Commit ca70364

Browse files
author
auto-submit[bot]
committed
Revert "[url_launcher] Add Swift Package Manager integration to example app (#8128)"
This reverts commit 59a1067.
1 parent 59a1067 commit ca70364

File tree

5 files changed

+43
-89
lines changed

5 files changed

+43
-89
lines changed

‎packages/url_launcher/url_launcher/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
2D92223F1EC1DA93007564B0 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D92223E1EC1DA93007564B0 /* GeneratedPluginRegistrant.m */; };
1111
2E37D9A274B2EACB147AC51B /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 856D0913184F79C678A42603 /* libPods-Runner.a */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
13-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1413
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1514
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1615
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -59,7 +58,6 @@
5958
isa = PBXFrameworksBuildPhase;
6059
buildActionMask = 2147483647;
6160
files = (
62-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
6361
2E37D9A274B2EACB147AC51B /* libPods-Runner.a in Frameworks */,
6462
);
6563
runOnlyForDeploymentPostprocessing = 0;
@@ -155,15 +153,13 @@
155153
97C146EC1CF9000F007C117D /* Resources */,
156154
9705A1C41CF9048500538489 /* Embed Frameworks */,
157155
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
156+
41669A922CFCCB42BF5DF63C /* [CP] Copy Pods Resources */,
158157
);
159158
buildRules = (
160159
);
161160
dependencies = (
162161
);
163162
name = Runner;
164-
packageProductDependencies = (
165-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
166-
);
167163
productName = Runner;
168164
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
169165
productType = "com.apple.product-type.application";
@@ -174,7 +170,7 @@
174170
97C146E61CF9000F007C117D /* Project object */ = {
175171
isa = PBXProject;
176172
attributes = {
177-
LastUpgradeCheck = 1510;
173+
LastUpgradeCheck = 1430;
178174
ORGANIZATIONNAME = "The Flutter Authors";
179175
TargetAttributes = {
180176
97C146ED1CF9000F007C117D = {
@@ -192,9 +188,6 @@
192188
Base,
193189
);
194190
mainGroup = 97C146E51CF9000F007C117D;
195-
packageReferences = (
196-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
197-
);
198191
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
199192
projectDirPath = "";
200193
projectRoot = "";
@@ -235,6 +228,24 @@
235228
shellPath = /bin/sh;
236229
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
237230
};
231+
41669A922CFCCB42BF5DF63C /* [CP] Copy Pods Resources */ = {
232+
isa = PBXShellScriptBuildPhase;
233+
buildActionMask = 2147483647;
234+
files = (
235+
);
236+
inputPaths = (
237+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
238+
"${PODS_CONFIGURATION_BUILD_DIR}/url_launcher_ios/url_launcher_ios_privacy.bundle",
239+
);
240+
name = "[CP] Copy Pods Resources";
241+
outputPaths = (
242+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/url_launcher_ios_privacy.bundle",
243+
);
244+
runOnlyForDeploymentPostprocessing = 0;
245+
shellPath = /bin/sh;
246+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
247+
showEnvVarsInLog = 0;
248+
};
238249
9740EEB61CF901F6004384FC /* Run Script */ = {
239250
isa = PBXShellScriptBuildPhase;
240251
alwaysOutOfDate = 1;
@@ -479,20 +490,6 @@
479490
defaultConfigurationName = Release;
480491
};
481492
/* End XCConfigurationList section */
482-
483-
/* Begin XCLocalSwiftPackageReference section */
484-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
485-
isa = XCLocalSwiftPackageReference;
486-
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
487-
};
488-
/* End XCLocalSwiftPackageReference section */
489-
490-
/* Begin XCSwiftPackageProductDependency section */
491-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
492-
isa = XCSwiftPackageProductDependency;
493-
productName = FlutterGeneratedPluginSwiftPackage;
494-
};
495-
/* End XCSwiftPackageProductDependency section */
496493
};
497494
rootObject = 97C146E61CF9000F007C117D /* Project object */;
498495
}

‎packages/url_launcher/url_launcher/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8-
<PreActions>
9-
<ExecutionAction
10-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11-
<ActionContent
12-
title = "Run Prepare Flutter Framework Script"
13-
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14-
<EnvironmentBuildable>
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18-
BuildableName = "Runner.app"
19-
BlueprintName = "Runner"
20-
ReferencedContainer = "container:Runner.xcodeproj">
21-
</BuildableReference>
22-
</EnvironmentBuildable>
23-
</ActionContent>
24-
</ExecutionAction>
25-
</PreActions>
268
<BuildActionEntries>
279
<BuildActionEntry
2810
buildForTesting = "YES"

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

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
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-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
3029
DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5067D74CB28D28AE3B3DD05B /* Pods_Runner.framework */; };
3130
/* End PBXBuildFile section */
3231

@@ -81,7 +80,6 @@
8180
isa = PBXFrameworksBuildPhase;
8281
buildActionMask = 2147483647;
8382
files = (
84-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
8583
DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */,
8684
);
8785
runOnlyForDeploymentPostprocessing = 0;
@@ -186,16 +184,14 @@
186184
33CC10EB2044A3C60003C045 /* Resources */,
187185
33CC110E2044A8840003C045 /* Bundle Framework */,
188186
3399D490228B24CF009A79C7 /* ShellScript */,
187+
50C74DCD840D9B569BE3D48F /* [CP] Embed Pods Frameworks */,
189188
);
190189
buildRules = (
191190
);
192191
dependencies = (
193192
33CC11202044C79F0003C045 /* PBXTargetDependency */,
194193
);
195194
name = Runner;
196-
packageProductDependencies = (
197-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
198-
);
199195
productName = Runner;
200196
productReference = 33CC10ED2044A3C60003C045 /* url_launcher_example_example.app */;
201197
productType = "com.apple.product-type.application";
@@ -207,7 +203,7 @@
207203
isa = PBXProject;
208204
attributes = {
209205
LastSwiftUpdateCheck = 0920;
210-
LastUpgradeCheck = 1510;
206+
LastUpgradeCheck = 1300;
211207
ORGANIZATIONNAME = "The Flutter Authors";
212208
TargetAttributes = {
213209
33CC10EC2044A3C60003C045 = {
@@ -235,9 +231,6 @@
235231
Base,
236232
);
237233
mainGroup = 33CC10E42044A3C60003C045;
238-
packageReferences = (
239-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
240-
);
241234
productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
242235
projectDirPath = "";
243236
projectRoot = "";
@@ -299,6 +292,24 @@
299292
shellPath = /bin/sh;
300293
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n";
301294
};
295+
50C74DCD840D9B569BE3D48F /* [CP] Embed Pods Frameworks */ = {
296+
isa = PBXShellScriptBuildPhase;
297+
buildActionMask = 2147483647;
298+
files = (
299+
);
300+
inputPaths = (
301+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
302+
"${BUILT_PRODUCTS_DIR}/url_launcher_macos/url_launcher_macos.framework",
303+
);
304+
name = "[CP] Embed Pods Frameworks";
305+
outputPaths = (
306+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_macos.framework",
307+
);
308+
runOnlyForDeploymentPostprocessing = 0;
309+
shellPath = /bin/sh;
310+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
311+
showEnvVarsInLog = 0;
312+
};
302313
C318D59394D0E38099411848 /* [CP] Check Pods Manifest.lock */ = {
303314
isa = PBXShellScriptBuildPhase;
304315
buildActionMask = 2147483647;
@@ -630,20 +641,6 @@
630641
defaultConfigurationName = Release;
631642
};
632643
/* End XCConfigurationList section */
633-
634-
/* Begin XCLocalSwiftPackageReference section */
635-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
636-
isa = XCLocalSwiftPackageReference;
637-
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
638-
};
639-
/* End XCLocalSwiftPackageReference section */
640-
641-
/* Begin XCSwiftPackageProductDependency section */
642-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
643-
isa = XCSwiftPackageProductDependency;
644-
productName = FlutterGeneratedPluginSwiftPackage;
645-
};
646-
/* End XCSwiftPackageProductDependency section */
647644
};
648645
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
649646
}

‎packages/url_launcher/url_launcher/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8-
<PreActions>
9-
<ExecutionAction
10-
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11-
<ActionContent
12-
title = "Run Prepare Flutter Framework Script"
13-
scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
14-
<EnvironmentBuildable>
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
18-
BuildableName = "url_launcher_example_example.app"
19-
BlueprintName = "Runner"
20-
ReferencedContainer = "container:Runner.xcodeproj">
21-
</BuildableReference>
22-
</EnvironmentBuildable>
23-
</ActionContent>
24-
</ExecutionAction>
25-
</PreActions>
268
<BuildActionEntries>
279
<BuildActionEntry
2810
buildForTesting = "YES"

‎packages/url_launcher/url_launcher/example/macos/Runner/AppDelegate.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
import Cocoa
66
import FlutterMacOS
77

8-
@main
8+
@NSApplicationMain
99
class AppDelegate: FlutterAppDelegate {
1010
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
1111
return true
1212
}
13-
14-
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
15-
return true
16-
}
1713
}

0 commit comments

Comments
 (0)