Merge pull request #3180 from KronicDeth/3179

Remove duplicate dependency on `com.intellij.modules.java` plugin
KronicDeth · Apr 17, 2023 · bb4ef2b · bb4ef2b
2 parents 13741f8 + 243950a
commit bb4ef2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -294,6 +294,10 @@
 * [#3172](https://github.com/KronicDeth/intellij-elixir/pull/3172) - [@KronicDeth](https://github.com/KronicDeth)
   * Ignore from preload list that doesn't have square brackets.
     When trying to resolve keyword keys to `from`, don't error on unknown keys if any previous key was preload as this may be a list of preloads that is missing the square brackets.
+* [#3176](https://github.com/KronicDeth/intellij-elixir/pull/3176) - [@sh41](https://github.com/sh41)
+  * Re-enable canary releases.
+* [#3180](https://github.com/KronicDeth/intellij-elixir/pull/3180) - [@KronicDeth](https://github.com/KronicDeth)
+  * Remove duplicate dependency on `com.intellij.modules.java` plugin.
 
 ## v14.0.1
 

diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
@@ -24,6 +24,8 @@ <h1>v15.0.0</h1>
           preload as this may be a list of preloads that is missing the square brackets.
         </p>
       </li>
+      <li>Re-enable canary releases.</li>
+      <li>Remove duplicate dependency on `com.intellij.modules.java` plugin.</li>
     </ul>
   </li>
 </ul>

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -9,8 +9,6 @@
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
     <depends>com.intellij.modules.lang</depends>
-    <!-- Needed for JPS builder -->
-    <depends optional="true">com.intellij.modules.java</depends>
     <depends>org.intellij.plugins.markdown</depends>
     <depends config-file="rich-platform-plugin.xml" optional="true">com.intellij.modules.java</depends>