IDEA-293582: move color schemes xmls to their plugins

GitOrigin-RevId: d2fe583a93eb561db63b8eee6ae8463baed4e70b

IDEA-293582: move color schemes xmls to their plugins
GitOrigin-RevId: d2fe583a93eb561db63b8eee6ae8463baed4e70b
5f1e8ecb · Maria Filipanova · intellij-monorepo-bot · 1868ce70 · 5f1e8ecb · 1868ce70
Commit 5f1e8ecb authored 2 years ago by Maria Filipanova Committed by intellij-monorepo-bot 2 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 23 deletions
+1 -23
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -792,7 +792,6 @@
      <module fileurl="file://$PROJECT_DIR$/platform/code-style-impl/intellij.platform.codeStyle.impl.iml" filepath="$PROJECT_DIR$/platform/code-style-impl/intellij.platform.codeStyle.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/collaboration-tools/intellij.platform.collaborationTools.iml" filepath="$PROJECT_DIR$/platform/collaboration-tools/intellij.platform.collaborationTools.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/collaboration-tools/auth/intellij.platform.collaborationTools.auth.iml" filepath="$PROJECT_DIR$/platform/collaboration-tools/auth/intellij.platform.collaborationTools.auth.iml" />
-      <module fileurl="file://$PROJECT_DIR$/colorSchemes/intellij.platform.colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/intellij.platform.colorSchemes.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/util/intellij.platform.concurrency.iml" filepath="$PROJECT_DIR$/platform/util/intellij.platform.concurrency.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml" filepath="$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml" filepath="$PROJECT_DIR$/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml" />

--- a/colorSchemes/intellij.platform.colorSchemes.iml
+++ b/colorSchemes/intellij.platform.colorSchemes.iml
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -97,7 +97,6 @@
    <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.properties.resource.bundle.editor" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.javaFX.community" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.javaFX.jps" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.langInjection.tests" scope="TEST" />

--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -298,7 +298,6 @@ object PlatformModules {
      "intellij.platform.icons",
      "intellij.platform.resources",
      "intellij.platform.resources.en",
-      "intellij.platform.colorSchemes",

      "intellij.platform.sqlite",
    ), productLayout, layout)

--- a/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/schemeManager/SchemeManagerImpl.kt
@@ -143,7 +143,7 @@ class SchemeManagerImpl<T: Scheme, MUTABLE_SCHEME : T>(
      }
      else {
        val classLoader = pluginDescriptor.classLoader
-        bytes = ResourceUtil.getResourceAsBytes(resourceName.removePrefix("/"), classLoader, true)
+        bytes = ResourceUtil.getResourceAsBytes(resourceName.removePrefix("/"), classLoader)
        if (bytes == null) {
          LOG.error("Cannot found scheme $resourceName in $classLoader")
          return

--- a/plugins/color-schemes/all-hallows-eve-color-scheme/intellij.color.scheme.all_hallows_eve.iml
+++ b/plugins/color-schemes/all-hallows-eve-color-scheme/intellij.color.scheme.all_hallows_eve.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
--- a/plugins/color-schemes/blackboard-color-scheme/intellij.color.scheme.blackboard.iml
+++ b/plugins/color-schemes/blackboard-color-scheme/intellij.color.scheme.blackboard.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
--- a/plugins/color-schemes/cobalt-color-scheme/intellij.color.scheme.cobalt.iml
+++ b/plugins/color-schemes/cobalt-color-scheme/intellij.color.scheme.cobalt.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
--- a/plugins/color-schemes/github-color-scheme/intellij.color.scheme.github.iml
+++ b/plugins/color-schemes/github-color-scheme/intellij.color.scheme.github.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/github.xml
+++ b/colorSchemes/src/colorSchemes/github.xml
--- a/plugins/color-schemes/monokai-color-scheme/intellij.color.scheme.monokai.iml
+++ b/plugins/color-schemes/monokai-color-scheme/intellij.color.scheme.monokai.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
--- a/plugins/color-schemes/rails-casts-color-scheme/intellij.color.scheme.rails_casts.iml
+++ b/plugins/color-schemes/rails-casts-color-scheme/intellij.color.scheme.rails_casts.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
--- a/plugins/color-schemes/twilight-color-scheme/intellij.color.scheme.twilight.iml
+++ b/plugins/color-schemes/twilight-color-scheme/intellij.color.scheme.twilight.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
--- a/plugins/color-schemes/vibrant-ink-color-scheme/intellij.color.scheme.vibrant_ink.iml
+++ b/plugins/color-schemes/vibrant-ink-color-scheme/intellij.color.scheme.vibrant_ink.iml
@@ -6,7 +6,6 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
\ No newline at end of file