Skip to content

Commit 5acfca2

Browse files
andrewkolosandrewkolos
committed
build: remove macOS CocoaPods integration
1 parent 56d7932 commit 5acfca2

25 files changed

Lines changed: 10 additions & 480 deletions

‎dev_tools/catalog_gallery/linux/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
88
)
99

1010
list(APPEND FLUTTER_FFI_PLUGIN_LIST
11+
jni
1112
)
1213

1314
set(PLUGIN_BUNDLED_LIBRARIES)

‎dev_tools/catalog_gallery/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"

‎dev_tools/catalog_gallery/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"

‎dev_tools/catalog_gallery/macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ import video_player_avfoundation
1212
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1313
AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
1414
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
15-
FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
15+
VideoPlayerPlugin.register(with: registry.registrar(forPlugin: "VideoPlayerPlugin"))
1616
}

‎dev_tools/catalog_gallery/macos/Podfile‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎dev_tools/catalog_gallery/macos/Podfile.lock‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎dev_tools/catalog_gallery/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
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-
72F592F52600B12767C2AD18 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA9715FD7CFD0A5228E5FE7 /* Pods_Runner.framework */; };
3130
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
32-
824EB1A60EABBB4DB02D887D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C18ED5F736CFD340C51CCC3D /* Pods_RunnerTests.framework */; };
3331
/* End PBXBuildFile section */
3432

3533
/* Begin PBXContainerItemProxy section */
@@ -63,7 +61,6 @@
6361
/* End PBXCopyFilesBuildPhase section */
6462

6563
/* Begin PBXFileReference section */
66-
1AA9715FD7CFD0A5228E5FE7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6764
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6865
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6966
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -80,24 +77,16 @@
8077
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
8178
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8279
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
83-
43F87F912A2812D64BCF8FC2 /* 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>"; };
84-
492CF68E801DA70A60E84918 /* 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>"; };
85-
5366D251A5FFFE7FA93C7B19 /* 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>"; };
86-
6EE4E885464A0837282A7EAD /* 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>"; };
8780
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
8881
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8982
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
90-
C18ED5F736CFD340C51CCC3D /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
91-
E774C36E5DD72A65BDBA90DB /* 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>"; };
92-
F0CC54568539BA9B1D75CA8F /* 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>"; };
9383
/* End PBXFileReference section */
9484

9585
/* Begin PBXFrameworksBuildPhase section */
9686
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9787
isa = PBXFrameworksBuildPhase;
9888
buildActionMask = 2147483647;
9989
files = (
100-
824EB1A60EABBB4DB02D887D /* Pods_RunnerTests.framework in Frameworks */,
10190
);
10291
runOnlyForDeploymentPostprocessing = 0;
10392
};
@@ -106,7 +95,6 @@
10695
buildActionMask = 2147483647;
10796
files = (
10897
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
109-
72F592F52600B12767C2AD18 /* Pods_Runner.framework in Frameworks */,
11098
);
11199
runOnlyForDeploymentPostprocessing = 0;
112100
};
@@ -139,8 +127,6 @@
139127
33CEB47122A05771004F2AC0 /* Flutter */,
140128
331C80D6294CF71000263BE5 /* RunnerTests */,
141129
33CC10EE2044A3C60003C045 /* Products */,
142-
D73912EC22F37F3D000D13A0 /* Frameworks */,
143-
A946C2B3F771898574BF1559 /* Pods */,
144130
);
145131
sourceTree = "<group>";
146132
};
@@ -189,37 +175,13 @@
189175
path = Runner;
190176
sourceTree = "<group>";
191177
};
192-
A946C2B3F771898574BF1559 /* Pods */ = {
193-
isa = PBXGroup;
194-
children = (
195-
492CF68E801DA70A60E84918 /* Pods-Runner.debug.xcconfig */,
196-
6EE4E885464A0837282A7EAD /* Pods-Runner.release.xcconfig */,
197-
43F87F912A2812D64BCF8FC2 /* Pods-Runner.profile.xcconfig */,
198-
F0CC54568539BA9B1D75CA8F /* Pods-RunnerTests.debug.xcconfig */,
199-
5366D251A5FFFE7FA93C7B19 /* Pods-RunnerTests.release.xcconfig */,
200-
E774C36E5DD72A65BDBA90DB /* Pods-RunnerTests.profile.xcconfig */,
201-
);
202-
name = Pods;
203-
path = Pods;
204-
sourceTree = "<group>";
205-
};
206-
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
207-
isa = PBXGroup;
208-
children = (
209-
1AA9715FD7CFD0A5228E5FE7 /* Pods_Runner.framework */,
210-
C18ED5F736CFD340C51CCC3D /* Pods_RunnerTests.framework */,
211-
);
212-
name = Frameworks;
213-
sourceTree = "<group>";
214-
};
215178
/* End PBXGroup section */
216179

217180
/* Begin PBXNativeTarget section */
218181
331C80D4294CF70F00263BE5 /* RunnerTests */ = {
219182
isa = PBXNativeTarget;
220183
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
221184
buildPhases = (
222-
37073AD80C0F092DE9D54BCF /* [CP] Check Pods Manifest.lock */,
223185
331C80D1294CF70F00263BE5 /* Sources */,
224186
331C80D2294CF70F00263BE5 /* Frameworks */,
225187
331C80D3294CF70F00263BE5 /* Resources */,
@@ -238,7 +200,6 @@
238200
isa = PBXNativeTarget;
239201
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
240202
buildPhases = (
241-
B4F1C3F289D3895F7C4CE3E0 /* [CP] Check Pods Manifest.lock */,
242203
33CC10E92044A3C60003C045 /* Sources */,
243204
33CC10EA2044A3C60003C045 /* Frameworks */,
244205
33CC10EB2044A3C60003C045 /* Resources */,
@@ -370,50 +331,6 @@
370331
shellPath = /bin/sh;
371332
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
372333
};
373-
37073AD80C0F092DE9D54BCF /* [CP] Check Pods Manifest.lock */ = {
374-
isa = PBXShellScriptBuildPhase;
375-
buildActionMask = 2147483647;
376-
files = (
377-
);
378-
inputFileListPaths = (
379-
);
380-
inputPaths = (
381-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
382-
"${PODS_ROOT}/Manifest.lock",
383-
);
384-
name = "[CP] Check Pods Manifest.lock";
385-
outputFileListPaths = (
386-
);
387-
outputPaths = (
388-
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
389-
);
390-
runOnlyForDeploymentPostprocessing = 0;
391-
shellPath = /bin/sh;
392-
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";
393-
showEnvVarsInLog = 0;
394-
};
395-
B4F1C3F289D3895F7C4CE3E0 /* [CP] Check Pods Manifest.lock */ = {
396-
isa = PBXShellScriptBuildPhase;
397-
buildActionMask = 2147483647;
398-
files = (
399-
);
400-
inputFileListPaths = (
401-
);
402-
inputPaths = (
403-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
404-
"${PODS_ROOT}/Manifest.lock",
405-
);
406-
name = "[CP] Check Pods Manifest.lock";
407-
outputFileListPaths = (
408-
);
409-
outputPaths = (
410-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
411-
);
412-
runOnlyForDeploymentPostprocessing = 0;
413-
shellPath = /bin/sh;
414-
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";
415-
showEnvVarsInLog = 0;
416-
};
417334
/* End PBXShellScriptBuildPhase section */
418335

419336
/* Begin PBXSourcesBuildPhase section */
@@ -465,7 +382,6 @@
465382
/* Begin XCBuildConfiguration section */
466383
331C80DB294CF71000263BE5 /* Debug */ = {
467384
isa = XCBuildConfiguration;
468-
baseConfigurationReference = F0CC54568539BA9B1D75CA8F /* Pods-RunnerTests.debug.xcconfig */;
469385
buildSettings = {
470386
BUNDLE_LOADER = "$(TEST_HOST)";
471387
CURRENT_PROJECT_VERSION = 1;
@@ -480,7 +396,6 @@
480396
};
481397
331C80DC294CF71000263BE5 /* Release */ = {
482398
isa = XCBuildConfiguration;
483-
baseConfigurationReference = 5366D251A5FFFE7FA93C7B19 /* Pods-RunnerTests.release.xcconfig */;
484399
buildSettings = {
485400
BUNDLE_LOADER = "$(TEST_HOST)";
486401
CURRENT_PROJECT_VERSION = 1;
@@ -495,7 +410,6 @@
495410
};
496411
331C80DD294CF71000263BE5 /* Profile */ = {
497412
isa = XCBuildConfiguration;
498-
baseConfigurationReference = E774C36E5DD72A65BDBA90DB /* Pods-RunnerTests.profile.xcconfig */;
499413
buildSettings = {
500414
BUNDLE_LOADER = "$(TEST_HOST)";
501415
CURRENT_PROJECT_VERSION = 1;

‎dev_tools/composer/linux/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
1010
)
1111

1212
list(APPEND FLUTTER_FFI_PLUGIN_LIST
13+
jni
1314
)
1415

1516
set(PLUGIN_BUNDLED_LIBRARIES)

‎dev_tools/composer/macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1515
AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
1616
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
1717
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
18-
FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
18+
VideoPlayerPlugin.register(with: registry.registrar(forPlugin: "VideoPlayerPlugin"))
1919
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
2020
}

‎dev_tools/composer/windows/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
1111
)
1212

1313
list(APPEND FLUTTER_FFI_PLUGIN_LIST
14+
jni
1415
)
1516

1617
set(PLUGIN_BUNDLED_LIBRARIES)

0 commit comments

Comments
 (0)