Skip to content

Always re-copy Framework/podspec for iOS module project #45877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonahwilliams merged 4 commits into from
Dec 10, 2019
Merged

Always re-copy Framework/podspec for iOS module project #45877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fceb6a5
always re-copy Framework/podspec
Dec 2, 2019
b45b676
re-enable test to see if it works
Dec 5, 2019
92a7c6c
guard project check
Dec 6, 2019
709c23c
Merge branch 'master' of github.com:flutter/flutter into module_stuffx
Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dev/bots/test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
17 changes: 17 additions & 0 deletions packages/flutter_tools/lib/src/project.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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.
Expand All @@ -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);
}
}
}

Expand Down