Skip to content
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.

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

Update IntelliJ template for new projects and existing samples #7501

Merged
merged 12 commits into from Jan 23, 2017

Conversation

mit-mit
Copy link
Member

@mit-mit mit-mit commented Jan 16, 2017

@abarth
Copy link
Contributor

abarth commented Jan 16, 2017

LGTM

@devoncarew
Copy link
Member

devoncarew commented Jan 16, 2017

I don't think we want to commit the workspace.xml file (examples/hello_services/.idea/workspace.xml) for projects other than the create template. I think that file contains settings that are more per-user specific - having it in source control would mean that you would pick up other users local settings changes, and there'd likely be a bunch of scm churn in that file. We do want files like .idea/modules.xml, which more define the project. https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems has a bit more info.

Priming workspace.xml for the create template however makes sense.

lgtm for the other changes -

@mit-mit
Copy link
Member Author

mit-mit commented Jan 17, 2017

I don't think we want to commit the workspace.xml file

OK, that makes sense. Updated the PR to not add those.

@mit-mit
Copy link
Member Author

mit-mit commented Jan 23, 2017

Still can't land this as the Travis job is timing out (unrelated to this change, I believe):

Shell: Observatory listening on http://127.0.0.1:25446/
19:33 +814 ~2 -1: loading /home/travis/build/flutter/flutter/packages/flutter/test/widgets/unique_widget_test.dart
  TimeoutException after 0:05:00.000000: Test timed out after 5 minutes, 5 seconds.
  dart:isolate  _RawReceivePortImpl._handleMessage

@Hixie
Copy link
Contributor

Hixie commented Jan 23, 2017

I don't understand why Travis did a push test on a PR.

@Hixie
Copy link
Contributor

Hixie commented Jan 23, 2017

In any case the problem seems to be that this branch is old. You should rebase so Travis tests it against the latest test code, where I believe that race has been fixed.

@mit-mit
Copy link
Member Author

mit-mit commented Jan 23, 2017

In any case the problem seems to be that this branch is old.

Ah, of course, will do that right away, thanks!

@Hixie
Copy link
Contributor

Hixie commented Jan 23, 2017

Minor side note, it looks like what happened is that you checked these changes into a branch on the Flutter repo. The preferred approach is to check them into branches on your own fork of the repo. That way people don't end up pulling down your branch when they're fetching the main repo.

@mit-mit
Copy link
Member Author

mit-mit commented Jan 23, 2017

The preferred approach is to check them into branches on your own fork of the repo.

Got it, will do in the future!

@mit-mit mit-mit merged commit 24f1b2e into master Jan 23, 2017
@mit-mit mit-mit deleted the ij-templates branch January 23, 2017 15:33
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
5 participants