Define proto module system #1819
Conversation
|
As expected, this does not compile against AS 3.0. The merge conflict will be easy to resolve, once we get to the point that it needs to be done. |
|
PTAL |
|
I can resolve the conflict during the merge, if there are no other changes that need to be made. |
|
(looking now) |
flutter-studio/flutter-studio.iml
Outdated
| @@ -34,5 +34,8 @@ | |||
| <orderEntry type="module" module-name="gradle" scope="TEST" /> | |||
| <orderEntry type="library" scope="TEST" name="truth" level="project" /> | |||
| <orderEntry type="module" module-name="flutter-intellij-community" /> | |||
| <orderEntry type="module" module-name="project-system" /> | |||
| <orderEntry type="module" module-name="project-system-gradle" /> | |||
| <orderEntry type="module" module-name="android-ndk" /> | |||
There was a problem hiding this comment.
I'm curious - these were added automatically by IntelliJ?
There was a problem hiding this comment.
Nope. They are all required by new code.
| @@ -25,7 +25,7 @@ public void run() { | |||
| ApplicationInfo info = ApplicationInfo.getInstance(); | |||
| if ("Google".equals(info.getCompanyName())) { | |||
| String version = info.getFullVersion(); | |||
| if (version.startsWith("2.") || (version.contains("Beta") && !version.endsWith("7"))) { | |||
| if (version.startsWith("2.")) { | |||
There was a problem hiding this comment.
Yes. I updated the intro to make that clear.
| @Nullable | ||
| @Override | ||
| public VirtualFile getDefaultApkFile() { | ||
| return gradleProjectSystem.getDefaultApkFile(); // TODO find the flutter binary |
There was a problem hiding this comment.
Do we need this todo:? If so, can you provide more context (for whoever comes through here net)?
| @@ -7,7 +7,11 @@ | |||
| "ideaVersion": "171.4408382", | |||
| "dartPluginVersion": "171.4424.10", | |||
| "sinceBuild": "171.1", | |||
| "untilBuild": "171.*" | |||
| "untilBuild": "171.*", | |||
| "filesToSkip": [ | |||
| @@ -0,0 +1,38 @@ | |||
| <!-- Defines Android Studio IDE-specific contributions and implementations. --> | |||
There was a problem hiding this comment.
We may want to look into a system to generate plugin.xml and studio-contribs.xml from the templates and remove the others from source control. Or, have a task on travis fail if changes are made to one file but not to the the other (template and non-template), else they risk getting out of sync.
There was a problem hiding this comment.
If this sounds good, lets open an issue to track.
There was a problem hiding this comment.
We really need to get into the habit of using plugin gen.
Adding a fail-safe check to travis sounds good, too. See #1842.
tool/plugin/lib/plugin.dart
Outdated
| result = await runner.javac2(spec); | ||
| for (var file in spec.filesToSkip) { |
There was a problem hiding this comment.
this block may want to be in a finally block, so that it's performed even if there are exceptions out of the compile stage
@devoncarew @pq
Define a project system for Flutter. Fixes compilation to build 3.1 and 3.0 from common sources.
Changes the build command to cause incompatible files to be ignored during 3.0 build. Makes a template for studio-contribs.xml.
Fixes #1824.