Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
023532d9
Unverified
Commit
023532d9
authored
4 years ago
by
Jenn Magder
Committed by
GitHub
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Build iOS apps using Swift Packages (#59009)" (#59025)
This reverts commit
43e28084
.
parent
ef3b9922
Changes
35
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
69 additions
and
250 deletions
+69
-250
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
ios_app_with_extensions_test.dart
dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
+5
-5
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
project.pbxproj
...iver_screenshot_test/ios/Runner.xcodeproj/project.pbxproj
+0
-5
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
README.md
dev/integration_tests/ios_app_with_extensions/README.md
+0
-1
project.pbxproj
..._app_with_extensions/ios/Runner.xcodeproj/project.pbxproj
+1
-28
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
Package.resolved
...project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+0
-16
Package.resolved
.../Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
+0
-16
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+4
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+4
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+4
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
mac.dart
packages/flutter_tools/lib/src/ios/mac.dart
+0
-2
ios_migrator.dart
...es/flutter_tools/lib/src/ios/migrations/ios_migrator.dart
+1
-15
project_build_location_migration.dart
.../src/ios/migrations/project_build_location_migration.dart
+0
-49
project.dart
packages/flutter_tools/lib/src/project.dart
+0
-5
contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1
-1
contents.xcworkspacedata
...odeproj.tmpl/project.xcworkspace/contents.xcworkspacedata
+1
-1
ios_project_migration_test.dart
...ls/test/general.shard/ios/ios_project_migration_test.dart
+29
-84
No files found.
dev/benchmarks/macrobenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/benchmarks/test_apps/stocks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
View file @
023532d9
...
@@ -12,7 +12,7 @@ import 'package:path/path.dart' as path;
...
@@ -12,7 +12,7 @@ import 'package:path/path.dart' as path;
Future
<
void
>
main
()
async
{
Future
<
void
>
main
()
async
{
await
task
(()
async
{
await
task
(()
async
{
section
(
'Copy
app with watchOS companion and Swift Package
'
);
section
(
'Copy
test Flutter App with WatchOS Companion
'
);
String
watchDeviceID
;
String
watchDeviceID
;
String
phoneDeviceID
;
String
phoneDeviceID
;
...
@@ -47,7 +47,7 @@ Future<void> main() async {
...
@@ -47,7 +47,7 @@ Future<void> main() async {
if
(!
appReleaseBuilt
)
{
if
(!
appReleaseBuilt
)
{
return
TaskResult
.
failure
(
return
TaskResult
.
failure
(
'Failed to build flutter iOS app with
watchOS companion and Swift Package
in release mode.'
);
'Failed to build flutter iOS app with
WatchOS companion
in release mode.'
);
}
}
section
(
'Create debug build'
);
section
(
'Create debug build'
);
...
@@ -69,7 +69,7 @@ Future<void> main() async {
...
@@ -69,7 +69,7 @@ Future<void> main() async {
if
(!
appDebugBuilt
)
{
if
(!
appDebugBuilt
)
{
return
TaskResult
.
failure
(
return
TaskResult
.
failure
(
'Failed to build flutter iOS app with
watchOS companion and Swift Package
in debug mode.'
);
'Failed to build flutter iOS app with
WatchOS companion
in debug mode.'
);
}
}
section
(
'Create build for a simulator device'
);
section
(
'Create build for a simulator device'
);
...
@@ -183,7 +183,7 @@ Future<void> main() async {
...
@@ -183,7 +183,7 @@ Future<void> main() async {
if
(!
appSimulatorBuilt
)
{
if
(!
appSimulatorBuilt
)
{
return
TaskResult
.
failure
(
return
TaskResult
.
failure
(
'Failed to build flutter iOS app with
watchOS companion and Swift Package
in debug mode for simulated device.'
);
'Failed to build flutter iOS app with
WatchOS companion
in debug mode for simulated device.'
);
}
}
section
(
'Run app on simulator device'
);
section
(
'Run app on simulator device'
);
...
@@ -229,7 +229,7 @@ Future<void> main() async {
...
@@ -229,7 +229,7 @@ Future<void> main() async {
if
(
exitCode
!=
0
)
if
(
exitCode
!=
0
)
return
TaskResult
.
failure
(
return
TaskResult
.
failure
(
'Failed to start flutter iOS app with
watchOS companion and Swift Package
on simulated device.'
);
'Failed to start flutter iOS app with
WatchOS companion
on simulated device.'
);
return
TaskResult
.
success
(
null
);
return
TaskResult
.
success
(
null
);
}
catch
(
e
)
{
}
catch
(
e
)
{
...
...
This diff is collapsed.
Click to expand it.
dev/integration_tests/channels/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/external_ui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/flavors/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/flutter_driver_screenshot_test/ios/Runner.xcodeproj/project.pbxproj
View file @
023532d9
...
@@ -262,14 +262,9 @@
...
@@ -262,14 +262,9 @@
files
=
(
files
=
(
);
);
inputPaths
=
(
inputPaths
=
(
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh"
,
"${PODS_ROOT}/../Flutter/Flutter.framework"
,
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework"
,
);
);
name
=
"[CP] Embed Pods Frameworks"
;
name
=
"[CP] Embed Pods Frameworks"
;
outputPaths
=
(
outputPaths
=
(
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework"
,
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework"
,
);
);
runOnlyForDeploymentPostprocessing
=
0
;
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellPath
=
/bin/sh
;
...
...
This diff is collapsed.
Click to expand it.
dev/integration_tests/flutter_driver_screenshot_test/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/flutter_gallery/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_app_with_extensions/README.md
View file @
023532d9
...
@@ -3,4 +3,3 @@
...
@@ -3,4 +3,3 @@
Integration test to test building an iOS app with
Integration test to test building an iOS app with
non-Flutter features:
non-Flutter features:
-
watchOS app and extension
-
watchOS app and extension
-
Swift Package
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj
View file @
023532d9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
archiveVersion
=
1
;
archiveVersion
=
1
;
classes
=
{
classes
=
{
};
};
objectVersion
=
5
2
;
objectVersion
=
5
0
;
objects
=
{
objects
=
{
/* Begin PBXBuildFile section */
/* Begin PBXBuildFile section */
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
97C146FC1CF9000F007C117D
/* Main.storyboard in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FA1CF9000F007C117D
/* Main.storyboard */
;
};
97C146FC1CF9000F007C117D
/* Main.storyboard in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FA1CF9000F007C117D
/* Main.storyboard */
;
};
97C146FE1CF9000F007C117D
/* Assets.xcassets in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FD1CF9000F007C117D
/* Assets.xcassets */
;
};
97C146FE1CF9000F007C117D
/* Assets.xcassets in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FD1CF9000F007C117D
/* Assets.xcassets */
;
};
97C147011CF9000F007C117D
/* LaunchScreen.storyboard in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FF1CF9000F007C117D
/* LaunchScreen.storyboard */
;
};
97C147011CF9000F007C117D
/* LaunchScreen.storyboard in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
97C146FF1CF9000F007C117D
/* LaunchScreen.storyboard */
;
};
F735C5C42485E50A002BE868
/* PlayingCard in Frameworks */
=
{
isa
=
PBXBuildFile
;
productRef
=
F735C5C32485E50A002BE868
/* PlayingCard */
;
};
/* End PBXBuildFile section */
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
/* Begin PBXContainerItemProxy section */
...
@@ -116,7 +115,6 @@
...
@@ -116,7 +115,6 @@
isa
=
PBXFrameworksBuildPhase
;
isa
=
PBXFrameworksBuildPhase
;
buildActionMask
=
2147483647
;
buildActionMask
=
2147483647
;
files
=
(
files
=
(
F735C5C42485E50A002BE868
/* PlayingCard in Frameworks */
,
);
);
runOnlyForDeploymentPostprocessing
=
0
;
runOnlyForDeploymentPostprocessing
=
0
;
};
};
...
@@ -264,9 +262,6 @@
...
@@ -264,9 +262,6 @@
49C15B68243E340F0025F804
/* PBXTargetDependency */
,
49C15B68243E340F0025F804
/* PBXTargetDependency */
,
);
);
name
=
Runner
;
name
=
Runner
;
packageProductDependencies
=
(
F735C5C32485E50A002BE868
/* PlayingCard */
,
);
productName
=
Runner
;
productName
=
Runner
;
productReference
=
97C146EE1CF9000F007C117D
/* Runner.app */
;
productReference
=
97C146EE1CF9000F007C117D
/* Runner.app */
;
productType
=
"com.apple.product-type.application"
;
productType
=
"com.apple.product-type.application"
;
...
@@ -302,9 +297,6 @@
...
@@ -302,9 +297,6 @@
Base
,
Base
,
);
);
mainGroup
=
97C146E51CF9000F007C117D
;
mainGroup
=
97C146E51CF9000F007C117D
;
packageReferences
=
(
F735C5C22485E50A002BE868
/* XCRemoteSwiftPackageReference "example-package-playingcard" */
,
);
productRefGroup
=
97C146EF1CF9000F007C117D
/* Products */
;
productRefGroup
=
97C146EF1CF9000F007C117D
/* Products */
;
projectDirPath
=
""
;
projectDirPath
=
""
;
projectRoot
=
""
;
projectRoot
=
""
;
...
@@ -915,25 +907,6 @@
...
@@ -915,25 +907,6 @@
defaultConfigurationName
=
Release
;
defaultConfigurationName
=
Release
;
};
};
/* End XCConfigurationList section */
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
F735C5C22485E50A002BE868
/* XCRemoteSwiftPackageReference "example-package-playingcard" */
=
{
isa
=
XCRemoteSwiftPackageReference
;
repositoryURL
=
"https://github.com/apple/example-package-playingcard.git"
;
requirement
=
{
kind
=
upToNextMajorVersion
;
minimumVersion
=
3.0.5
;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
F735C5C32485E50A002BE868
/* PlayingCard */
=
{
isa
=
XCSwiftPackageProductDependency
;
package
=
F735C5C22485E50A002BE868
/* XCRemoteSwiftPackageReference "example-package-playingcard" */
;
productName
=
PlayingCard
;
};
/* End XCSwiftPackageProductDependency section */
};
};
rootObject
=
97C146E61CF9000F007C117D
/* Project object */
;
rootObject
=
97C146E61CF9000F007C117D
/* Project object */
;
}
}
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
deleted
100644 → 0
View file @
ef3b9922
{
"object": {
"pins": [
{
"package": "PlayingCard",
"repositoryURL": "https://github.com/apple/example-package-playingcard.git",
"state": {
"branch": null,
"revision": "39ddabb01e8102ab548a8c6bb3eb20b15f3b4fbc",
"version": "3.0.5"
}
}
]
},
"version": 1
}
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
deleted
100644 → 0
View file @
ef3b9922
{
"object": {
"pins": [
{
"package": "PlayingCard",
"repositoryURL": "https://github.com/apple/example-package-playingcard.git",
"state": {
"branch": null,
"revision": "39ddabb01e8102ab548a8c6bb3eb20b15f3b4fbc",
"version": "3.0.5"
}
}
]
},
"version": 1
}
This diff is collapsed.
Click to expand it.
dev/integration_tests/ios_platform_view_tests/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/non_nullable/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/platform_interaction/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/release_smoke_test/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/integration_tests/ui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"self:"
>
location =
"group:Runner.xcodeproj"
>
</FileRef>
<FileRef
location =
"group:Pods/Pods.xcodeproj"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
dev/manual_tests/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/catalog/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"self:"
>
location =
"group:Runner.xcodeproj"
>
</FileRef>
<FileRef
location =
"group:Pods/Pods.xcodeproj"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/flutter_view/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"self:"
>
location =
"group:Runner.xcodeproj"
>
</FileRef>
<FileRef
location =
"group:Pods/Pods.xcodeproj"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/hello_world/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/image_list/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/layers/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/platform_channel/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/platform_channel_swift/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
examples/platform_view/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/ios/mac.dart
View file @
023532d9
...
@@ -26,7 +26,6 @@ import '../reporting/reporting.dart';
...
@@ -26,7 +26,6 @@ import '../reporting/reporting.dart';
import
'code_signing.dart'
;
import
'code_signing.dart'
;
import
'migrations/ios_migrator.dart'
;
import
'migrations/ios_migrator.dart'
;
import
'migrations/project_base_configuration_migration.dart'
;
import
'migrations/project_base_configuration_migration.dart'
;
import
'migrations/project_build_location_migration.dart'
;
import
'migrations/remove_framework_link_and_embedding_migration.dart'
;
import
'migrations/remove_framework_link_and_embedding_migration.dart'
;
import
'migrations/xcode_build_system_migration.dart'
;
import
'migrations/xcode_build_system_migration.dart'
;
import
'xcodeproj.dart'
;
import
'xcodeproj.dart'
;
...
@@ -98,7 +97,6 @@ Future<XcodeBuildResult> buildXcodeProject({
...
@@ -98,7 +97,6 @@ Future<XcodeBuildResult> buildXcodeProject({
RemoveFrameworkLinkAndEmbeddingMigration
(
app
.
project
,
globals
.
logger
,
globals
.
xcode
,
globals
.
flutterUsage
),
RemoveFrameworkLinkAndEmbeddingMigration
(
app
.
project
,
globals
.
logger
,
globals
.
xcode
,
globals
.
flutterUsage
),
XcodeBuildSystemMigration
(
app
.
project
,
globals
.
logger
),
XcodeBuildSystemMigration
(
app
.
project
,
globals
.
logger
),
ProjectBaseConfigurationMigration
(
app
.
project
,
globals
.
logger
),
ProjectBaseConfigurationMigration
(
app
.
project
,
globals
.
logger
),
ProjectBuildLocationMigration
(
app
.
project
,
globals
.
logger
),
];
];
final
IOSMigration
migration
=
IOSMigration
(
migrators
);
final
IOSMigration
migration
=
IOSMigration
(
migrators
);
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/ios/migrations/ios_migrator.dart
View file @
023532d9
...
@@ -26,13 +26,6 @@ abstract class IOSMigrator {
...
@@ -26,13 +26,6 @@ abstract class IOSMigrator {
}
}
@protected
@protected
String
migrateFileContents
(
String
fileContents
)
{
return
fileContents
;
}
@protected
/// Calls [migrateLine] per line, then [migrateFileContents]
/// including the line migrations.
void
processFileLines
(
File
file
)
{
void
processFileLines
(
File
file
)
{
final
List
<
String
>
lines
=
file
.
readAsLinesSync
();
final
List
<
String
>
lines
=
file
.
readAsLinesSync
();
...
@@ -58,16 +51,9 @@ abstract class IOSMigrator {
...
@@ -58,16 +51,9 @@ abstract class IOSMigrator {
newProjectContents
.
writeln
(
newProjectLine
);
newProjectContents
.
writeln
(
newProjectLine
);
}
}
final
String
projectContentsWithMigratedLines
=
newProjectContents
.
toString
();
final
String
projectContentsWithMigratedContents
=
migrateFileContents
(
projectContentsWithMigratedLines
);
if
(
projectContentsWithMigratedLines
!=
projectContentsWithMigratedContents
)
{
logger
.
printTrace
(
'Migrating
$basename
contents'
);
migrationRequired
=
true
;
}
if
(
migrationRequired
)
{
if
(
migrationRequired
)
{
logger
.
printStatus
(
'Upgrading
$basename
'
);
logger
.
printStatus
(
'Upgrading
$basename
'
);
file
.
writeAsStringSync
(
projectContentsWithMigratedContents
);
file
.
writeAsStringSync
(
newProjectContents
.
toString
()
);
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/ios/migrations/project_build_location_migration.dart
deleted
100644 → 0
View file @
ef3b9922
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'../../base/file_system.dart'
;
import
'../../base/logger.dart'
;
import
'../../project.dart'
;
import
'ios_migrator.dart'
;
// Update the xcodeproj build location. Legacy build location does not work with Swift Packages.
class
ProjectBuildLocationMigration
extends
IOSMigrator
{
ProjectBuildLocationMigration
(
IosProject
project
,
Logger
logger
,
)
:
_xcodeProjectWorkspaceData
=
project
.
xcodeProjectWorkspaceData
,
super
(
logger
);
final
File
_xcodeProjectWorkspaceData
;
@override
bool
migrate
()
{
if
(!
_xcodeProjectWorkspaceData
.
existsSync
())
{
logger
.
printTrace
(
'Xcode project workspace data not found, skipping build location migration.'
);
return
true
;
}
processFileLines
(
_xcodeProjectWorkspaceData
);
return
true
;
}
@override
String
migrateLine
(
String
line
)
{
const
String
legacyBuildLocation
=
'location = "group:Runner.xcodeproj"'
;
const
String
defaultBuildLocation
=
'location = "self:"'
;
return
line
.
replaceAll
(
legacyBuildLocation
,
defaultBuildLocation
);
}
@override
String
migrateFileContents
(
String
fileContents
)
{
const
String
podLocation
=
'''
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
'''
;
return
fileContents
.
replaceAll
(
podLocation
,
''
);
}
}
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/project.dart
View file @
023532d9
...
@@ -398,11 +398,6 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
...
@@ -398,11 +398,6 @@ class IosProject extends FlutterProjectPlatform implements XcodeBasedProject {
@override
@override
File get xcodeProjectInfoFile => xcodeProject.childFile('
project
.
pbxproj
');
File get xcodeProjectInfoFile => xcodeProject.childFile('
project
.
pbxproj
');
File get xcodeProjectWorkspaceData =>
xcodeProject
.childDirectory('
project
.
xcworkspace
')
.childFile('
contents
.
xcworkspacedata
');
@override
@override
Directory get xcodeWorkspace => hostAppRoot.childDirectory('
$_hostAppProjectName
.
xcworkspace
');
Directory get xcodeWorkspace => hostAppRoot.childDirectory('
$_hostAppProjectName
.
xcworkspace
');
...
...
This diff is collapsed.
Click to expand it.
packages/flutter_tools/templates/app/ios.tmpl/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.xcodeproj.tmpl/project.xcworkspace/contents.xcworkspacedata
View file @
023532d9
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
<Workspace
<Workspace
version =
"1.0"
>
version =
"1.0"
>
<FileRef
<FileRef
location =
"
self:
"
>
location =
"
group:Runner.xcodeproj
"
>
</FileRef>
</FileRef>
</Workspace>
</Workspace>
This diff is collapsed.
Click to expand it.
packages/flutter_tools/test/general.shard/ios/ios_project_migration_test.dart
View file @
023532d9
...
@@ -5,9 +5,10 @@
...
@@ -5,9 +5,10 @@
import
'package:file/file.dart'
;
import
'package:file/file.dart'
;
import
'package:file/memory.dart'
;
import
'package:file/memory.dart'
;
import
'package:flutter_tools/src/base/logger.dart'
;
import
'package:flutter_tools/src/base/logger.dart'
;
import
'package:flutter_tools/src/base/platform.dart'
;
import
'package:flutter_tools/src/base/terminal.dart'
;
import
'package:flutter_tools/src/ios/migrations/ios_migrator.dart'
;
import
'package:flutter_tools/src/ios/migrations/ios_migrator.dart'
;
import
'package:flutter_tools/src/ios/migrations/project_base_configuration_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/project_base_configuration_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/project_build_location_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/remove_framework_link_and_embedding_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/remove_framework_link_and_embedding_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/xcode_build_system_migration.dart'
;
import
'package:flutter_tools/src/ios/migrations/xcode_build_system_migration.dart'
;
import
'package:flutter_tools/src/macos/xcode.dart'
;
import
'package:flutter_tools/src/macos/xcode.dart'
;
...
@@ -48,7 +49,15 @@ void main () {
...
@@ -48,7 +49,15 @@ void main () {
memoryFileSystem
=
MemoryFileSystem
();
memoryFileSystem
=
MemoryFileSystem
();
mockXcode
=
MockXcode
();
mockXcode
=
MockXcode
();
xcodeProjectInfoFile
=
memoryFileSystem
.
file
(
'project.pbxproj'
);
xcodeProjectInfoFile
=
memoryFileSystem
.
file
(
'project.pbxproj'
);
testLogger
=
BufferLogger
.
test
();
testLogger
=
BufferLogger
(
terminal:
AnsiTerminal
(
stdio:
null
,
platform:
const
LocalPlatform
(),
),
outputPreferences:
OutputPreferences
.
test
(),
);
mockIosProject
=
MockIosProject
();
mockIosProject
=
MockIosProject
();
when
(
mockIosProject
.
xcodeProjectInfoFile
).
thenReturn
(
xcodeProjectInfoFile
);
when
(
mockIosProject
.
xcodeProjectInfoFile
).
thenReturn
(
xcodeProjectInfoFile
);
});
});
...
@@ -259,7 +268,15 @@ keep this 2
...
@@ -259,7 +268,15 @@ keep this 2
setUp
(()
{
setUp
(()
{
memoryFileSystem
=
MemoryFileSystem
();
memoryFileSystem
=
MemoryFileSystem
();
xcodeWorkspaceSharedSettings
=
memoryFileSystem
.
file
(
'WorkspaceSettings.xcsettings'
);
xcodeWorkspaceSharedSettings
=
memoryFileSystem
.
file
(
'WorkspaceSettings.xcsettings'
);
testLogger
=
BufferLogger
.
test
();
testLogger
=
BufferLogger
(
terminal:
AnsiTerminal
(
stdio:
null
,
platform:
const
LocalPlatform
(),
),
outputPreferences:
OutputPreferences
.
test
(),
);
mockIosProject
=
MockIosProject
();
mockIosProject
=
MockIosProject
();
when
(
mockIosProject
.
xcodeWorkspaceSharedSettings
).
thenReturn
(
xcodeWorkspaceSharedSettings
);
when
(
mockIosProject
.
xcodeWorkspaceSharedSettings
).
thenReturn
(
xcodeWorkspaceSharedSettings
);
});
});
...
@@ -322,86 +339,6 @@ keep this 2
...
@@ -322,86 +339,6 @@ keep this 2
});
});
});
});
group
(
'Xcode default build location'
,
()
{
MemoryFileSystem
memoryFileSystem
;
BufferLogger
testLogger
;
MockIosProject
mockIosProject
;
File
xcodeProjectWorkspaceData
;
setUp
(()
{
memoryFileSystem
=
MemoryFileSystem
();
xcodeProjectWorkspaceData
=
memoryFileSystem
.
file
(
'contents.xcworkspacedata'
);
testLogger
=
BufferLogger
.
test
();
mockIosProject
=
MockIosProject
();
when
(
mockIosProject
.
xcodeProjectWorkspaceData
).
thenReturn
(
xcodeProjectWorkspaceData
);
});
testWithoutContext
(
'skipped if files are missing'
,
()
{
final
ProjectBuildLocationMigration
iosProjectMigration
=
ProjectBuildLocationMigration
(
mockIosProject
,
testLogger
,
);
expect
(
iosProjectMigration
.
migrate
(),
isTrue
);
expect
(
xcodeProjectWorkspaceData
.
existsSync
(),
isFalse
);
expect
(
testLogger
.
traceText
,
contains
(
'Xcode project workspace data not found, skipping build location migration.'
));
expect
(
testLogger
.
statusText
,
isEmpty
);
});
testWithoutContext
(
'skipped if nothing to upgrade'
,
()
{
const
String
contents
=
'''
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>'''
;
xcodeProjectWorkspaceData
.
writeAsStringSync
(
contents
);
final
ProjectBuildLocationMigration
iosProjectMigration
=
ProjectBuildLocationMigration
(
mockIosProject
,
testLogger
,
);
expect
(
iosProjectMigration
.
migrate
(),
isTrue
);
expect
(
xcodeProjectWorkspaceData
.
existsSync
(),
isTrue
);
expect
(
testLogger
.
statusText
,
isEmpty
);
});
testWithoutContext
(
'Xcode project is migrated'
,
()
{
const
String
contents
=
'''
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:Runner.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
'''
;
xcodeProjectWorkspaceData
.
writeAsStringSync
(
contents
);
final
ProjectBuildLocationMigration
iosProjectMigration
=
ProjectBuildLocationMigration
(
mockIosProject
,
testLogger
,
);
expect
(
iosProjectMigration
.
migrate
(),
isTrue
);
expect
(
xcodeProjectWorkspaceData
.
readAsStringSync
(),
'''
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>
'''
);
expect
(
testLogger
.
statusText
,
contains
(
'Upgrading contents.xcworkspacedata'
));
});
});
group
(
'remove Runner project base configuration'
,
()
{
group
(
'remove Runner project base configuration'
,
()
{
MemoryFileSystem
memoryFileSystem
;
MemoryFileSystem
memoryFileSystem
;
BufferLogger
testLogger
;
BufferLogger
testLogger
;
...
@@ -411,7 +348,15 @@ keep this 2
...
@@ -411,7 +348,15 @@ keep this 2
setUp
(()
{
setUp
(()
{
memoryFileSystem
=
MemoryFileSystem
();
memoryFileSystem
=
MemoryFileSystem
();
xcodeProjectInfoFile
=
memoryFileSystem
.
file
(
'project.pbxproj'
);
xcodeProjectInfoFile
=
memoryFileSystem
.
file
(
'project.pbxproj'
);
testLogger
=
BufferLogger
.
test
();
testLogger
=
BufferLogger
(
terminal:
AnsiTerminal
(
stdio:
null
,
platform:
const
LocalPlatform
(),
),
outputPreferences:
OutputPreferences
.
test
(),
);
mockIosProject
=
MockIosProject
();
mockIosProject
=
MockIosProject
();
when
(
mockIosProject
.
xcodeProjectInfoFile
).
thenReturn
(
xcodeProjectInfoFile
);
when
(
mockIosProject
.
xcodeProjectInfoFile
).
thenReturn
(
xcodeProjectInfoFile
);
});
});
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment