Skip to content

Update build for canary 11 #3380

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
merged 1 commit into from
Apr 18, 2019
Merged

Update build for canary 11 #3380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions flutter-studio/flutter-studio.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,8 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="library" name="protobuf" level="project" />
<orderEntry type="module" module-name="intellij.android.projectSystem.tests" />
<orderEntry type="library" name="com.android.tools.analytics-library:protos" level="project" />
<orderEntry type="library" name="com.android.tools:sdk-common" level="project" />
<orderEntry type="library" name="com.android.tools:annotations" level="project" />
<orderEntry type="library" name="com.android.tools:common" level="project" />
<orderEntry type="library" name="com.android.tools:repository" level="project" />
<orderEntry type="library" name="fest-swing" level="project" />
<orderEntry type="library" name="studio-analytics-proto" level="project" />
</component>
</module>
6 changes: 3 additions & 3 deletions flutter-studio/src/io/flutter/project/FlutterProjectModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class FlutterProjectModel extends WizardModel {
public FlutterProjectModel(@NotNull FlutterProjectType type) {
myProjectType.set(new OptionalValueProperty<>(type));

myCompanyDomain.addListener(sender -> {
myCompanyDomain.addListener(() -> {
String domain = myCompanyDomain.get();
if (domain.isEmpty()) {
domain = null; // Keys with null values are deleted.
Expand All @@ -59,10 +59,10 @@ public FlutterProjectModel(@NotNull FlutterProjectType type) {
myProjectName.addConstraint(String::trim);

myKotlin.set(getInitialKotlinSupport());
myKotlin.addListener(sender -> setInitialKotlinSupport(myKotlin.get()));
myKotlin.addListener(() -> setInitialKotlinSupport(myKotlin.get()));

mySwift.set(getInitialSwiftSupport());
mySwift.addListener(sender -> setInitialSwiftSupport(mySwift.get()));
mySwift.addListener(() -> setInitialSwiftSupport(mySwift.get()));
}

public void setSample(@Nullable FlutterSample sample) {
Expand Down
2 changes: 1 addition & 1 deletion flutter-studio/src/io/flutter/project/FlutterSettingsStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public String get() {
BoolProperty isPackageSynced = new BoolValueProperty(true);
myBindings.bind(packageNameText, computedPackageName, isPackageSynced);
myBindings.bind(model.packageName(), packageNameText);
myListeners.receive(packageNameText, value -> isPackageSynced.set(value.equals(computedPackageName.get())));
myListeners.listen(packageNameText, value -> isPackageSynced.set(value.equals(computedPackageName.get())));

myBindings.bindTwoWay(new TextProperty(myCompanyDomain), model.companyDomain());

Expand Down
17 changes: 17 additions & 0 deletions tool/plugin/lib/plugin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,23 @@ class BuildCommand extends ProductCommand {
);
processedFile.writeAsStringSync(source);
}
if (spec.version != '3.6') {
// There is no 3.6 yet, but these edits will be needed for next canary
log('spec.version: ${spec.version}');
processedFile = File(
'flutter-studio/src/io/flutter/project/FlutterProjectModel.java');
source = processedFile.readAsStringSync();
files[processedFile] = source;
source = source.replaceAll('addListener(()', 'addListener(sender');
processedFile.writeAsStringSync(source);

processedFile = File(
'flutter-studio/src/io/flutter/project/FlutterSettingsStep.java');
source = processedFile.readAsStringSync();
files[processedFile] = source;
source = source.replaceAll('listen', 'receive');
processedFile.writeAsStringSync(source);
}

try {
result = await runner.javac2(spec);
Expand Down