idea/android.git
21 min agofixing serialization for android gradle model master
Dmitry Avdeev [Fri, 15 Nov 2019 14:18:03 +0000 (17:18 +0300)]
fixing serialization for android gradle model

IDEA-226976: jps classpath fixed

GitOrigin-RevId: ddf1d592e4f97f8650d55e898e9049a3194998ee

21 hours agoFix leaking disposable in ModuleResourceRepository (android)
Andrei Kuznetsov [Thu, 14 Nov 2019 17:30:11 +0000 (20:30 +0300)]
Fix leaking disposable in ModuleResourceRepository (android)

ModuleResourceRepository implicitly adds itself as root disposable when it subscribes for a topic in MessageBus. In the case of exception being thrown (e.g. during construction of TestAppResourceRepository), ResourceRepositoryManager does not dispose ModuleResourceRepository properly, which results in ~200 flaky tests failing with message "junit.framework.AssertionFailedError: Undisposed object: ModuleResourceRepository{TEST}"

GitOrigin-RevId: 29fdbad1c341a05556d7a2e2a36fa5f7505bb1e3

21 hours agoMake Android/SwingFocusRule compatible with Java11 (unit tests only)
Andrei Kuznetsov [Thu, 14 Nov 2019 17:10:29 +0000 (20:10 +0300)]
Make Android/SwingFocusRule compatible with Java11 (unit tests only)

java.awt.peer.ComponentPeer#requestFocus method has different signature in Java8 and Java11 (difference is in last argument). JDK8 is used for compilation. In order to make the code run on Java11 reflection is used to invoke the method on Java11 (note that compiled code throws NoSuchMethodError on Java11)

GitOrigin-RevId: 10585789e6d90633122580530e9c1ba0835a3c6b

24 hours agofixing serialization for android gradle model
Dmitry Avdeev [Thu, 14 Nov 2019 13:52:22 +0000 (16:52 +0300)]
fixing serialization for android gradle model

using patched sdk-common library

GitOrigin-RevId: fde8e7a23ac51ed3973203e6085bf45da16f78df

28 hours agofixing serialization for android gradle model
Dmitry Avdeev [Thu, 14 Nov 2019 09:39:43 +0000 (12:39 +0300)]
fixing serialization for android gradle model

default constructors are required by new gradle model serialization engine

GitOrigin-RevId: 8e4257028de1aa5d76a306fb4f92bb75447d824d

42 hours agoIDEA-CR-54088 replace `android-capable` with `java-capable`
Gregory.Shrago [Wed, 13 Nov 2019 19:32:59 +0000 (22:32 +0300)]
IDEA-CR-54088 replace `android-capable` with `java-capable`

GitOrigin-RevId: f7f38189314297065d56242833ad6809d1c09ab5

45 hours agoDownload Kotlin artifacts for android-plugin unit tests
Andrei Kuznetsov [Tue, 12 Nov 2019 18:08:46 +0000 (21:08 +0300)]
Download Kotlin artifacts for android-plugin unit tests

GitOrigin-RevId: ec1d52641b7a13054810eb25fe51497593e04855

2 days agoandroid: remove deprecated submitTransactionAndWait calls
peter [Wed, 13 Nov 2019 07:53:05 +0000 (08:53 +0100)]
android: remove deprecated submitTransactionAndWait calls

GitOrigin-RevId: 71db5899e14400a984a27066545a84cccb7e8413

3 days agoconverting Android FileTypeFactories to <fileType> extensions: cleanup
Dmitry Avdeev [Tue, 12 Nov 2019 13:40:17 +0000 (16:40 +0300)]
converting Android FileTypeFactories to <fileType> extensions: cleanup

GitOrigin-RevId: 9c39b9b4baaba53d50be29588b34676ec7e261a0

3 days agono need for duplicated kotlin plugin
Dmitry Avdeev [Tue, 12 Nov 2019 08:40:17 +0000 (11:40 +0300)]
no need for duplicated kotlin plugin

GitOrigin-RevId: c9f978b82cf6d6034470cabb139b0c026027e9a9

3 days agofixing MockApplication initialization
Dmitry Avdeev [Tue, 12 Nov 2019 08:39:58 +0000 (11:39 +0300)]
fixing MockApplication initialization

GitOrigin-RevId: 2391ea33048bd50f900bf88dacfb98438290aab7

3 days agodeprecate obsolete AnAction.startInTransaction, remove implementations
peter [Mon, 11 Nov 2019 19:54:46 +0000 (20:54 +0100)]
deprecate obsolete AnAction.startInTransaction, remove implementations

GitOrigin-RevId: bc223ee461af89e57c612f2aef00def446eaa5bc

3 days agoCleanup deprecated field usage (android-plugin, icons)
Andrei Kuznetsov [Mon, 11 Nov 2019 12:10:22 +0000 (15:10 +0300)]
Cleanup deprecated field usage (android-plugin, icons)

Replace usage AllIcons.Diff.CurrentLine -> AllIcons.Actions.Forward (AllIcons.Diff.CurrentLine has been deleted)

GitOrigin-RevId: a510d2485faa16354275fa73609a9ab8e9cd659f

3 days agoCode cleanup (android-plugin): do not create instances of com.android.tools.idea...
Andrei Kuznetsov [Thu, 7 Nov 2019 10:05:24 +0000 (13:05 +0300)]
Code cleanup (android-plugin): do not create instances of com.android.tools.idea.testing.IdeComponents

All the methods of IdeComponents are static. No instance needed.

GitOrigin-RevId: 80c9f0ffc635d98a4483029744c1df8593c3320d

3 days agoCode cleanup (android-plugin): use KotlinFacetSettings#targetPlatform instead of...
Andrei Kuznetsov [Thu, 7 Nov 2019 10:03:26 +0000 (13:03 +0300)]
Code cleanup (android-plugin): use KotlinFacetSettings#targetPlatform instead of deprecated KotlinFacetSettings#platform

GitOrigin-RevId: 7e08b3950399ad850611378ce732f91a05fb700c

3 days agoCode cleanup: remove stale fixme markers (android-plugin)
Andrei Kuznetsov [Wed, 6 Nov 2019 13:46:43 +0000 (16:46 +0300)]
Code cleanup: remove stale fixme markers (android-plugin)

GitOrigin-RevId: 70cf3a009beee92b3289cb437d7ad581a0585fe3

3 days agoCode cleanup (fixmes): restore health monitoring services in AndroidStudio (but not...
Andrei Kuznetsov [Wed, 6 Nov 2019 15:59:17 +0000 (18:59 +0300)]
Code cleanup (fixmes): restore health monitoring services in AndroidStudio (but not in Idea)

Restore all the AndroidStudio components that were temporary removed during merge AndroidStudio3.5 to IJ.
Current state should match AOSP sources + few required changes (some actions that are not needed in IU/IC were moved from android-plugin.xml to androidstudio.xml)

GitOrigin-RevId: 1c82843d13b072666ccb43958b9e9e7bd6161f2a

3 days agoCode cleanup (fixmes): remove connection/whats-new/+assistant from IJ/android-plugin
Andrei Kuznetsov [Wed, 6 Nov 2019 13:18:40 +0000 (16:18 +0300)]
Code cleanup (fixmes): remove connection/whats-new/+assistant from IJ/android-plugin

GitOrigin-RevId: 2aad5cf6990880b84b1fca7c1cc7c63d08cc5f3a

3 days agoCode cleanup (fixmes): restore connection/whats-new/+assistant in AndroidStudio ...
Andrei Kuznetsov [Wed, 6 Nov 2019 13:15:03 +0000 (16:15 +0300)]
Code cleanup (fixmes): restore connection/whats-new/+assistant in AndroidStudio (but not in android-plugin)

GitOrigin-RevId: fe013dadb1e6f3f5a145647c7c890463eb399308

3 days agoRename project library (analytics-proto) => (studio-analytics-proto) to follow names...
Andrei Kuznetsov [Wed, 6 Nov 2019 13:11:32 +0000 (16:11 +0300)]
Rename project library (analytics-proto) => (studio-analytics-proto) to follow names in AOSP AndroidStudio sources

The goal is to minimize amount of merge conflicts during merge

GitOrigin-RevId: 1e48d27355a81a83eaadae8b92165678bb2d9936

3 days agoCode cleanup (fixmes): revert android-kotlin module to its state "before merge" ...
Andrei Kuznetsov [Wed, 6 Nov 2019 11:47:08 +0000 (14:47 +0300)]
Code cleanup (fixmes): revert android-kotlin module to its state "before merge" (aosp/AndroidStudio 3.5)

Currently IJ uses precompiled version of the android-kotlin module. Remove all the "fixmes" introduced by the merge AndroidStudio3.5->IJ and revert the code to its state in AOSP repository (in order to not introduce merge conflicts in future).

There is an intention (in future) to include android-kotlin module in IJ as sources.

GitOrigin-RevId: 45e7151c74af6c5d47c33ea86185e43f11bf0175

3 days agoUpdate easymock to get rid of objenesis 1.0
Leonid Shalupov [Mon, 11 Nov 2019 10:37:57 +0000 (12:37 +0200)]
Update easymock to get rid of objenesis 1.0

There were a version conflict between objenesis for easymock and kryo. Now they're using the same version

GitOrigin-RevId: 06de2ccaeed2026303319f87a95f0680ef153131

4 days agoupdate bundled Kotlin lib names cleanups + cache-redirector (IDEA-224508, IDEA-CR...
Nicolay Mitropolsky [Mon, 11 Nov 2019 10:49:40 +0000 (13:49 +0300)]
update bundled Kotlin lib names cleanups + cache-redirector (IDEA-224508, IDEA-CR-55010)

GitOrigin-RevId: be10eaa2afec486ced5036b2a927cea1058b08fb

4 days agoremove our own copies of hash map and hash set from android
Sergey Ignatov [Mon, 11 Nov 2019 10:41:33 +0000 (13:41 +0300)]
remove our own copies of hash map and hash set from android

GitOrigin-RevId: e2b6796fc435fde8038c6a4b609997a9febafa72

5 days agoadd and use EmptyResolveResult
Daniil Ovchinnikov [Fri, 8 Nov 2019 15:39:19 +0000 (18:39 +0300)]
add and use EmptyResolveResult

GitOrigin-RevId: e11d3035e4de011a11794ef44b72456cd3006151

5 days agoupdate bundled Kotlin plugin to `1.3.60-eap-143-IJ2019.3-1:EAP` (IDEA-224508)
Nicolay Mitropolsky [Thu, 7 Nov 2019 19:53:32 +0000 (22:53 +0300)]
update bundled Kotlin plugin to `1.3.60-eap-143-IJ2019.3-1:EAP` (IDEA-224508)

GitOrigin-RevId: ad64aef2846b85eff51468a34153f2a74a723249

6 days agodrop obsolete `ide.tree.ui.experimental` property
Gregory.Shrago [Fri, 8 Nov 2019 16:49:51 +0000 (19:49 +0300)]
drop obsolete `ide.tree.ui.experimental` property

GitOrigin-RevId: 27b1f357ff64a071615ddfb9fbe6bb1d2f7777dc

6 days agoRename android library o.j.i.d.android.tools:layoutinspector to o.j.i.d.android.tools...
Andrei Kuznetsov [Fri, 8 Nov 2019 15:46:33 +0000 (18:46 +0300)]
Rename android library o.j.i.d.android.tools:layoutinspector to o.j.i.d.android.tools.base:layoutinspector

... to avoid unwanted local changes (in file layoutinspector.iml) caused by changed artifact name: "layout_i_nspector" vs "layout_I_nspector"

GitOrigin-RevId: d2bbdac65e2c9164fca5898ab8ed44dd777e82a2

7 days agoconverting Android FileTypeFactories to <fileType> extensions
Dmitry Avdeev [Thu, 7 Nov 2019 15:52:34 +0000 (18:52 +0300)]
converting Android FileTypeFactories to <fileType> extensions

GitOrigin-RevId: 9727d703dbbcf6999f4bc9f4d0b38a4bd3f5f538

8 days agofix "Read access is allowed from event dispatch thread or inside read-action only...
Alexey Kudravtsev [Tue, 5 Nov 2019 15:53:04 +0000 (18:53 +0300)]
fix "Read access is allowed from event dispatch thread or inside read-action only" assertion

GitOrigin-RevId: 28004cf7e2387f81837f2aceffe701a9167c6068

8 days agoIDEA-226234: Remove <IdeaHome>/lib/resources-aar-26.5.0.1.jar (installers)
Andrei Kuznetsov [Wed, 6 Nov 2019 09:08:33 +0000 (12:08 +0300)]
IDEA-226234: Remove <IdeaHome>/lib/resources-aar-26.5.0.1.jar (installers)

GitOrigin-RevId: aec8655e9164be6e3855f152d6e0aafbf88a4689

8 days agoextract readMetaInfo, use pluginId instead of string for disabled plugin list
Vladimir Krivosheev [Tue, 5 Nov 2019 14:35:44 +0000 (15:35 +0100)]
extract readMetaInfo, use pluginId instead of string for disabled plugin list

GitOrigin-RevId: e053531ca0554dbf0eadc11c6493ccc07c7fae1d

8 days agorunning android tests, kotlin is required now in runtime
Dmitry Avdeev [Tue, 5 Nov 2019 14:55:12 +0000 (17:55 +0300)]
running android tests, kotlin is required now in runtime

GitOrigin-RevId: bb30b2c127a3639f7f5cb7d81bccb9a2901e07e7

8 days agoIDEA-225881: duplicate JDK entries are added during Android project import
Andrei Kuznetsov [Tue, 5 Nov 2019 13:22:38 +0000 (16:22 +0300)]
IDEA-225881: duplicate JDK entries are added during Android project import

During Android project import duplicate JDK entries are added to project JDK table. Only first entry returned by getPotentialJdkPaths() considered (all other are skipped)

GitOrigin-RevId: e13e38242f30afd04a748883763495a76cda473c

8 days agoIDEA-225881: use the same JDK for Idea and Gradle when importing Android projects.
Andrei Kuznetsov [Tue, 5 Nov 2019 13:15:56 +0000 (16:15 +0300)]
IDEA-225881: use the same JDK for Idea and Gradle when importing Android projects.

When Idea runs on JRE_11 and Gradle runs on JRE_8, StreamCorruptedException is thrown from gradle tooling code. => Make sure that (at least by default) Idea and Gradle runs on the same JRE in Android projects.

See also: https://github.com/gradle/gradle/issues/8285

GitOrigin-RevId: e7451545a712df225b968d6581f199b50bab9e2b

8 days agoIDEA-225881: fix WriteAction being invoked from non-EDT thread when adding new JDK.
Andrei Kuznetsov [Tue, 5 Nov 2019 13:10:12 +0000 (16:10 +0300)]
IDEA-225881: fix WriteAction being invoked from non-EDT thread when adding new JDK.

GitOrigin-RevId: 3d564492406f551867fd44f9e2b3d3eec51eae3a

8 days agoCleanup of NamesValidator usage, more dynamic EPs
Dmitry Jemerov [Mon, 4 Nov 2019 16:35:35 +0000 (17:35 +0100)]
Cleanup of NamesValidator usage, more dynamic EPs

GitOrigin-RevId: b503bf36d1fd31597d7d0cb3b1d18d2b473a1aeb

8 days agoremove `getService(class, boolean)` to simplify API
Vladimir Krivosheev [Tue, 5 Nov 2019 08:05:38 +0000 (09:05 +0100)]
remove `getService(class, boolean)` to simplify API

It is internal method that should be not exposed via public API

GitOrigin-RevId: cdcc306d1ad11169fb63882ca94a1db39f3c2109

8 days agoCleanup (saner method names; deprecation; formatting)
Roman Shevchenko [Mon, 4 Nov 2019 16:02:40 +0000 (17:02 +0100)]
Cleanup (saner method names; deprecation; formatting)

GitOrigin-RevId: 9cac80567fefdcd01d06f9675546780113ab0a96

8 days agocleanup - PluginManagerCore as final class
Vladimir Krivosheev [Mon, 4 Nov 2019 08:46:30 +0000 (09:46 +0100)]
cleanup - PluginManagerCore as final class

GitOrigin-RevId: 400216cb3ee70df7f01569ec53fbb56289a952c5

8 days agorevert accidental config change
Roman.Ivanov [Fri, 1 Nov 2019 06:49:03 +0000 (13:49 +0700)]
revert accidental config change

GitOrigin-RevId: efccda80b9e8382bb1130edfbdb8231126f4e386

8 days agoSuspiciousSystemArraycopyInspection: detect intersecting ranges when copying to self...
Roman.Ivanov [Fri, 1 Nov 2019 06:39:36 +0000 (13:39 +0700)]
SuspiciousSystemArraycopyInspection: detect intersecting ranges when copying to self : IDEA-225974

GitOrigin-RevId: 53a430cf3fd37154a346b0bb740b797f9161a6de

8 days agoon windows, shortened path will fail to pass sdk validation
Dmitry Avdeev [Thu, 31 Oct 2019 15:55:37 +0000 (18:55 +0300)]
on windows, shortened path will fail to pass sdk validation

GitOrigin-RevId: 39cd5839a5d74e87682f5c281ae573d0aefff468

8 days ago[Android Studio merge] do not use internal repo.labs service
Dmitriy.Panov [Tue, 29 Oct 2019 22:25:38 +0000 (01:25 +0300)]
[Android Studio merge] do not use internal repo.labs service

GitOrigin-RevId: 8e33535d8a7a358216e21a14931920a7bf360418

8 days agoIDEA-221306: [Android] Designer attributes not working on JRE 11
Andrei Kuznetsov [Wed, 30 Oct 2019 13:40:14 +0000 (16:40 +0300)]
IDEA-221306: [Android] Designer attributes not working on JRE 11

On Linux/MacOS CustomComboBox#setUI method fails with NoClassDefFoundError: com/sun/../WindowsComboBoxUI because this class does not exist in JRE11 on linux/mac. On Windows this class exists, but check (ui instanceof WindowsComboBoxUI) evaluates false because ui will be of type WinIntelliJComboBoxUI.

Conclusion: ui may not be of type WindowsComboBoxUI

GitOrigin-RevId: fd61da095c0acd1ea466c0124887272f52e2b7cd

8 days agodo not show "Memory Settings" configurable in IDEA
Dmitry Avdeev [Wed, 30 Oct 2019 12:24:58 +0000 (15:24 +0300)]
do not show "Memory Settings" configurable in IDEA

GitOrigin-RevId: ce293830a21b7983329bf0ab2a3dda10b814af99

8 days agoDo not use deprecated "GradleProjectResolverExtension.createProject" IDEA-222274
Vladislav.Soroka [Mon, 28 Oct 2019 15:05:05 +0000 (18:05 +0300)]
Do not use deprecated "GradleProjectResolverExtension.createProject" IDEA-222274

GitOrigin-RevId: 74be2c5fa6dea9a90da8e8844a3829deaf4391a6

8 days agoIDEA-222274 Importing Gradle project: API for incremental import
Vladislav.Soroka [Mon, 28 Oct 2019 14:09:04 +0000 (17:09 +0300)]
IDEA-222274 Importing Gradle project: API for incremental import

GitOrigin-RevId: 9e9c9af6eb643b525eece448c90ecd048d441296

8 days agoCleanup hacks for android-plugin's layoutlib.jar
Andrei Kuznetsov [Mon, 28 Oct 2019 14:17:53 +0000 (17:17 +0300)]
Cleanup hacks for android-plugin's layoutlib.jar

Now layoutlib.jar can run on JRE8 and JRE11. All the hacks are encapsulated in the layoutlib.jar itself. Two different jars are not needed anymore.

GitOrigin-RevId: 5d7c73dd65aef1b3cc766cd761c85303ac18fef5

8 days agoDelete redundant explicit language level setting from android modules (iml)
Andrei Kuznetsov [Mon, 28 Oct 2019 11:50:12 +0000 (14:50 +0300)]
Delete redundant explicit language level setting from android modules (iml)

GitOrigin-RevId: ec4d4d967b9607a2e67f9fe70a12069dd253a183

8 days agohide deployment actions for non-android projects
Dmitry Avdeev [Mon, 28 Oct 2019 10:55:19 +0000 (13:55 +0300)]
hide deployment actions for non-android projects

GitOrigin-RevId: 10c30a092c1a49221f19af92eaf9b87c206be6f7

8 days agohide deployment actions for non-android projects
Dmitry Avdeev [Mon, 28 Oct 2019 10:06:54 +0000 (13:06 +0300)]
hide deployment actions for non-android projects

GitOrigin-RevId: 987ba9a8138c3dc6444ab765d81cd06327157714

8 days agojre11-compatible layoutlib
Dmitry Avdeev [Mon, 28 Oct 2019 09:09:13 +0000 (12:09 +0300)]
jre11-compatible layoutlib

GitOrigin-RevId: 4c62a1cf1808fecbb64efdfb5f53440f5b3bbd6c

8 days agoIDEA-225595 Android: Useless tab `Resource Manager`
Dmitry Avdeev [Fri, 25 Oct 2019 13:13:19 +0000 (16:13 +0300)]
IDEA-225595 Android: Useless tab `Resource Manager`

tool window disabled for non-android projects

GitOrigin-RevId: eff2843d6d26a74991eafe9b98d4e46472905711

8 days ago[android] rewrite code in ModelSimplePropertyImpl.kt to work around bug in Kotlin...
nik [Fri, 25 Oct 2019 10:14:18 +0000 (13:14 +0300)]
[android] rewrite code in ModelSimplePropertyImpl.kt to work around bug in Kotlin compiler 1.3.60 (see KT-34356)

GitOrigin-RevId: aea4a9b7376d059feeb037f8d7a6d293b1c674e7

8 days agoMerge remote-tracking branch 'origin/master' into merging-aosp-35
Andrei Kuznetsov [Thu, 24 Oct 2019 13:34:34 +0000 (16:34 +0300)]
Merge remote-tracking branch 'origin/master' into merging-aosp-35

# Conflicts:
# community/android/android/src/com/android/tools/idea/gradle/util/GradleProjects.java

GitOrigin-RevId: 439787639fc2fd0f5a8fcf39808e9813a76045f6

8 days agoRenamed library: kotlin-plugin -> kotlin-plugin-android-compile-deps. Added test...
Andrei Kuznetsov [Thu, 24 Oct 2019 12:49:55 +0000 (15:49 +0300)]
Renamed library: kotlin-plugin -> kotlin-plugin-android-compile-deps. Added test checking Kotlin version consistency.

GitOrigin-RevId: 0c730d4aa456a72ca99b34b079b0eb7071d2db83

8 days agoMerge remote-tracking branch 'origin/master' into merging-aosp-35
Andrei Kuznetsov [Wed, 23 Oct 2019 11:01:38 +0000 (14:01 +0300)]
Merge remote-tracking branch 'origin/master' into merging-aosp-35

# Conflicts:
# community/android/android/src/com/android/tools/idea/lang/databinding/model/PsiModelMethod.java

GitOrigin-RevId: 7dafe6a7e3ab030a21025492a5c4f7133652531a

8 days agoFix path to profiler binary files in idea (merging AndroidStudio 3.5)
Andrei Kuznetsov [Tue, 22 Oct 2019 15:19:05 +0000 (18:19 +0300)]
Fix path to profiler binary files in idea (merging AndroidStudio 3.5)

Idea downloads profiler binaries on-the-fly and puts them to <home>/.IntelliJIdea<..>/system/. Add this location to
search paths in addition to standard <dist>/plugins/android/.

GitOrigin-RevId: b84c837cbe350f622df29de8023650205b271c34

8 days agoFix wrong jar name in compileServer.plugin classpath (merging AndroidStudio 3.5)
Andrei Kuznetsov [Mon, 21 Oct 2019 16:00:07 +0000 (19:00 +0300)]
Fix wrong jar name in compileServer.plugin classpath (merging AndroidStudio 3.5)

GitOrigin-RevId: 6c3da6c236f98caadd89e340e943996c7d142cd5

8 days agoFix compilation after rebase to newer master (merging AndroidStudio 3.5)
Andrei Kuznetsov [Mon, 21 Oct 2019 14:51:22 +0000 (17:51 +0300)]
Fix compilation after rebase to newer master (merging AndroidStudio 3.5)

GitOrigin-RevId: 7b0aacec8ce2477b180782074dd6ac6d6392fb14

8 days agoReference installer-only artifact resources-aar
Andrei Kuznetsov [Mon, 21 Oct 2019 12:00:08 +0000 (15:00 +0300)]
Reference installer-only artifact resources-aar

Unreferenced libraries will not be resolved and downloaded when installer is built. If some artifact is only referenced from
CommunityRepositoryModules.groovy (or similar place), the installer build will fail with "/.../.m2/repository/org/.../resources-aar-26.5.0.1.jar (No such file or directory)"

GitOrigin-RevId: 6a34eeb438e38ce794be65b240792b25f193587c

8 days agofixed NPE on XML without root tag
Dmitry Avdeev [Mon, 21 Oct 2019 10:14:16 +0000 (13:14 +0300)]
fixed NPE on XML without root tag

GitOrigin-RevId: 9ce96240b1b337dd94155c1c49d63fd43da6cfd0

8 days agodownloading missing android profiler/installer in plugin
Dmitry Avdeev [Mon, 21 Oct 2019 10:00:03 +0000 (13:00 +0300)]
downloading missing android profiler/installer in plugin

GitOrigin-RevId: 030af16eb867809cc54d9a55dd8eed8089f77a67

8 days agoAdvance versions of pre-built artifacts to 26.5.0.1 (merging aosp 3.5)
Andrei Kuznetsov [Fri, 18 Oct 2019 19:06:10 +0000 (22:06 +0300)]
Advance versions of pre-built artifacts to 26.5.0.1 (merging aosp 3.5)

Instant run in android-plugin didn't work because libjava_version was build independently from deployer/install in 26.5.0.
26.5.0.1 has fixed this issue

GitOrigin-RevId: c6798592b5b3fa4040d75caef53cffca440e78ce

8 days agoResolve "fixme's" (merging aosp 3.5)
Andrei Kuznetsov [Fri, 18 Oct 2019 18:19:18 +0000 (21:19 +0300)]
Resolve "fixme's" (merging aosp 3.5)

GitOrigin-RevId: b21f5c3ebfbdceb23b9b910f5e00ff605f3dd238

8 days agomerging aosp 3.5: community project fixed
Dmitry Avdeev [Fri, 18 Oct 2019 15:12:52 +0000 (18:12 +0300)]
merging aosp 3.5: community project fixed

GitOrigin-RevId: 36b33017d06df4b7dee18e0a85c5aea05cba11fa

8 days agoRename ShowFilePathAction=>RevealFileAction in newly merged code (merging aosp 3.5)
Andrei Kuznetsov [Fri, 18 Oct 2019 14:09:27 +0000 (17:09 +0300)]
Rename ShowFilePathAction=>RevealFileAction in newly merged code (merging aosp 3.5)

GitOrigin-RevId: 7e597949e40c1589cd79d2e485d0563ab6e1aec5

8 days agoResolve "fixme's" by accepting proposed solution (gradle part, merging aosp 3.5)
Andrei Kuznetsov [Fri, 18 Oct 2019 13:52:43 +0000 (16:52 +0300)]
Resolve "fixme's" by accepting proposed solution (gradle part, merging aosp 3.5)

GitOrigin-RevId: c5d9fc3d210d77f7c958dc91a54286ad96bdbab5

8 days agofixing test classpath: sdktools deps should be exported
Dmitry Avdeev [Fri, 18 Oct 2019 10:33:03 +0000 (13:33 +0300)]
fixing test classpath: sdktools deps should be exported

GitOrigin-RevId: 6c3be2e5ba19edfe1fde2180379940eb5c401c9a

8 days agoremoved unneeded dependency
Dmitry Avdeev [Wed, 16 Oct 2019 17:03:41 +0000 (20:03 +0300)]
removed unneeded dependency

GitOrigin-RevId: b8beacccef9b99b0799dc9623a0d4ebb51a5d267

8 days agofixed API usage
Dmitry Avdeev [Wed, 16 Oct 2019 14:16:54 +0000 (17:16 +0300)]
fixed API usage

GitOrigin-RevId: d7a46a18084b263f846f8ee535c5771a9a261645

8 days agofixing android modules
Dmitry Avdeev [Wed, 16 Oct 2019 10:23:24 +0000 (13:23 +0300)]
fixing android modules

GitOrigin-RevId: 9e2f0c07ec006ab8be70182ecc5a8d903dca2a95

8 days agokotlin plugin library should have "provided" scope
Dmitry Avdeev [Wed, 16 Oct 2019 10:05:21 +0000 (13:05 +0300)]
kotlin plugin library should have "provided" scope

GitOrigin-RevId: 2458a24be4ca2a664d31a8933b9a23823dc6048a

8 days agoadded missing deploy libraries
Dmitry Avdeev [Wed, 16 Oct 2019 08:53:55 +0000 (11:53 +0300)]
added missing deploy libraries

GitOrigin-RevId: 842b4a7437f7c6854c18c3f90146264d28b5ac36

8 days agoandroid modules renamed to conform to Idea naming policy
Dmitry Avdeev [Tue, 15 Oct 2019 12:12:25 +0000 (15:12 +0300)]
android modules renamed to conform to Idea naming policy

GitOrigin-RevId: fb530505fa956a1b066e825e39bbbcae260bbd3f

8 days agorunning IDEA with android plugin from sources
Dmitry Avdeev [Tue, 15 Oct 2019 11:39:46 +0000 (14:39 +0300)]
running IDEA with android plugin from sources

GitOrigin-RevId: 8c34cb9f665a0a41088cd9fdb2e5d2f32d8e6211

8 days agocyclic dependency removed (modules merged)
Dmitry Avdeev [Mon, 14 Oct 2019 13:43:52 +0000 (16:43 +0300)]
cyclic dependency removed (modules merged)

GitOrigin-RevId: 976861db1b7402a356ec8275d84e31f5564acad8

8 days agomissed android licenses
Dmitry Avdeev [Mon, 14 Oct 2019 13:32:32 +0000 (16:32 +0300)]
missed android licenses

GitOrigin-RevId: d9341c2018fadf13c0892342408ded99b53b385f

8 days agocyclic dependency removed (modules merged)
Dmitry Avdeev [Mon, 14 Oct 2019 11:46:22 +0000 (14:46 +0300)]
cyclic dependency removed (modules merged)

GitOrigin-RevId: b87de8d838479c965caad2ee4f7f354eb62c2bd8

8 days agochunkio module removed
Dmitry Avdeev [Mon, 14 Oct 2019 10:10:43 +0000 (13:10 +0300)]
chunkio module removed

GitOrigin-RevId: adaa60dac61e97ab255d31c172d51f592887787d

8 days agoextra space breaks it sometimes
Dmitry Avdeev [Mon, 14 Oct 2019 09:50:46 +0000 (12:50 +0300)]
extra space breaks it sometimes

GitOrigin-RevId: b37f169d88ea286ece1eb1d313aae8d9dc3066b0

8 days agoandroid licenses
Dmitry Avdeev [Mon, 14 Oct 2019 09:47:50 +0000 (12:47 +0300)]
android licenses

GitOrigin-RevId: e1050f4901a6c7689c4718463974dffb051733d4

8 days agodo not bloat log with warns when gradle sync fails
Dmitry Avdeev [Mon, 14 Oct 2019 07:59:25 +0000 (10:59 +0300)]
do not bloat log with warns when gradle sync fails

GitOrigin-RevId: 6c4684be528a9ee076d6bf98b209891d7796dd9c

8 days agoFix misprint in SVG file (XML)
Andrei Kuznetsov [Fri, 11 Oct 2019 17:00:11 +0000 (20:00 +0300)]
Fix misprint in SVG file (XML)

GitOrigin-RevId: 2cb251cf807f4cbbe5562ded093b1e0630e10e14

8 days agoUpdate android-plugin artifacts layout in IC build scripts (Merging Android Studio...
Andrei Kuznetsov [Fri, 11 Oct 2019 16:10:44 +0000 (19:10 +0300)]
Update android-plugin artifacts layout in IC build scripts (Merging Android Studio 3.5)

GitOrigin-RevId: 53a890b5f1440575ee635f7b58310bae27537109

8 days agoMove disposable cleanup to finally block in unit tests (Merging Android Studio 3.5)
Andrei Kuznetsov [Wed, 9 Oct 2019 16:45:59 +0000 (19:45 +0300)]
Move disposable cleanup to finally block in unit tests (Merging Android Studio 3.5)

GitOrigin-RevId: 14d560c5220053dd6276607e061546bc348a6ced

8 days agoDisposerExplorerTest should clean only own Disposables to avoid inference with other...
Andrei Kuznetsov [Wed, 9 Oct 2019 15:21:48 +0000 (18:21 +0300)]
DisposerExplorerTest should clean only own Disposables to avoid inference with other tests (Merging Android Studio 3.5)

GitOrigin-RevId: a0ec0f19e171d2376253b7aa2787918c32bf49a9

8 days agoFix disposable leak in junit4's ApplicationRule + better object runtime names (Mergin...
Andrei Kuznetsov [Wed, 9 Oct 2019 14:58:32 +0000 (17:58 +0300)]
Fix disposable leak in junit4's ApplicationRule + better object runtime names (Merging Android Studio 3.5)

rootDisposable/application should not be initialized eagerly: if test is skipped (e.g. in headless mode) 'after' method
will not be invoked to cleanup eager initialization

GitOrigin-RevId: 1b6085dcc7100fdc446d25947078757cf35232d8

8 days agodo not show suggestion in IDEA plugin
Dmitry Avdeev [Fri, 11 Oct 2019 13:33:35 +0000 (16:33 +0300)]
do not show suggestion in IDEA plugin

GitOrigin-RevId: 5a4d9ac5cbeb74a99e4b2977268efcf4e21ebb6d

8 days agoandroid instant run actions made available in Idea
Dmitry Avdeev [Thu, 10 Oct 2019 14:55:26 +0000 (17:55 +0300)]
android instant run actions made available in Idea

DeployActionsInitializer refactored to postStartupActivity

GitOrigin-RevId: 5b1b702681116da8e9987abf291ef45e1a9648e1

8 days agoctor not used by container should be marked as @NonInjectable
Dmitry Avdeev [Thu, 10 Oct 2019 12:51:26 +0000 (15:51 +0300)]
ctor not used by container should be marked as @NonInjectable

GitOrigin-RevId: f030c03ca2d6421c761c047996bb2c28cadf2ce8

8 days agodo not show android devices combo and android targets in non-android project
Dmitry Avdeev [Thu, 10 Oct 2019 12:19:40 +0000 (15:19 +0300)]
do not show android devices combo and android targets in non-android project

GitOrigin-RevId: cbd46b15094fd473a8e7f64a3827b855f71bc041

8 days agoRestore old focus manager in SwingFocusRule; Restore null value in ApplicationManager...
Andrei Kuznetsov [Wed, 9 Oct 2019 13:00:12 +0000 (16:00 +0300)]
Restore old focus manager in SwingFocusRule; Restore null value in ApplicationManager after ApplicationRule finishes

(Merging Android Studio 3.5)
org.jetbrains.android.AndroidGutterIconAnnotatorTest.ExternalAnnotatorsTest fails if run immediately after com.android.tools.property.ptable2.impl.PTableImplTest

GitOrigin-RevId: c6809a4343b581080d5a564f60bf3827cafeb6a0

8 days agoCleanup Disposer after test execution to make sure that no subsequent tests are affec...
Andrei Kuznetsov [Wed, 9 Oct 2019 12:09:56 +0000 (15:09 +0300)]
Cleanup Disposer after test execution to make sure that no subsequent tests are affected (Merging Android Studio 3.5).

GitOrigin-RevId: ed637635ef05c0a242a1b0374a4f682bd6a45732

8 days agoFix NPEs cause by inconsistent shutdown of ApplicationRule (Merging Android Studio...
Andrei Kuznetsov [Wed, 9 Oct 2019 11:34:59 +0000 (14:34 +0300)]
Fix NPEs cause by inconsistent shutdown of ApplicationRule (Merging Android Studio 3.5).

Avoid setting ApplicationManager::ourApplication to null as this causes NPEs in subsequent tests (e.g.
AndroidLintCustomCheckTest running after PropertiesPanelTest receives NPE and hangs up)

GitOrigin-RevId: 72568b266c95b93a1e324399bd16c5c9615e8955

8 days agoPropertyAppRule should cleanup test state if invocation fails with an Exception ...
Andrei Kuznetsov [Tue, 8 Oct 2019 16:10:19 +0000 (19:10 +0300)]
PropertyAppRule should cleanup test state if invocation fails with an Exception (merging Android Studio 3.5)

GitOrigin-RevId: 0ea42e15b2bd3643b6b3da3b1856a1f0d58306e8

8 days agoUnseal SyncIssueRegister on gradle cleanup also in Idea (merging Android Studio 3.5)
Andrei Kuznetsov [Tue, 8 Oct 2019 14:13:35 +0000 (17:13 +0300)]
Unseal SyncIssueRegister on gradle cleanup also in Idea (merging Android Studio 3.5)

GitOrigin-RevId: ee26c9cfdabb50591821a5b7a2ffaed88476b4e9

8 days agodo not throw exception in IDEA plugin (which has no embedded JDK)
Dmitry Avdeev [Wed, 9 Oct 2019 10:16:27 +0000 (13:16 +0300)]
do not throw exception in IDEA plugin (which has no embedded JDK)

GitOrigin-RevId: 3b9865377945e958b49a9615f8a25913a084f788

8 days agoFix classpath problems (missing classes) in android-plugin (merging Android Studio...
Andrei Kuznetsov [Tue, 8 Oct 2019 13:15:05 +0000 (16:15 +0300)]
Fix classpath problems (missing classes) in android-plugin (merging Android Studio 3.5)

GitOrigin-RevId: ffa85e6a7e25413af1e3ab4c026f86b0547280c1