Skip to content

Commit 3981595

Browse files
chrisdlanghamchrisdlangham
authored
[url_launcher] migrating iOS tests from objc to swift (#4758)
This PR converts the iOS test of the url_launcher plugin from objc to swift. *List which issues are fixed by this PR. You must list at least one issue.* flutter/flutter#119102
1 parent e656e79 commit 3981595

File tree

6 files changed

+221
-216
lines changed

6 files changed

+221
-216
lines changed

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

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1D9FF3342A90170000F89C85 /* URLLauncherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D9FF3332A90170000F89C85 /* URLLauncherTests.swift */; };
11+
1DBE6EDE2A92479000B6525C /* URLLauncherUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DBE6EDD2A92479000B6525C /* URLLauncherUITests.swift */; };
1012
2D92223F1EC1DA93007564B0 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D92223E1EC1DA93007564B0 /* GeneratedPluginRegistrant.m */; };
1113
2E37D9A274B2EACB147AC51B /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 856D0913184F79C678A42603 /* libPods-Runner.a */; };
1214
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
@@ -16,8 +18,6 @@
1618
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1719
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
1820
B8140773523F70A044426500 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 487A1B5A2ECB3E406FD62FE3 /* libPods-RunnerTests.a */; };
19-
F7151F4B26604CFB0028CB91 /* URLLauncherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F4A26604CFB0028CB91 /* URLLauncherTests.m */; };
20-
F7151F5926604D060028CB91 /* URLLauncherUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F5826604D060028CB91 /* URLLauncherUITests.m */; };
2121
/* End PBXBuildFile section */
2222

2323
/* Begin PBXContainerItemProxy section */
@@ -51,6 +51,8 @@
5151
/* End PBXCopyFilesBuildPhase section */
5252

5353
/* Begin PBXFileReference section */
54+
1D9FF3332A90170000F89C85 /* URLLauncherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLLauncherTests.swift; sourceTree = "<group>"; };
55+
1DBE6EDD2A92479000B6525C /* URLLauncherUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLLauncherUITests.swift; sourceTree = "<group>"; };
5456
2D92223D1EC1DA93007564B0 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneratedPluginRegistrant.h; path = Runner/GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
5557
2D92223E1EC1DA93007564B0 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GeneratedPluginRegistrant.m; path = Runner/GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
5658
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
@@ -72,10 +74,8 @@
7274
A84BFEE343F54B983D1B67EB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
7375
D25C434271ACF6555E002440 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
7476
F7151F4826604CFB0028CB91 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
75-
F7151F4A26604CFB0028CB91 /* URLLauncherTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = URLLauncherTests.m; sourceTree = "<group>"; };
7677
F7151F4C26604CFB0028CB91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7778
F7151F5626604D060028CB91 /* RunnerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
78-
F7151F5826604D060028CB91 /* URLLauncherUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = URLLauncherUITests.m; sourceTree = "<group>"; };
7979
F7151F5A26604D060028CB91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8080
/* End PBXFileReference section */
8181

@@ -187,17 +187,17 @@
187187
F7151F4926604CFB0028CB91 /* RunnerTests */ = {
188188
isa = PBXGroup;
189189
children = (
190-
F7151F4A26604CFB0028CB91 /* URLLauncherTests.m */,
191190
F7151F4C26604CFB0028CB91 /* Info.plist */,
191+
1D9FF3332A90170000F89C85 /* URLLauncherTests.swift */,
192192
);
193193
path = RunnerTests;
194194
sourceTree = "<group>";
195195
};
196196
F7151F5726604D060028CB91 /* RunnerUITests */ = {
197197
isa = PBXGroup;
198198
children = (
199-
F7151F5826604D060028CB91 /* URLLauncherUITests.m */,
200199
F7151F5A26604D060028CB91 /* Info.plist */,
200+
1DBE6EDD2A92479000B6525C /* URLLauncherUITests.swift */,
201201
);
202202
path = RunnerUITests;
203203
sourceTree = "<group>";
@@ -351,7 +351,7 @@
351351
);
352352
runOnlyForDeploymentPostprocessing = 0;
353353
shellPath = /bin/sh;
354-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
354+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
355355
};
356356
9740EEB61CF901F6004384FC /* Run Script */ = {
357357
isa = PBXShellScriptBuildPhase;
@@ -366,7 +366,7 @@
366366
);
367367
runOnlyForDeploymentPostprocessing = 0;
368368
shellPath = /bin/sh;
369-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
369+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
370370
};
371371
AB1344B0443C71CD721E1BB7 /* [CP] Check Pods Manifest.lock */ = {
372372
isa = PBXShellScriptBuildPhase;
@@ -425,15 +425,15 @@
425425
isa = PBXSourcesBuildPhase;
426426
buildActionMask = 2147483647;
427427
files = (
428-
F7151F4B26604CFB0028CB91 /* URLLauncherTests.m in Sources */,
428+
1D9FF3342A90170000F89C85 /* URLLauncherTests.swift in Sources */,
429429
);
430430
runOnlyForDeploymentPostprocessing = 0;
431431
};
432432
F7151F5226604D060028CB91 /* Sources */ = {
433433
isa = PBXSourcesBuildPhase;
434434
buildActionMask = 2147483647;
435435
files = (
436-
F7151F5926604D060028CB91 /* URLLauncherUITests.m in Sources */,
436+
1DBE6EDE2A92479000B6525C /* URLLauncherUITests.swift in Sources */,
437437
);
438438
runOnlyForDeploymentPostprocessing = 0;
439439
};
@@ -589,7 +589,10 @@
589589
"$(PROJECT_DIR)/Flutter",
590590
);
591591
INFOPLIST_FILE = Runner/Info.plist;
592-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
592+
LD_RUNPATH_SEARCH_PATHS = (
593+
"$(inherited)",
594+
"@executable_path/Frameworks",
595+
);
593596
LIBRARY_SEARCH_PATHS = (
594597
"$(inherited)",
595598
"$(PROJECT_DIR)/Flutter",
@@ -610,7 +613,10 @@
610613
"$(PROJECT_DIR)/Flutter",
611614
);
612615
INFOPLIST_FILE = Runner/Info.plist;
613-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
616+
LD_RUNPATH_SEARCH_PATHS = (
617+
"$(inherited)",
618+
"@executable_path/Frameworks",
619+
);
614620
LIBRARY_SEARCH_PATHS = (
615621
"$(inherited)",
616622
"$(PROJECT_DIR)/Flutter",
@@ -627,10 +633,15 @@
627633
BUNDLE_LOADER = "$(TEST_HOST)";
628634
CODE_SIGN_STYLE = Automatic;
629635
INFOPLIST_FILE = RunnerTests/Info.plist;
630-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
636+
LD_RUNPATH_SEARCH_PATHS = (
637+
"$(inherited)",
638+
"@executable_path/Frameworks",
639+
"@loader_path/Frameworks",
640+
);
631641
MTL_FAST_MATH = YES;
632642
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
633643
PRODUCT_NAME = "$(TARGET_NAME)";
644+
SWIFT_VERSION = 5.0;
634645
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
635646
};
636647
name = Debug;
@@ -642,10 +653,15 @@
642653
BUNDLE_LOADER = "$(TEST_HOST)";
643654
CODE_SIGN_STYLE = Automatic;
644655
INFOPLIST_FILE = RunnerTests/Info.plist;
645-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
656+
LD_RUNPATH_SEARCH_PATHS = (
657+
"$(inherited)",
658+
"@executable_path/Frameworks",
659+
"@loader_path/Frameworks",
660+
);
646661
MTL_FAST_MATH = YES;
647662
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
648663
PRODUCT_NAME = "$(TARGET_NAME)";
664+
SWIFT_VERSION = 5.0;
649665
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
650666
};
651667
name = Release;
@@ -655,10 +671,15 @@
655671
buildSettings = {
656672
CODE_SIGN_STYLE = Automatic;
657673
INFOPLIST_FILE = RunnerUITests/Info.plist;
658-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
674+
LD_RUNPATH_SEARCH_PATHS = (
675+
"$(inherited)",
676+
"@executable_path/Frameworks",
677+
"@loader_path/Frameworks",
678+
);
659679
MTL_FAST_MATH = YES;
660680
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests;
661681
PRODUCT_NAME = "$(TARGET_NAME)";
682+
SWIFT_VERSION = 5.0;
662683
TEST_TARGET_NAME = Runner;
663684
};
664685
name = Debug;
@@ -668,10 +689,15 @@
668689
buildSettings = {
669690
CODE_SIGN_STYLE = Automatic;
670691
INFOPLIST_FILE = RunnerUITests/Info.plist;
671-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
692+
LD_RUNPATH_SEARCH_PATHS = (
693+
"$(inherited)",
694+
"@executable_path/Frameworks",
695+
"@loader_path/Frameworks",
696+
);
672697
MTL_FAST_MATH = YES;
673698
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerUITests;
674699
PRODUCT_NAME = "$(TARGET_NAME)";
700+
SWIFT_VERSION = 5.0;
675701
TEST_TARGET_NAME = Runner;
676702
};
677703
name = Release;

‎packages/url_launcher/url_launcher_ios/example/ios/RunnerTests/URLLauncherTests.m

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

0 commit comments

Comments
 (0)