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
523ac7b6
Unverified
Commit
523ac7b6
authored
Dec 10, 2019
by
Jonah Williams
Committed by
GitHub
Dec 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tool] Always re-copy Framework/podspec when regenerating iOS module project (#45877)
parent
250cd92d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
test.dart
dev/bots/test.dart
+1
-2
project.dart
packages/flutter_tools/lib/src/project.dart
+17
-0
No files found.
dev/bots/test.dart
View file @
523ac7b6
...
...
@@ -775,8 +775,7 @@ Future<void> _runHostOnlyDeviceLabTests() async {
()
=>
_runDevicelabTest
(
'module_test'
,
environment:
gradleEnvironment
,
testEmbeddingV2:
true
),
()
=>
_runDevicelabTest
(
'plugin_dependencies_test'
,
environment:
gradleEnvironment
),
// TODO(jmagman): Re-enable once flakiness is resolved, https://github.com/flutter/flutter/issues/37525
// if (Platform.isMacOS) () => _runDevicelabTest('module_test_ios'),
if
(
Platform
.
isMacOS
)
()
=>
_runDevicelabTest
(
'module_test_ios'
),
if
(
Platform
.
isMacOS
)
()
=>
_runDevicelabTest
(
'build_ios_framework_module_test'
),
if
(
Platform
.
isMacOS
)
()
=>
_runDevicelabTest
(
'plugin_lint_mac'
),
()
=>
_runDevicelabTest
(
'plugin_test'
,
environment:
gradleEnvironment
),
...
...
packages/flutter_tools/lib/src/project.dart
View file @
523ac7b6
...
...
@@ -9,6 +9,7 @@ import 'package:xml/xml.dart' as xml;
import
'package:yaml/yaml.dart'
;
import
'android/gradle_utils.dart'
as
gradle
;
import
'artifacts.dart'
;
import
'base/common.dart'
;
import
'base/context.dart'
;
import
'base/file_system.dart'
;
...
...
@@ -456,6 +457,11 @@ class IosProject implements XcodeBasedProject {
if (!pubspecChanged && !toolingChanged) {
return;
}
final Directory engineDest = ephemeralDirectory
.childDirectory('
Flutter
')
.childDirectory('
engine
');
_deleteIfExistsSync(ephemeralDirectory);
_overwriteFromTemplate(fs.path.join('
module
', '
ios
', '
library
'), ephemeralDirectory);
// Add ephemeral host app, if a editable host app does not already exist.
...
...
@@ -464,6 +470,17 @@ class IosProject implements XcodeBasedProject {
if (hasPlugins(parent)) {
_overwriteFromTemplate(fs.path.join('
module
', '
ios
', '
host_app_ephemeral_cocoapods
'), ephemeralDirectory);
}
// Copy podspec and framework from engine cache. The actual build mode
// doesn'
t
actually
matter
as
it
will
be
overwritten
by
xcode_backend
.
sh
.
// However, cocoapods will run before that script and requires something
// to be in this location.
final
Directory
framework
=
fs
.
directory
(
artifacts
.
getArtifactPath
(
Artifact
.
flutterFramework
,
platform:
TargetPlatform
.
ios
,
mode:
BuildMode
.
debug
));
if
(
framework
.
existsSync
())
{
final
File
podspec
=
framework
.
parent
.
childFile
(
'Flutter.podspec'
);
copyDirectorySync
(
framework
,
engineDest
.
childDirectory
(
'Flutter.framework'
));
podspec
.
copySync
(
engineDest
.
childFile
(
'Flutter.podspec'
).
path
);
}
}
}
...
...
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