Load resources from resources.jar instead of idea.jar
In AS23 idea.jar contains wrong ProductivityFeaturesRegistry.xml
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 0c99887..78d84a2 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -52,6 +52,7 @@
}
testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
testRuntime(ideaSdkCoreDeps("*.jar"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
}
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 9cb903a..0be20c1 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -22,6 +22,7 @@
testCompile(projectTests(":compiler"))
testRuntime(projectRuntimeJar(":kotlin-preloader"))
testRuntime(ideaSdkCoreDeps("*.jar"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
}
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 83c3aa8..48aaa84 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -38,6 +38,7 @@
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit"))
testCompile(ideaSdkDeps("openapi", "idea"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 2194de5..ef16602 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -56,6 +56,7 @@
testCompileOnly(ideaPluginDeps("jsr305", plugin = "android"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index d3f759e..171eeba 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -35,6 +35,7 @@
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 6c31412..9bf7529 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -31,6 +31,7 @@
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 504a3fd..19295e2 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -30,6 +30,7 @@
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("jcommander", "resources_en", plugin = "testng"))
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index 57f2d4e..aa7d1bd 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -24,6 +24,7 @@
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 6cf9bf1..81dcaf5 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -23,6 +23,7 @@
testRuntime(project(it))
}
testRuntime(ideaSdkCoreDeps("*.jar"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
//testRuntime(ideaSdkDeps("*.jar", subdir = "jps/test"))
testRuntime(ideaSdkDeps("*.jar", subdir = "jps"))
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 818e372..484b532 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -17,7 +17,8 @@
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
-// testRuntime(ideaSdkDeps("*.jar"))
+// testRuntime(ideaSdkDeps("resources"))
+ testRuntime(ideaSdkDeps("*.jar"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
}
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 8ed2d01..eb953f7 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -28,6 +28,7 @@
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":plugins:lint"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
diff --git a/plugins/plugins-tests/build.gradle.kts b/plugins/plugins-tests/build.gradle.kts
index b8c313e..cc15a43 100644
--- a/plugins/plugins-tests/build.gradle.kts
+++ b/plugins/plugins-tests/build.gradle.kts
@@ -26,6 +26,7 @@
//testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
testCompile(ideaPluginDeps("*.jar", plugin = "android", subdir = "lib/jps"))
testRuntime(project(":jps-plugin"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index f6b9244..84ffce4 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -16,6 +16,7 @@
testCompile(project(":compiler:util"))
testCompile(project(":compiler:cli"))
testCompile(project(":idea:idea-test-framework"))
+ testRuntime(ideaSdkDeps("resources"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
