Skip to content

Commit 110295a

Browse files
committed
Remove OCMock from cocoapods for iOS 15
1 parent 40de5eb commit 110295a

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ target 'Runner' do
3333
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3434
target 'RunnerTests' do
3535
inherit! :search_paths
36-
37-
pod 'OCMock', '~> 3.9.1'
3836
end
3937
end
4038

packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12+
5276B9112D0C699A009C4BA0 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 5276B9102D0C699A009C4BA0 /* OCMock */; };
1213
5B5EF9A6C72A03092BDA553E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28D4666EF03E57DB7D03E916 /* Pods_RunnerTests.framework */; };
1314
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1415
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -88,6 +89,7 @@
8889
isa = PBXFrameworksBuildPhase;
8990
buildActionMask = 2147483647;
9091
files = (
92+
5276B9112D0C699A009C4BA0 /* OCMock in Frameworks */,
9193
5B5EF9A6C72A03092BDA553E /* Pods_RunnerTests.framework in Frameworks */,
9294
);
9395
runOnlyForDeploymentPostprocessing = 0;
@@ -198,6 +200,7 @@
198200
9705A1C41CF9048500538489 /* Embed Frameworks */,
199201
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
200202
BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */,
203+
A89AF444D8C8FFBE1C95B3BF /* [CP] Embed Pods Frameworks */,
201204
);
202205
buildRules = (
203206
);
@@ -219,7 +222,6 @@
219222
F7151F0C265D7ED70028CB91 /* Sources */,
220223
F7151F0D265D7ED70028CB91 /* Frameworks */,
221224
F7151F0E265D7ED70028CB91 /* Resources */,
222-
7862D82E36C37F9B7558DA5E /* [CP] Embed Pods Frameworks */,
223225
);
224226
buildRules = (
225227
);
@@ -260,7 +262,8 @@
260262
);
261263
mainGroup = 97C146E51CF9000F007C117D;
262264
packageReferences = (
263-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
265+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
266+
5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */,
264267
);
265268
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
266269
projectDirPath = "";
@@ -329,38 +332,38 @@
329332
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";
330333
showEnvVarsInLog = 0;
331334
};
332-
7862D82E36C37F9B7558DA5E /* [CP] Embed Pods Frameworks */ = {
335+
9740EEB61CF901F6004384FC /* Run Script */ = {
333336
isa = PBXShellScriptBuildPhase;
337+
alwaysOutOfDate = 1;
334338
buildActionMask = 2147483647;
335339
files = (
336340
);
337341
inputPaths = (
338-
"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh",
339-
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
340342
);
341-
name = "[CP] Embed Pods Frameworks";
343+
name = "Run Script";
342344
outputPaths = (
343-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
344345
);
345346
runOnlyForDeploymentPostprocessing = 0;
346347
shellPath = /bin/sh;
347-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n";
348-
showEnvVarsInLog = 0;
348+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
349349
};
350-
9740EEB61CF901F6004384FC /* Run Script */ = {
350+
A89AF444D8C8FFBE1C95B3BF /* [CP] Embed Pods Frameworks */ = {
351351
isa = PBXShellScriptBuildPhase;
352-
alwaysOutOfDate = 1;
353352
buildActionMask = 2147483647;
354353
files = (
355354
);
356355
inputPaths = (
356+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
357+
"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
357358
);
358-
name = "Run Script";
359+
name = "[CP] Embed Pods Frameworks";
359360
outputPaths = (
361+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
360362
);
361363
runOnlyForDeploymentPostprocessing = 0;
362364
shellPath = /bin/sh;
363-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
365+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
366+
showEnvVarsInLog = 0;
364367
};
365368
BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */ = {
366369
isa = PBXShellScriptBuildPhase;
@@ -685,13 +688,29 @@
685688
/* End XCConfigurationList section */
686689

687690
/* Begin XCLocalSwiftPackageReference section */
688-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
691+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
689692
isa = XCLocalSwiftPackageReference;
690693
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
691694
};
692695
/* End XCLocalSwiftPackageReference section */
693696

697+
/* Begin XCRemoteSwiftPackageReference section */
698+
5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */ = {
699+
isa = XCRemoteSwiftPackageReference;
700+
repositoryURL = "http://github.com/erikdoe/ocmock";
701+
requirement = {
702+
kind = revision;
703+
revision = fe1661a3efed11831a6452f4b1a0c5e6ddc08c3d;
704+
};
705+
};
706+
/* End XCRemoteSwiftPackageReference section */
707+
694708
/* Begin XCSwiftPackageProductDependency section */
709+
5276B9102D0C699A009C4BA0 /* OCMock */ = {
710+
isa = XCSwiftPackageProductDependency;
711+
package = 5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */;
712+
productName = OCMock;
713+
};
695714
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
696715
isa = XCSwiftPackageProductDependency;
697716
productName = FlutterGeneratedPluginSwiftPackage;

0 commit comments

Comments
 (0)