Google Git
Sign in
android / platform / tools / idea / 814f829cd44c28c7045e08b15bd7ee08890cbd80
commit814f829cd44c28c7045e08b15bd7ee08890cbd80[log] [tgz]
authorTor Norbye <[email protected]>Thu Mar 06 17:27:18 2014 -0800
committerTor Norbye <[email protected]>Thu Mar 06 17:30:32 2014 -0800
tree1c108337a1607788da5f8b6deb061558401d095d
parentb557fdbb754e1d9f6b222ecb426785beb112db04 [diff]
Merge idea133 into master

This CL merges the following CLs from aosp/idea133 into aosp/master.

dabd634b Snapshot e2750ea61032f2a041cb012bb7b90cffa0deba73 from idea/133.124 of git://git.jetbrains.org/idea/community.git
29ab773f Make default test target run Android specific tests
967117a7 Merge "Make default test target run Android specific tests" into idea133
1eb71f20 Bump memory settings for unit tests
b13ea0d4 Don't bind the delete key to restoring property in layout editor
a20ccfa9 Add Gradle import module
0980f4a2 Add gradle-import to build script
cee6f8ca Fix Gradle notification lookup on Windows.
8668e1be Snapshot 020d29497847701e84e383d965abf543b80758e2 from idea/133.370 of git://git.jetbrains.org/idea/community.git
18f77669 Merge remote-tracking branch 'aosp/snapshot-master' into merge
36ac8cba Update from Guava 13.0.1 to Guava 15
4d451f93 Update libraries to lombok 0.2.2
ee06b1d0 Remove lint-cli dependency from the idea project
ab73dade Updater: add unit tests.
dd558b6e Updater: on Windows, add "Retry" on file op failures.
f2f7178a Snapshot c11f3ac9bbde3f85d1f837ec3eb48a395ed7dd10 from idea/133.471 of git://git.jetbrains.org/idea/community.git
5e4c77db Merge remote-tracking branch 'aosp/snapshot-master' into merge
8d957349 Fix junit.jar path in updater project.
58c3e0ae Include cloud tools tests in default test group
63cd9779 Temporarily disable errors in project structure dialog
e2d6089d Snapshot b9931c55d2175b6552f90b2225eb09c13bd6dfed from idea/133.609 of git://git.jetbrains.org/idea/community.git
031a291e Merge remote-tracking branch 'aosp/snapshot-master' into merge
ea628d6e Remove versions from Info.plist
809cb3e7 Snapshot 9e6329d622cc9649c9c035f28faddc29564a5b7a from idea/133.696 of git://git.jetbrains.org/idea/community.git
d6cfe6ec Merge remote-tracking branch 'aosp/snapshot-master' into merge
38f8c6f0 Gracefully handle build.gradle files in modules without a configured JDK
70ae6f2a Snapshot dc1944e804515a346297e368c3b9c35a203c9912 from idea/133.818 of git://git.jetbrains.org/idea/community.git
ac91a6de Merge remote-tracking branch 'aosp/snapshot-master' into merge
2f51d957 Gradle: respect build classpath order and use both classes and sources jars if available
0ecdb509 Snapshot c50a8ad26a72432f26e39046d6a6f21fd7a190ee from idea/134.1160 of git://git.jetbrains.org/idea/community.git
e8c22ad7 Merge remote-tracking branch 'aosp/snapshot-master' into merge
72253f7d Turn off android framework detection
93f77ee6 Temporarily remove GCT tests
88f318c9 Snapshot 34f078c3452e79ba209d28a551962857e0970e5d from idea/134.1342 of git://git.jetbrains.org/idea/community.git
afb54e4b Merge remote-tracking branch 'aosp/snapshot-master' into merge
4dc795dc Fix updater UI tests.
57a49ed1 Studio patch: more logging.
aa614ee0 table greyer (ability to disable a table)
5c571417 Use Gradle model prebuilts v0.9.0 in Studio.
cb38c25d build script: Run jarjar on the updater
f273ca07 Add App Engine templates dir to build
7607404f Removed android-builder library from Studio (not needed.)
8f29b4eb Merge idea133 changes into master

Change-Id: I12231f26e886dbf5e2e5ac0b1c4bfe18f274d78f
10918 files changed
tree: 1c108337a1607788da5f8b6deb061558401d095d
  1. .idea/
  2. bin/
  3. build/
  4. colorSchemes/
  5. community-resources/
  6. community-tests/
  7. images/
  8. java/
  9. jps/
  10. lib/
  11. license/
  12. native/
  13. platform/
  14. plugins/
  15. python/
  16. RegExpSupport/
  17. resources/
  18. resources-en/
  19. samples/
  20. spellchecker/
  21. tools/
  22. updater/
  23. xml/
  24. .gitattributes
  25. .gitignore
  26. build.txt
  27. build.xml
  28. build_ide_ext.sh
  29. community-main.iml
  30. LICENSE.txt
  31. NOTICE.txt
  32. README.md
  33. test-log.xml
README.md

IntelliJ IDEA Community Edition

This is the official GitHub mirror of the IntelliJ IDEA Community Edition and PyCharm Community Edition source code.

Building

To develop IntelliJ IDEA, you can use either IntelliJ IDEA Community Edition or IntelliJ IDEA Ultimate. To build and run the code:

  • Make sure you have the Groovy plugin enabled. Parts of IntelliJ IDEA are written in Groovy, and you will get compilation errors if you don't have the plugin enabled.
  • Make sure you have the UI Designer plugin enabled. Most of IntelliJ IDEA‘s UI is built using the UI Designer, and the version you build will not run correctly if you don’t have the plugin enabled.
  • Open the directory with the source code as a directory-based project
  • Configure a JSDK named “IDEA jdk”, pointing to an installation of JDK 1.6
  • On Windows or Linux, add lib\tools.jar from the JDK installation directory to the classpath of IDEA jdk
  • Use Build | Make Project to build the code
  • To run the code, use the provided shared run configuration “IDEA”.

To build the distribution archive of IntelliJ IDEA Community Edition, execute build.xml Ant build script in the root directory of the source code. The results of the build execution can be found at out/artifacts.

Contributing

Pull requests are welcome. Please make sure that you follow the IntelliJ Coding Guidelines. Note that you'll need to submit a Contributor Agreement before we can accept your pull request.

See http://www.jetbrains.org/ for more information.

Developer Documentation

You can find information on the internal architecture of IntelliJ IDEA and plugin development at the PluginDevelopment site.