summaryrefslogtreecommitdiff
path: root/plugins/android
AgeCommit message (Collapse)Author
2014-03-06Merge idea133 into masterTor Norbye
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
2013-08-16Merge fix: add android lib jarsTor Norbye
Change-Id: I27087372de9068aea022d2b041e76df5222dd0aa
2013-08-16Snapshot dc8d47d344cb8e7b04ed2af7a93fd95627f38ee0 from master branch of ↵Tor Norbye
git://git.jetbrains.org/idea/community.git Change-Id: I7d6b4a705cb79fae78d9e845acad2d50fa3f4402
2013-07-08Add jar libraries needed to run the Android plugin under IDEATor Norbye
Change-Id: Ic21cc6094c1da2a5a0d0917a30de70e526beb0ed
2013-07-08Revert "Snapshot d8891a7de15cebb78b6ce5711e50e531b42c0baf from master branch ↵Tor Norbye
of git://git.jetbrains.org/idea/community.git" This reverts commit c6218e46d5d2017e987ecdbd99b318a95c42abc0. Conflicts: .idea/copyright/profiles_settings.xml Change-Id: I8bc88b174d7745d6584585a93af5a83714563622
2013-06-15Added jarutils.jar to old 'android' plug-in.Alex Ruiz
Errors shown when building Gradle project after last pull from IJ code base. Adding the jar back so we can work until we find the source of the problem. Change-Id: Iacc79ae5f8c5ee597fce6c6abf8dee432c29f210
2013-06-03Removed jarutils.jar. ClassNotFoundException has been fixed for ↵Alex Ruiz
Android/Gradle projects. Change-Id: I2dd815b8715b57d0abfd1d9a5b950ae1d278ed00
2013-05-31Fixed ClassNotFoundException due to jar not found.Alex Ruiz
Change-Id: I61c0fdc6e2a1fec8e18c85406dfa4c16ea592246
2013-05-31Merge remote-tracking branch 'aosp/snapshot-master' into mergeTor Norbye
Conflicts: .idea/modules.xml platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java platform/platform-impl/src/com/intellij/internal/statistic/StatisticsUploadAssistant.java resources-en/src/tips/Welcome.html Change-Id: I2798b45d4cc245f31b14a99b68df08075faf2f5c
2013-05-31Snapshot 568f05589922685b8c8f9a2f2f465043b8128542 from master branch of ↵Tor Norbye
git://git.jetbrains.org/idea/community.git Change-Id: I47fe8cb5d8a3c9876cd4c313dca1a8cc531288ec
2013-05-08Merge "Add Guava 13.0.1, needed by Android JPS in this location"Tor Norbye
2013-05-08Snapshot f5ae6e3be7e12e1ef9e12f48fe3a674266288e4e from master branch of ↵Tor Norbye
git://git.jetbrains.org/idea/community.git Change-Id: I756af70fb2910aa2687e94e28338fb9727bce518
2013-05-08Add Guava 13.0.1, needed by Android JPS in this locationTor Norbye
Change-Id: I2d7ccba2144dda680e97edcd22eb88d6651ccb6f
2013-05-01Snapshot dddb119296e7ee16fa8180784610b89b89112ebb from master branch of ↵Tor Norbye
git://git.jetbrains.org/idea/community.git Change-Id: I5fe892d3e4d06009445cc2270aa90bb57dea9d39
2013-04-24Snapshot e242282deb41c328afbe971fc167e47ddfb26df9 from master branch of ↵Tor Norbye
git://git.jetbrains.org/idea/community.git Change-Id: Ifdc1818cde7b63f6d7bf42801f18c7f1557b8d85
2013-04-01Snapshot ee98b298267d0e09d2cd2f0731b6480a56dd48e7 from master branch of ↵Jean-Baptiste Queru
git://git.jetbrains.org/idea/community.git Change-Id: I4515f72af131fdea9fc6905a4dc0fe9532409a81
2013-02-27Snapshot of commit 329607d9ebcedf2bb0ad81265354366db7dc3f9cJean-Baptiste Queru
from branch master of git://git.jetbrains.org/idea/community.git Change-Id: I3b27d82897504da1b66169b67c7771e0f551c973
2013-01-08Snapshot of commit d5ec1d5018ed24f1b4f32b1d09df6dbd7e2fc425Jean-Baptiste Queru
from branch master of git://git.jetbrains.org/idea/community.git
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 19:55:43 +0000