From 6babc733201f6419e8fc59c5fc6919267e70935b Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 8 Jun 2020 21:47:15 +0300
Subject: [PATCH] AS41: Fix problems with initialization of Android plugin in
 tests

org/intellij/images/fileTypes/ImageFileTypeManager
java.lang.NoClassDefFoundError: org/intellij/images/fileTypes/ImageFileTypeManager
	at org.jetbrains.android.AndroidPlugin.lambda$registerWebpSupport$1(AndroidPlugin.java:50)
---
 idea/build.gradle.kts                                         | 4 ++++
 idea/idea-android/build.gradle.kts                            | 4 ++++
 idea/idea-gradle-native/build.gradle.kts                      | 4 ++++
 idea/idea-gradle/build.gradle.kts                             | 4 ++++
 idea/idea-maven/build.gradle.kts                              | 4 ++++
 j2k/build.gradle.kts                                          | 4 ++++
 .../android-extensions-idea/build.gradle.kts                  | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index be67751bb51..65be58e3329 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -192,6 +192,10 @@ dependencies {
         testRuntime(intellijPluginDep("google-cloud-tools-core-as"))
         testRuntime(intellijPluginDep("google-login-as"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 tasks.named<Copy>("processResources") {
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index a6f24dfd45e..4a3cc33405c 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -76,6 +76,10 @@ dependencies {
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 sourceSets {
diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts
index 7ae91230a3d..b97fdd1c1d7 100644
--- a/idea/idea-gradle-native/build.gradle.kts
+++ b/idea/idea-gradle-native/build.gradle.kts
@@ -78,6 +78,10 @@ dependencies {
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 sourceSets {
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 323cd11eb9c..488c5e4552e 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -85,6 +85,10 @@ dependencies {
     testRuntime(intellijPluginDep("android"))
     testRuntime(intellijPluginDep("smali"))
 
+    if (Ide.AS41.orHigher()) {
+         testRuntime(intellijPluginDep("platform-images"))
+    }
+
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 5bca6343765..1734548649a 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -81,6 +81,10 @@ dependencies {
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 if (Ide.IJ()) {
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index b41e79c6c4e..4fdcfc8c969 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -70,6 +70,10 @@ dependencies {
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 sourceSets {
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index e6f9ac8860c..61561cd8972 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -66,6 +66,10 @@ dependencies {
     if (Ide.AS36.orHigher()) {
         testRuntime(intellijPluginDep("android-layoutlib"))
     }
+
+    if (Ide.AS41.orHigher()) {
+        testRuntime(intellijPluginDep("platform-images"))
+    }
 }
 
 sourceSets {